Skip to content

K
k3s
Commit c98eb386 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #35199 from kargakis/remove-last-probe-time

Automatic merge from submit-queue Remove last probe time from replica sets While experimenting with Deployment conditions I found out that if we are going to use lastProbeTime as we are supposed to be using it then we hotloop between updates (see https://github.com/kubernetes/kubernetes/pull/19343#issuecomment-255096778 for more info) cc: @smarterclayton @soltysh
parents 68e68052 a4694ef1
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 104 deletions
api/openapi-spec/root_swagger.json
View file @ c98eb386
......@@ -28275,10 +28275,6 @@
"status"
],
"properties": {
"lastProbeTime": {
"description": "Last time we probed the condition.",
"$ref": "#/definitions/unversioned.Time"
},
"lastTransitionTime": {
"description": "The last time the condition transitioned from one status to another.",
"$ref": "#/definitions/unversioned.Time"
......@@ -30197,10 +30193,6 @@
"status"
],
"properties": {
"lastProbeTime": {
"description": "Last time we probed the condition.",
"$ref": "#/definitions/unversioned.Time"
},
"lastTransitionTime": {
"description": "The last time the condition transitioned from one status to another.",
"$ref": "#/definitions/unversioned.Time"
......
api/openapi-spec/v1.json
View file @ c98eb386
......@@ -14686,10 +14686,6 @@
"status"
],
"properties": {
"lastProbeTime": {
"description": "Last time we probed the condition.",
"$ref": "#/definitions/unversioned.Time"
},
"lastTransitionTime": {
"description": "The last time the condition transitioned from one status to another.",
"$ref": "#/definitions/unversioned.Time"
......
api/openapi-spec/v1beta1.extensions.json
View file @ c98eb386
......@@ -7820,10 +7820,6 @@
"status"
],
"properties": {
"lastProbeTime": {
"description": "Last time we probed the condition.",
"$ref": "#/definitions/unversioned.Time"
},
"lastTransitionTime": {
"description": "The last time the condition transitioned from one status to another.",
"$ref": "#/definitions/unversioned.Time"
......
api/swagger-spec/extensions_v1beta1.json
View file @ c98eb386
......@@ -10380,11 +10380,6 @@
"type": "string",
"description": "Status of the condition, one of True, False, Unknown."
},
"lastProbeTime": {
"type": "string",
"format": "date-time",
"description": "Last time we probed the condition."
},
"lastTransitionTime": {
"type": "string",
"format": "date-time",
......
api/swagger-spec/v1.json
View file @ c98eb386
......@@ -19161,11 +19161,6 @@
"type": "string",
"description": "Status of the condition, one of True, False, Unknown."
},
"lastProbeTime": {
"type": "string",
"format": "date-time",
"description": "Last time we probed the condition."
},
"lastTransitionTime": {
"type": "string",
"format": "date-time",
......
docs/api-reference/extensions/v1beta1/definitions.html
View file @ c98eb386
......@@ -1172,13 +1172,6 @@ Examples:<br>
<td class="tableblock halign-left valign-top"></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">lastProbeTime</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">Last time we probed the condition.</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">false</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">string (date-time)</p></td>
<td class="tableblock halign-left valign-top"></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">lastTransitionTime</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">The last time the condition transitioned from one status to another.</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">false</p></td>
......@@ -6694,7 +6687,7 @@ Both these may change in the future. Incoming requests are matched against the h
</div>
<div id="footer">
<div id="footer-text">
Last updated 2016-10-12 13:31:06 UTC
Last updated 2016-10-20 13:16:06 UTC
</div>
</div>
</body>
......
docs/api-reference/v1/definitions.html
View file @ c98eb386
......@@ -1555,13 +1555,6 @@ Examples:<br>
<td class="tableblock halign-left valign-top"></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">lastProbeTime</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">Last time we probed the condition.</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">false</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">string (date-time)</p></td>
<td class="tableblock halign-left valign-top"></td>
</tr>
<tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">lastTransitionTime</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">The last time the condition transitioned from one status to another.</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">false</p></td>
......@@ -8565,7 +8558,7 @@ The resulting set of endpoints can be viewed as:<br>
</div>
<div id="footer">
<div id="footer-text">
Last updated 2016-10-07 14:06:34 UTC
Last updated 2016-10-20 13:15:21 UTC
</div>
</div>
</body>
......
pkg/api/types.generated.go
View file @ c98eb386
This source diff could not be displayed because it is too large. You can view the blob instead.
pkg/api/types.go
View file @ c98eb386
......@@ -2041,9 +2041,6 @@ type ReplicationControllerCondition struct {
Type ReplicationControllerConditionType `json:"type"`
// Status of the condition, one of True, False, Unknown.
Status ConditionStatus `json:"status"`
// Last time we probed the condition.
// +optional
LastProbeTime unversioned.Time `json:"lastProbeTime,omitempty"`
// The last time the condition transitioned from one status to another.
// +optional
LastTransitionTime unversioned.Time `json:"lastTransitionTime,omitempty"`
......
pkg/api/v1/generated.pb.go
View file @ c98eb386
This source diff could not be displayed because it is too large. You can view the blob instead.
pkg/api/v1/generated.proto
View file @ c98eb386
......@@ -2809,21 +2809,17 @@ message ReplicationControllerCondition {
// Status of the condition, one of True, False, Unknown.
optional string status = 2;
// Last time we probed the condition.
// +optional
optional k8s.io.kubernetes.pkg.api.unversioned.Time lastProbeTime = 3;
// The last time the condition transitioned from one status to another.
// +optional
optional k8s.io.kubernetes.pkg.api.unversioned.Time lastTransitionTime = 4;
optional k8s.io.kubernetes.pkg.api.unversioned.Time lastTransitionTime = 3;
// The reason for the condition's last transition.
// +optional
optional string reason = 5;
optional string reason = 4;
// A human readable message indicating details about the transition.
// +optional
optional string message = 6;
optional string message = 5;
}
// ReplicationControllerList is a collection of replication controllers.
......
pkg/api/v1/types.generated.go
View file @ c98eb386
This source diff could not be displayed because it is too large. You can view the blob instead.
pkg/api/v1/types.go
View file @ c98eb386
......@@ -2350,9 +2350,6 @@ type ReplicationControllerCondition struct {
Type ReplicationControllerConditionType `json:"type"`
// Status of the condition, one of True, False, Unknown.
Status ConditionStatus `json:"status"`
// Last time we probed the condition.
// +optional
LastProbeTime unversioned.Time `json:"lastProbeTime,omitempty"`
// The last time the condition transitioned from one status to another.
// +optional
LastTransitionTime unversioned.Time `json:"lastTransitionTime,omitempty"`
......
pkg/api/v1/types_swagger_doc_generated.go
View file @ c98eb386
......@@ -1447,7 +1447,6 @@ var map_ReplicationControllerCondition = map[string]string{
"": "ReplicationControllerCondition describes the state of a replication controller at a certain point.",
"type": "Type of replication controller condition.",
"status": "Status of the condition, one of True, False, Unknown.",
"lastProbeTime": "Last time we probed the condition.",
"lastTransitionTime": "The last time the condition transitioned from one status to another.",
"reason": "The reason for the condition's last transition.",
"message": "A human readable message indicating details about the transition.",
......
pkg/api/v1/zz_generated.conversion.go
View file @ c98eb386
......@@ -5583,9 +5583,6 @@ func Convert_api_ReplicationController_To_v1_ReplicationController(in *api.Repli
func autoConvert_v1_ReplicationControllerCondition_To_api_ReplicationControllerCondition(in *ReplicationControllerCondition, out *api.ReplicationControllerCondition, s conversion.Scope) error {
out.Type = api.ReplicationControllerConditionType(in.Type)
out.Status = api.ConditionStatus(in.Status)
if err := api.Convert_unversioned_Time_To_unversioned_Time(&in.LastProbeTime, &out.LastProbeTime, s); err != nil {
return err
}
if err := api.Convert_unversioned_Time_To_unversioned_Time(&in.LastTransitionTime, &out.LastTransitionTime, s); err != nil {
return err
}
......@@ -5601,9 +5598,6 @@ func Convert_v1_ReplicationControllerCondition_To_api_ReplicationControllerCondi
func autoConvert_api_ReplicationControllerCondition_To_v1_ReplicationControllerCondition(in *api.ReplicationControllerCondition, out *ReplicationControllerCondition, s conversion.Scope) error {
out.Type = ReplicationControllerConditionType(in.Type)
out.Status = ConditionStatus(in.Status)
if err := api.Convert_unversioned_Time_To_unversioned_Time(&in.LastProbeTime, &out.LastProbeTime, s); err != nil {
return err
}
if err := api.Convert_unversioned_Time_To_unversioned_Time(&in.LastTransitionTime, &out.LastTransitionTime, s); err != nil {
return err
}
......
pkg/api/v1/zz_generated.deepcopy.go
View file @ c98eb386
......@@ -2919,7 +2919,6 @@ func DeepCopy_v1_ReplicationControllerCondition(in interface{}, out interface{},
out := out.(*ReplicationControllerCondition)
out.Type = in.Type
out.Status = in.Status
out.LastProbeTime = in.LastProbeTime.DeepCopy()
out.LastTransitionTime = in.LastTransitionTime.DeepCopy()
out.Reason = in.Reason
out.Message = in.Message
......
pkg/api/zz_generated.deepcopy.go
View file @ c98eb386
......@@ -2977,7 +2977,6 @@ func DeepCopy_api_ReplicationControllerCondition(in interface{}, out interface{}
out := out.(*ReplicationControllerCondition)
out.Type = in.Type
out.Status = in.Status
out.LastProbeTime = in.LastProbeTime.DeepCopy()
out.LastTransitionTime = in.LastTransitionTime.DeepCopy()
out.Reason = in.Reason
out.Message = in.Message
......
pkg/apis/extensions/types.generated.go
View file @ c98eb386
This source diff could not be displayed because it is too large. You can view the blob instead.
pkg/apis/extensions/types.go
View file @ c98eb386
......@@ -739,9 +739,6 @@ type ReplicaSetCondition struct {
Type ReplicaSetConditionType `json:"type"`
// Status of the condition, one of True, False, Unknown.
Status api.ConditionStatus `json:"status"`
// Last time we probed the condition.
// +optional
LastProbeTime unversioned.Time `json:"lastProbeTime,omitempty"`
// The last time the condition transitioned from one status to another.
// +optional
LastTransitionTime unversioned.Time `json:"lastTransitionTime,omitempty"`
......
pkg/apis/extensions/v1beta1/generated.proto
View file @ c98eb386
......@@ -895,21 +895,17 @@ message ReplicaSetCondition {
// Status of the condition, one of True, False, Unknown.
optional string status = 2;
// Last time we probed the condition.
// +optional
optional k8s.io.kubernetes.pkg.api.unversioned.Time lastProbeTime = 3;
// The last time the condition transitioned from one status to another.
// +optional
optional k8s.io.kubernetes.pkg.api.unversioned.Time lastTransitionTime = 4;
optional k8s.io.kubernetes.pkg.api.unversioned.Time lastTransitionTime = 3;
// The reason for the condition's last transition.
// +optional
optional string reason = 5;
optional string reason = 4;
// A human readable message indicating details about the transition.
// +optional
optional string message = 6;
optional string message = 5;
}
// ReplicaSetList is a collection of ReplicaSets.
......
pkg/apis/extensions/v1beta1/types.generated.go
View file @ c98eb386
This source diff could not be displayed because it is too large. You can view the blob instead.
pkg/apis/extensions/v1beta1/types.go
View file @ c98eb386
......@@ -1035,9 +1035,6 @@ type ReplicaSetCondition struct {
Type ReplicaSetConditionType `json:"type"`
// Status of the condition, one of True, False, Unknown.
Status v1.ConditionStatus `json:"status"`
// Last time we probed the condition.
// +optional
LastProbeTime unversioned.Time `json:"lastProbeTime,omitempty"`
// The last time the condition transitioned from one status to another.
// +optional
LastTransitionTime unversioned.Time `json:"lastTransitionTime,omitempty"`
......
pkg/apis/extensions/v1beta1/types_swagger_doc_generated.go
View file @ c98eb386
......@@ -557,7 +557,6 @@ var map_ReplicaSetCondition = map[string]string{
"": "ReplicaSetCondition describes the state of a replica set at a certain point.",
"type": "Type of replica set condition.",
"status": "Status of the condition, one of True, False, Unknown.",
"lastProbeTime": "Last time we probed the condition.",
"lastTransitionTime": "The last time the condition transitioned from one status to another.",
"reason": "The reason for the condition's last transition.",
"message": "A human readable message indicating details about the transition.",
......
pkg/apis/extensions/v1beta1/zz_generated.conversion.go
View file @ c98eb386
......@@ -2145,9 +2145,6 @@ func Convert_extensions_ReplicaSet_To_v1beta1_ReplicaSet(in *extensions.ReplicaS
func autoConvert_v1beta1_ReplicaSetCondition_To_extensions_ReplicaSetCondition(in *ReplicaSetCondition, out *extensions.ReplicaSetCondition, s conversion.Scope) error {
out.Type = extensions.ReplicaSetConditionType(in.Type)
out.Status = api.ConditionStatus(in.Status)
if err := api.Convert_unversioned_Time_To_unversioned_Time(&in.LastProbeTime, &out.LastProbeTime, s); err != nil {
return err
}
if err := api.Convert_unversioned_Time_To_unversioned_Time(&in.LastTransitionTime, &out.LastTransitionTime, s); err != nil {
return err
}
......@@ -2163,9 +2160,6 @@ func Convert_v1beta1_ReplicaSetCondition_To_extensions_ReplicaSetCondition(in *R
func autoConvert_extensions_ReplicaSetCondition_To_v1beta1_ReplicaSetCondition(in *extensions.ReplicaSetCondition, out *ReplicaSetCondition, s conversion.Scope) error {
out.Type = ReplicaSetConditionType(in.Type)
out.Status = v1.ConditionStatus(in.Status)
if err := api.Convert_unversioned_Time_To_unversioned_Time(&in.LastProbeTime, &out.LastProbeTime, s); err != nil {
return err
}
if err := api.Convert_unversioned_Time_To_unversioned_Time(&in.LastTransitionTime, &out.LastTransitionTime, s); err != nil {
return err
}
......
pkg/apis/extensions/v1beta1/zz_generated.deepcopy.go
View file @ c98eb386
......@@ -1148,7 +1148,6 @@ func DeepCopy_v1beta1_ReplicaSetCondition(in interface{}, out interface{}, c *co
out := out.(*ReplicaSetCondition)
out.Type = in.Type
out.Status = in.Status
out.LastProbeTime = in.LastProbeTime.DeepCopy()
out.LastTransitionTime = in.LastTransitionTime.DeepCopy()
out.Reason = in.Reason
out.Message = in.Message
......
pkg/apis/extensions/zz_generated.deepcopy.go
View file @ c98eb386
......@@ -830,7 +830,6 @@ func DeepCopy_extensions_ReplicaSetCondition(in interface{}, out interface{}, c
out := out.(*ReplicaSetCondition)
out.Type = in.Type
out.Status = in.Status
out.LastProbeTime = in.LastProbeTime.DeepCopy()
out.LastTransitionTime = in.LastTransitionTime.DeepCopy()
out.Reason = in.Reason
out.Message = in.Message
......
pkg/generated/openapi/zz_generated.openapi.go
View file @ c98eb386
......@@ -4246,12 +4246,6 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{
Format: "",
},
},
"lastProbeTime": {
SchemaProps: spec.SchemaProps{
Description: "Last time we probed the condition.",
Ref: spec.MustCreateRef("#/definitions/unversioned.Time"),
},
},
"lastTransitionTime": {
SchemaProps: spec.SchemaProps{
Description: "The last time the condition transitioned from one status to another.",
......@@ -11600,12 +11594,6 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{
Format: "",
},
},
"lastProbeTime": {
SchemaProps: spec.SchemaProps{
Description: "Last time we probed the condition.",
Ref: spec.MustCreateRef("#/definitions/unversioned.Time"),
},
},
"lastTransitionTime": {
SchemaProps: spec.SchemaProps{
Description: "The last time the condition transitioned from one status to another.",
......@@ -17018,12 +17006,6 @@ var OpenAPIDefinitions *common.OpenAPIDefinitions = &common.OpenAPIDefinitions{
Format: "",
},
},
"lastProbeTime": {
SchemaProps: spec.SchemaProps{
Description: "Last time we probed the condition.",
Ref: spec.MustCreateRef("#/definitions/unversioned.Time"),
},
},
"lastTransitionTime": {
SchemaProps: spec.SchemaProps{
Description: "The last time the condition transitioned from one status to another.",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment