diff --git a/api/swagger-spec/extensions_v1beta1.json b/api/swagger-spec/extensions_v1beta1.json index a73d19cb9d8..724174c134a 100644 --- a/api/swagger-spec/extensions_v1beta1.json +++ b/api/swagger-spec/extensions_v1beta1.json @@ -7877,8 +7877,7 @@ "id": "v1beta1.ReplicaSetStatus", "description": "ReplicaSetStatus represents the current status of a ReplicaSet.", "required": [ - "replicas", - "fullyLabeledReplicas" + "replicas" ], "properties": { "replicas": { diff --git a/api/swagger-spec/v1.json b/api/swagger-spec/v1.json index 65b957d5a9b..6ed1d75feab 100644 --- a/api/swagger-spec/v1.json +++ b/api/swagger-spec/v1.json @@ -17617,8 +17617,7 @@ "id": "v1.ReplicationControllerStatus", "description": "ReplicationControllerStatus represents the current status of a replication controller.", "required": [ - "replicas", - "fullyLabeledReplicas" + "replicas" ], "properties": { "replicas": { diff --git a/docs/api-reference/extensions/v1beta1/definitions.html b/docs/api-reference/extensions/v1beta1/definitions.html index 57f36177b96..26799b7b55a 100755 --- a/docs/api-reference/extensions/v1beta1/definitions.html +++ b/docs/api-reference/extensions/v1beta1/definitions.html @@ -4583,7 +4583,7 @@ Both these may change in the future. Incoming requests are matched against the h

fullyLabeledReplicas

The number of pods that have labels matching the labels of the pod template of the replicaset.

-

true

+

false

integer (int32)

@@ -5605,7 +5605,7 @@ Both these may change in the future. Incoming requests are matched against the h diff --git a/docs/api-reference/v1/definitions.html b/docs/api-reference/v1/definitions.html index d3d838712ad..4b8ec545b4b 100755 --- a/docs/api-reference/v1/definitions.html +++ b/docs/api-reference/v1/definitions.html @@ -5565,7 +5565,7 @@ The resulting set of endpoints can be viewed as:

fullyLabeledReplicas

The number of pods that have labels matching the labels of the pod template of the replication controller.

-

true

+

false

integer (int32)

@@ -7632,7 +7632,7 @@ The resulting set of endpoints can be viewed as:
diff --git a/pkg/api/types.generated.go b/pkg/api/types.generated.go index bb7170c1b92..b4ccb56ccd6 100644 --- a/pkg/api/types.generated.go +++ b/pkg/api/types.generated.go @@ -26956,12 +26956,13 @@ func (x *ReplicationControllerStatus) CodecEncodeSelf(e *codec1978.Encoder) { var yyq2 [3]bool _, _, _ = yysep2, yyq2, yy2arr2 const yyr2 bool = false + yyq2[1] = x.FullyLabeledReplicas != 0 yyq2[2] = x.ObservedGeneration != 0 var yynn2 int if yyr2 || yy2arr2 { r.EncodeArrayStart(3) } else { - yynn2 = 2 + yynn2 = 1 for _, b := range yyq2 { if b { yynn2++ @@ -26991,21 +26992,27 @@ func (x *ReplicationControllerStatus) CodecEncodeSelf(e *codec1978.Encoder) { } if yyr2 || yy2arr2 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym7 := z.EncBinary() - _ = yym7 - if false { + if yyq2[1] { + yym7 := z.EncBinary() + _ = yym7 + if false { + } else { + r.EncodeInt(int64(x.FullyLabeledReplicas)) + } } else { - r.EncodeInt(int64(x.FullyLabeledReplicas)) + r.EncodeInt(0) } } else { - z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("fullyLabeledReplicas")) - z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym8 := z.EncBinary() - _ = yym8 - if false { - } else { - r.EncodeInt(int64(x.FullyLabeledReplicas)) + if yyq2[1] { + z.EncSendContainerState(codecSelfer_containerMapKey1234) + r.EncodeString(codecSelferC_UTF81234, string("fullyLabeledReplicas")) + z.EncSendContainerState(codecSelfer_containerMapValue1234) + yym8 := z.EncBinary() + _ = yym8 + if false { + } else { + r.EncodeInt(int64(x.FullyLabeledReplicas)) + } } } if yyr2 || yy2arr2 { diff --git a/pkg/api/types.go b/pkg/api/types.go index 101883122f7..a82aa45c075 100644 --- a/pkg/api/types.go +++ b/pkg/api/types.go @@ -1381,7 +1381,7 @@ type ReplicationControllerStatus struct { Replicas int `json:"replicas"` // The number of pods that have labels matching the labels of the pod template of the replication controller. - FullyLabeledReplicas int `json:"fullyLabeledReplicas"` + FullyLabeledReplicas int `json:"fullyLabeledReplicas,omitempty"` // ObservedGeneration is the most recent generation observed by the controller. ObservedGeneration int64 `json:"observedGeneration,omitempty"` diff --git a/pkg/api/v1/types.generated.go b/pkg/api/v1/types.generated.go index f9f6e3ed868..1dc4938a892 100644 --- a/pkg/api/v1/types.generated.go +++ b/pkg/api/v1/types.generated.go @@ -26686,12 +26686,13 @@ func (x *ReplicationControllerStatus) CodecEncodeSelf(e *codec1978.Encoder) { var yyq2 [3]bool _, _, _ = yysep2, yyq2, yy2arr2 const yyr2 bool = false + yyq2[1] = x.FullyLabeledReplicas != 0 yyq2[2] = x.ObservedGeneration != 0 var yynn2 int if yyr2 || yy2arr2 { r.EncodeArrayStart(3) } else { - yynn2 = 2 + yynn2 = 1 for _, b := range yyq2 { if b { yynn2++ @@ -26721,21 +26722,27 @@ func (x *ReplicationControllerStatus) CodecEncodeSelf(e *codec1978.Encoder) { } if yyr2 || yy2arr2 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym7 := z.EncBinary() - _ = yym7 - if false { + if yyq2[1] { + yym7 := z.EncBinary() + _ = yym7 + if false { + } else { + r.EncodeInt(int64(x.FullyLabeledReplicas)) + } } else { - r.EncodeInt(int64(x.FullyLabeledReplicas)) + r.EncodeInt(0) } } else { - z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("fullyLabeledReplicas")) - z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym8 := z.EncBinary() - _ = yym8 - if false { - } else { - r.EncodeInt(int64(x.FullyLabeledReplicas)) + if yyq2[1] { + z.EncSendContainerState(codecSelfer_containerMapKey1234) + r.EncodeString(codecSelferC_UTF81234, string("fullyLabeledReplicas")) + z.EncSendContainerState(codecSelfer_containerMapValue1234) + yym8 := z.EncBinary() + _ = yym8 + if false { + } else { + r.EncodeInt(int64(x.FullyLabeledReplicas)) + } } } if yyr2 || yy2arr2 { diff --git a/pkg/api/v1/types.go b/pkg/api/v1/types.go index 90a1e220737..ff8f12971fe 100644 --- a/pkg/api/v1/types.go +++ b/pkg/api/v1/types.go @@ -1680,7 +1680,7 @@ type ReplicationControllerStatus struct { Replicas int32 `json:"replicas"` // The number of pods that have labels matching the labels of the pod template of the replication controller. - FullyLabeledReplicas int32 `json:"fullyLabeledReplicas"` + FullyLabeledReplicas int32 `json:"fullyLabeledReplicas,omitempty"` // ObservedGeneration reflects the generation of the most recently observed replication controller. ObservedGeneration int64 `json:"observedGeneration,omitempty"` diff --git a/pkg/apis/extensions/types.generated.go b/pkg/apis/extensions/types.generated.go index 5715ed364d6..2df94989766 100644 --- a/pkg/apis/extensions/types.generated.go +++ b/pkg/apis/extensions/types.generated.go @@ -14892,12 +14892,13 @@ func (x *ReplicaSetStatus) CodecEncodeSelf(e *codec1978.Encoder) { var yyq2 [3]bool _, _, _ = yysep2, yyq2, yy2arr2 const yyr2 bool = false + yyq2[1] = x.FullyLabeledReplicas != 0 yyq2[2] = x.ObservedGeneration != 0 var yynn2 int if yyr2 || yy2arr2 { r.EncodeArrayStart(3) } else { - yynn2 = 2 + yynn2 = 1 for _, b := range yyq2 { if b { yynn2++ @@ -14927,21 +14928,27 @@ func (x *ReplicaSetStatus) CodecEncodeSelf(e *codec1978.Encoder) { } if yyr2 || yy2arr2 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym7 := z.EncBinary() - _ = yym7 - if false { + if yyq2[1] { + yym7 := z.EncBinary() + _ = yym7 + if false { + } else { + r.EncodeInt(int64(x.FullyLabeledReplicas)) + } } else { - r.EncodeInt(int64(x.FullyLabeledReplicas)) + r.EncodeInt(0) } } else { - z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("fullyLabeledReplicas")) - z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym8 := z.EncBinary() - _ = yym8 - if false { - } else { - r.EncodeInt(int64(x.FullyLabeledReplicas)) + if yyq2[1] { + z.EncSendContainerState(codecSelfer_containerMapKey1234) + r.EncodeString(codecSelferC_UTF81234, string("fullyLabeledReplicas")) + z.EncSendContainerState(codecSelfer_containerMapValue1234) + yym8 := z.EncBinary() + _ = yym8 + if false { + } else { + r.EncodeInt(int64(x.FullyLabeledReplicas)) + } } } if yyr2 || yy2arr2 { diff --git a/pkg/apis/extensions/types.go b/pkg/apis/extensions/types.go index 5d1e70853b4..51559115777 100644 --- a/pkg/apis/extensions/types.go +++ b/pkg/apis/extensions/types.go @@ -816,7 +816,7 @@ type ReplicaSetStatus struct { Replicas int `json:"replicas"` // The number of pods that have labels matching the labels of the pod template of the replicaset. - FullyLabeledReplicas int `json:"fullyLabeledReplicas"` + FullyLabeledReplicas int `json:"fullyLabeledReplicas,omitempty"` // ObservedGeneration is the most recent generation observed by the controller. ObservedGeneration int64 `json:"observedGeneration,omitempty"` diff --git a/pkg/apis/extensions/v1beta1/types.generated.go b/pkg/apis/extensions/v1beta1/types.generated.go index 9dae9fced35..ffdeebcf59d 100644 --- a/pkg/apis/extensions/v1beta1/types.generated.go +++ b/pkg/apis/extensions/v1beta1/types.generated.go @@ -16257,12 +16257,13 @@ func (x *ReplicaSetStatus) CodecEncodeSelf(e *codec1978.Encoder) { var yyq2 [3]bool _, _, _ = yysep2, yyq2, yy2arr2 const yyr2 bool = false + yyq2[1] = x.FullyLabeledReplicas != 0 yyq2[2] = x.ObservedGeneration != 0 var yynn2 int if yyr2 || yy2arr2 { r.EncodeArrayStart(3) } else { - yynn2 = 2 + yynn2 = 1 for _, b := range yyq2 { if b { yynn2++ @@ -16292,21 +16293,27 @@ func (x *ReplicaSetStatus) CodecEncodeSelf(e *codec1978.Encoder) { } if yyr2 || yy2arr2 { z.EncSendContainerState(codecSelfer_containerArrayElem1234) - yym7 := z.EncBinary() - _ = yym7 - if false { + if yyq2[1] { + yym7 := z.EncBinary() + _ = yym7 + if false { + } else { + r.EncodeInt(int64(x.FullyLabeledReplicas)) + } } else { - r.EncodeInt(int64(x.FullyLabeledReplicas)) + r.EncodeInt(0) } } else { - z.EncSendContainerState(codecSelfer_containerMapKey1234) - r.EncodeString(codecSelferC_UTF81234, string("fullyLabeledReplicas")) - z.EncSendContainerState(codecSelfer_containerMapValue1234) - yym8 := z.EncBinary() - _ = yym8 - if false { - } else { - r.EncodeInt(int64(x.FullyLabeledReplicas)) + if yyq2[1] { + z.EncSendContainerState(codecSelfer_containerMapKey1234) + r.EncodeString(codecSelferC_UTF81234, string("fullyLabeledReplicas")) + z.EncSendContainerState(codecSelfer_containerMapValue1234) + yym8 := z.EncBinary() + _ = yym8 + if false { + } else { + r.EncodeInt(int64(x.FullyLabeledReplicas)) + } } } if yyr2 || yy2arr2 { diff --git a/pkg/apis/extensions/v1beta1/types.go b/pkg/apis/extensions/v1beta1/types.go index 1b3437d4019..e0f37199ada 100644 --- a/pkg/apis/extensions/v1beta1/types.go +++ b/pkg/apis/extensions/v1beta1/types.go @@ -908,7 +908,7 @@ type ReplicaSetStatus struct { Replicas int32 `json:"replicas"` // The number of pods that have labels matching the labels of the pod template of the replicaset. - FullyLabeledReplicas int32 `json:"fullyLabeledReplicas"` + FullyLabeledReplicas int32 `json:"fullyLabeledReplicas,omitempty"` // ObservedGeneration reflects the generation of the most recently observed ReplicaSet. ObservedGeneration int64 `json:"observedGeneration,omitempty"`