github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 13:37:30 +00:00
Code Issues Projects Releases Wiki Activity

make fullyLabeledReplicas optional in rc and rs status

Browse Source
This commit is contained in:
Chao Xu 2016-03-15 13:33:37 -07:00
parent 4b3e2b57ac
commit 9bdd30fdf1
12 changed files with 90 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
api/swagger-spec/extensions_v1beta1.json
View File

@ -7877,8 +7877,7 @@
"id": "v1beta1.ReplicaSetStatus", "id": "v1beta1.ReplicaSetStatus",
"description": "ReplicaSetStatus represents the current status of a ReplicaSet.", "description": "ReplicaSetStatus represents the current status of a ReplicaSet.",
"required": [ "required": [
"replicas", "replicas"
"fullyLabeledReplicas"
], ],
"properties": { "properties": {
"replicas": { "replicas": {

3
api/swagger-spec/v1.json
View File

@ -17617,8 +17617,7 @@
"id": "v1.ReplicationControllerStatus", "id": "v1.ReplicationControllerStatus",
"description": "ReplicationControllerStatus represents the current status of a replication controller.", "description": "ReplicationControllerStatus represents the current status of a replication controller.",
"required": [ "required": [
"replicas", "replicas"
"fullyLabeledReplicas"
], ],
"properties": { "properties": {
"replicas": { "replicas": {

4
docs/api-reference/extensions/v1beta1/definitions.html
View File

@ -4583,7 +4583,7 @@ Both these may change in the future. Incoming requests are matched against the h
<tr> <tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">fullyLabeledReplicas</p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">fullyLabeledReplicas</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">The number of pods that have labels matching the labels of the pod template of the replicaset.</p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">The number of pods that have labels matching the labels of the pod template of the replicaset.</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">true</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">integer (int32)</p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">integer (int32)</p></td>
<td class="tableblock halign-left valign-top"></td> <td class="tableblock halign-left valign-top"></td>
</tr> </tr>
@ -5605,7 +5605,7 @@ Both these may change in the future. Incoming requests are matched against the h
</div> </div>
<div id="footer"> <div id="footer">
<div id="footer-text"> <div id="footer-text">
Last updated 2016-03-11 23:39:49 UTC Last updated 2016-03-15 22:07:50 UTC
</div> </div>
</div> </div>
</body> </body>

4
docs/api-reference/v1/definitions.html
View File

@ -5565,7 +5565,7 @@ The resulting set of endpoints can be viewed as:<br>
<tr> <tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">fullyLabeledReplicas</p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">fullyLabeledReplicas</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">The number of pods that have labels matching the labels of the pod template of the replication controller.</p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">The number of pods that have labels matching the labels of the pod template of the replication controller.</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">true</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">integer (int32)</p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">integer (int32)</p></td>
<td class="tableblock halign-left valign-top"></td> <td class="tableblock halign-left valign-top"></td>
</tr> </tr>
@ -7632,7 +7632,7 @@ The resulting set of endpoints can be viewed as:<br>
</div> </div>
<div id="footer"> <div id="footer">
<div id="footer-text"> <div id="footer-text">
Last updated 2016-03-11 23:39:43 UTC Last updated 2016-03-15 20:32:41 UTC
</div> </div>
</div> </div>
</body> </body>

33
pkg/api/types.generated.go
View File

@ -26956,12 +26956,13 @@ func (x *ReplicationControllerStatus) CodecEncodeSelf(e *codec1978.Encoder) {
var yyq2 [3]bool var yyq2 [3]bool
_, _, _ = yysep2, yyq2, yy2arr2 _, _, _ = yysep2, yyq2, yy2arr2
const yyr2 bool = false const yyr2 bool = false
yyq2[1] = x.FullyLabeledReplicas != 0
yyq2[2] = x.ObservedGeneration != 0 yyq2[2] = x.ObservedGeneration != 0
var yynn2 int var yynn2 int
if yyr2 || yy2arr2 { if yyr2 || yy2arr2 {
r.EncodeArrayStart(3) r.EncodeArrayStart(3)
} else { } else {
yynn2 = 2 yynn2 = 1
for _, b := range yyq2 { for _, b := range yyq2 {
if b { if b {
yynn2++ yynn2++
@ -26991,21 +26992,27 @@ func (x *ReplicationControllerStatus) CodecEncodeSelf(e *codec1978.Encoder) {
} }
if yyr2 || yy2arr2 { if yyr2 || yy2arr2 {
z.EncSendContainerState(codecSelfer_containerArrayElem1234) z.EncSendContainerState(codecSelfer_containerArrayElem1234)
yym7 := z.EncBinary() if yyq2[1] {
_ = yym7 yym7 := z.EncBinary()
if false { _ = yym7
if false {
} else {
r.EncodeInt(int64(x.FullyLabeledReplicas))
}
} else { } else {
r.EncodeInt(int64(x.FullyLabeledReplicas)) r.EncodeInt(0)
} }
} else { } else {
z.EncSendContainerState(codecSelfer_containerMapKey1234) if yyq2[1] {
r.EncodeString(codecSelferC_UTF81234, string("fullyLabeledReplicas")) z.EncSendContainerState(codecSelfer_containerMapKey1234)
z.EncSendContainerState(codecSelfer_containerMapValue1234) r.EncodeString(codecSelferC_UTF81234, string("fullyLabeledReplicas"))
yym8 := z.EncBinary() z.EncSendContainerState(codecSelfer_containerMapValue1234)
_ = yym8 yym8 := z.EncBinary()
if false { _ = yym8
} else { if false {
r.EncodeInt(int64(x.FullyLabeledReplicas)) } else {
r.EncodeInt(int64(x.FullyLabeledReplicas))
}
} }
} }
if yyr2 || yy2arr2 { if yyr2 || yy2arr2 {

2
pkg/api/types.go
View File

@ -1381,7 +1381,7 @@ type ReplicationControllerStatus struct {
Replicas int `json:"replicas"` Replicas int `json:"replicas"`
// The number of pods that have labels matching the labels of the pod template of the replication controller. // 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 is the most recent generation observed by the controller.
ObservedGeneration int64 `json:"observedGeneration,omitempty"` ObservedGeneration int64 `json:"observedGeneration,omitempty"`

33
pkg/api/v1/types.generated.go
View File

@ -26686,12 +26686,13 @@ func (x *ReplicationControllerStatus) CodecEncodeSelf(e *codec1978.Encoder) {
var yyq2 [3]bool var yyq2 [3]bool
_, _, _ = yysep2, yyq2, yy2arr2 _, _, _ = yysep2, yyq2, yy2arr2
const yyr2 bool = false const yyr2 bool = false
yyq2[1] = x.FullyLabeledReplicas != 0
yyq2[2] = x.ObservedGeneration != 0 yyq2[2] = x.ObservedGeneration != 0
var yynn2 int var yynn2 int
if yyr2 || yy2arr2 { if yyr2 || yy2arr2 {
r.EncodeArrayStart(3) r.EncodeArrayStart(3)
} else { } else {
yynn2 = 2 yynn2 = 1
for _, b := range yyq2 { for _, b := range yyq2 {
if b { if b {
yynn2++ yynn2++
@ -26721,21 +26722,27 @@ func (x *ReplicationControllerStatus) CodecEncodeSelf(e *codec1978.Encoder) {
} }
if yyr2 || yy2arr2 { if yyr2 || yy2arr2 {
z.EncSendContainerState(codecSelfer_containerArrayElem1234) z.EncSendContainerState(codecSelfer_containerArrayElem1234)
yym7 := z.EncBinary() if yyq2[1] {
_ = yym7 yym7 := z.EncBinary()
if false { _ = yym7
if false {
} else {
r.EncodeInt(int64(x.FullyLabeledReplicas))
}
} else { } else {
r.EncodeInt(int64(x.FullyLabeledReplicas)) r.EncodeInt(0)
} }
} else { } else {
z.EncSendContainerState(codecSelfer_containerMapKey1234) if yyq2[1] {
r.EncodeString(codecSelferC_UTF81234, string("fullyLabeledReplicas")) z.EncSendContainerState(codecSelfer_containerMapKey1234)
z.EncSendContainerState(codecSelfer_containerMapValue1234) r.EncodeString(codecSelferC_UTF81234, string("fullyLabeledReplicas"))
yym8 := z.EncBinary() z.EncSendContainerState(codecSelfer_containerMapValue1234)
_ = yym8 yym8 := z.EncBinary()
if false { _ = yym8
} else { if false {
r.EncodeInt(int64(x.FullyLabeledReplicas)) } else {
r.EncodeInt(int64(x.FullyLabeledReplicas))
}
} }
} }
if yyr2 || yy2arr2 { if yyr2 || yy2arr2 {

2
pkg/api/v1/types.go
View File

@ -1680,7 +1680,7 @@ type ReplicationControllerStatus struct {
Replicas int32 `json:"replicas"` Replicas int32 `json:"replicas"`
// The number of pods that have labels matching the labels of the pod template of the replication controller. // 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 reflects the generation of the most recently observed replication controller.
ObservedGeneration int64 `json:"observedGeneration,omitempty"` ObservedGeneration int64 `json:"observedGeneration,omitempty"`

33
pkg/apis/extensions/types.generated.go
View File

@ -14892,12 +14892,13 @@ func (x *ReplicaSetStatus) CodecEncodeSelf(e *codec1978.Encoder) {
var yyq2 [3]bool var yyq2 [3]bool
_, _, _ = yysep2, yyq2, yy2arr2 _, _, _ = yysep2, yyq2, yy2arr2
const yyr2 bool = false const yyr2 bool = false
yyq2[1] = x.FullyLabeledReplicas != 0
yyq2[2] = x.ObservedGeneration != 0 yyq2[2] = x.ObservedGeneration != 0
var yynn2 int var yynn2 int
if yyr2 || yy2arr2 { if yyr2 || yy2arr2 {
r.EncodeArrayStart(3) r.EncodeArrayStart(3)
} else { } else {
yynn2 = 2 yynn2 = 1
for _, b := range yyq2 { for _, b := range yyq2 {
if b { if b {
yynn2++ yynn2++
@ -14927,21 +14928,27 @@ func (x *ReplicaSetStatus) CodecEncodeSelf(e *codec1978.Encoder) {
} }
if yyr2 || yy2arr2 { if yyr2 || yy2arr2 {
z.EncSendContainerState(codecSelfer_containerArrayElem1234) z.EncSendContainerState(codecSelfer_containerArrayElem1234)
yym7 := z.EncBinary() if yyq2[1] {
_ = yym7 yym7 := z.EncBinary()
if false { _ = yym7
if false {
} else {
r.EncodeInt(int64(x.FullyLabeledReplicas))
}
} else { } else {
r.EncodeInt(int64(x.FullyLabeledReplicas)) r.EncodeInt(0)
} }
} else { } else {
z.EncSendContainerState(codecSelfer_containerMapKey1234) if yyq2[1] {
r.EncodeString(codecSelferC_UTF81234, string("fullyLabeledReplicas")) z.EncSendContainerState(codecSelfer_containerMapKey1234)
z.EncSendContainerState(codecSelfer_containerMapValue1234) r.EncodeString(codecSelferC_UTF81234, string("fullyLabeledReplicas"))
yym8 := z.EncBinary() z.EncSendContainerState(codecSelfer_containerMapValue1234)
_ = yym8 yym8 := z.EncBinary()
if false { _ = yym8
} else { if false {
r.EncodeInt(int64(x.FullyLabeledReplicas)) } else {
r.EncodeInt(int64(x.FullyLabeledReplicas))
}
} }
} }
if yyr2 || yy2arr2 { if yyr2 || yy2arr2 {

2
pkg/apis/extensions/types.go
View File

@ -816,7 +816,7 @@ type ReplicaSetStatus struct {
Replicas int `json:"replicas"` Replicas int `json:"replicas"`
// The number of pods that have labels matching the labels of the pod template of the replicaset. // 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 is the most recent generation observed by the controller.
ObservedGeneration int64 `json:"observedGeneration,omitempty"` ObservedGeneration int64 `json:"observedGeneration,omitempty"`

33
pkg/apis/extensions/v1beta1/types.generated.go
View File

@ -16257,12 +16257,13 @@ func (x *ReplicaSetStatus) CodecEncodeSelf(e *codec1978.Encoder) {
var yyq2 [3]bool var yyq2 [3]bool
_, _, _ = yysep2, yyq2, yy2arr2 _, _, _ = yysep2, yyq2, yy2arr2
const yyr2 bool = false const yyr2 bool = false
yyq2[1] = x.FullyLabeledReplicas != 0
yyq2[2] = x.ObservedGeneration != 0 yyq2[2] = x.ObservedGeneration != 0
var yynn2 int var yynn2 int
if yyr2 || yy2arr2 { if yyr2 || yy2arr2 {
r.EncodeArrayStart(3) r.EncodeArrayStart(3)
} else { } else {
yynn2 = 2 yynn2 = 1
for _, b := range yyq2 { for _, b := range yyq2 {
if b { if b {
yynn2++ yynn2++
@ -16292,21 +16293,27 @@ func (x *ReplicaSetStatus) CodecEncodeSelf(e *codec1978.Encoder) {
} }
if yyr2 || yy2arr2 { if yyr2 || yy2arr2 {
z.EncSendContainerState(codecSelfer_containerArrayElem1234) z.EncSendContainerState(codecSelfer_containerArrayElem1234)
yym7 := z.EncBinary() if yyq2[1] {
_ = yym7 yym7 := z.EncBinary()
if false { _ = yym7
if false {
} else {
r.EncodeInt(int64(x.FullyLabeledReplicas))
}
} else { } else {
r.EncodeInt(int64(x.FullyLabeledReplicas)) r.EncodeInt(0)
} }
} else { } else {
z.EncSendContainerState(codecSelfer_containerMapKey1234) if yyq2[1] {
r.EncodeString(codecSelferC_UTF81234, string("fullyLabeledReplicas")) z.EncSendContainerState(codecSelfer_containerMapKey1234)
z.EncSendContainerState(codecSelfer_containerMapValue1234) r.EncodeString(codecSelferC_UTF81234, string("fullyLabeledReplicas"))
yym8 := z.EncBinary() z.EncSendContainerState(codecSelfer_containerMapValue1234)
_ = yym8 yym8 := z.EncBinary()
if false { _ = yym8
} else { if false {
r.EncodeInt(int64(x.FullyLabeledReplicas)) } else {
r.EncodeInt(int64(x.FullyLabeledReplicas))
}
} }
} }
if yyr2 || yy2arr2 { if yyr2 || yy2arr2 {

2
pkg/apis/extensions/v1beta1/types.go
View File

@ -908,7 +908,7 @@ type ReplicaSetStatus struct {
Replicas int32 `json:"replicas"` Replicas int32 `json:"replicas"`
// The number of pods that have labels matching the labels of the pod template of the replicaset. // 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 reflects the generation of the most recently observed ReplicaSet.
ObservedGeneration int64 `json:"observedGeneration,omitempty"` ObservedGeneration int64 `json:"observedGeneration,omitempty"`