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

Merge pull request #24347 from derekwaynecarr/fix_configmap

Browse Source 
Automatic merge from submit-queue

Fix ConfigMapList.Items to not use omitempty

Fixes https://github.com/kubernetes/kubernetes/issues/24335
This commit is contained in:
k8s-merge-robot 2016-04-22 04:07:44 -07:00
commit 66dc446ba0
6 changed files with 45 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15143,6 +15143,9 @@
"v1.ConfigMapList": { "v1.ConfigMapList": {
"id": "v1.ConfigMapList", "id": "v1.ConfigMapList",
"description": "ConfigMapList is a resource containing a list of ConfigMap objects.", "description": "ConfigMapList is a resource containing a list of ConfigMap objects.",
"required": [
"items"
],
"properties": { "properties": {
"kind": { "kind": {
"type": "string", "type": "string",

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

@ -1286,7 +1286,7 @@ Examples:<br>
<tr> <tr>
<td class="tableblock halign-left valign-top"><p class="tableblock">items</p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">items</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock">Items is the list of ConfigMaps.</p></td> <td class="tableblock halign-left valign-top"><p class="tableblock">Items is the list of ConfigMaps.</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">true</p></td>
<td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_v1_configmap">v1.ConfigMap</a> array</p></td> <td class="tableblock halign-left valign-top"><p class="tableblock"><a href="#_v1_configmap">v1.ConfigMap</a> array</p></td>
<td class="tableblock halign-left valign-top"></td> <td class="tableblock halign-left valign-top"></td>
</tr> </tr>
@ -7742,7 +7742,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-04-15 09:26:34 UTC Last updated 2016-04-21 02:45:03 UTC
</div> </div>
</div> </div>
</body> </body>

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

@ -46755,14 +46755,13 @@ func (x *ConfigMapList) CodecEncodeSelf(e *codec1978.Encoder) {
_, _, _ = yysep2, yyq2, yy2arr2 _, _, _ = yysep2, yyq2, yy2arr2
const yyr2 bool = false const yyr2 bool = false
yyq2[0] = true yyq2[0] = true
yyq2[1] = len(x.Items) != 0
yyq2[2] = x.Kind != "" yyq2[2] = x.Kind != ""
yyq2[3] = x.APIVersion != "" yyq2[3] = x.APIVersion != ""
var yynn2 int var yynn2 int
if yyr2 || yy2arr2 { if yyr2 || yy2arr2 {
r.EncodeArrayStart(4) r.EncodeArrayStart(4)
} else { } else {
yynn2 = 0 yynn2 = 1
for _, b := range yyq2 { for _, b := range yyq2 {
if b { if b {
yynn2++ yynn2++
@ -46802,7 +46801,6 @@ func (x *ConfigMapList) CodecEncodeSelf(e *codec1978.Encoder) {
} }
if yyr2 || yy2arr2 { if yyr2 || yy2arr2 {
z.EncSendContainerState(codecSelfer_containerArrayElem1234) z.EncSendContainerState(codecSelfer_containerArrayElem1234)
if yyq2[1] {
if x.Items == nil { if x.Items == nil {
r.EncodeNil() r.EncodeNil()
} else { } else {
@ -46814,10 +46812,6 @@ func (x *ConfigMapList) CodecEncodeSelf(e *codec1978.Encoder) {
} }
} }
} else { } else {
r.EncodeNil()
}
} else {
if yyq2[1] {
z.EncSendContainerState(codecSelfer_containerMapKey1234) z.EncSendContainerState(codecSelfer_containerMapKey1234)
r.EncodeString(codecSelferC_UTF81234, string("items")) r.EncodeString(codecSelferC_UTF81234, string("items"))
z.EncSendContainerState(codecSelfer_containerMapValue1234) z.EncSendContainerState(codecSelfer_containerMapValue1234)
@ -46832,7 +46826,6 @@ func (x *ConfigMapList) CodecEncodeSelf(e *codec1978.Encoder) {
} }
} }
} }
}
if yyr2 || yy2arr2 { if yyr2 || yy2arr2 {
z.EncSendContainerState(codecSelfer_containerArrayElem1234) z.EncSendContainerState(codecSelfer_containerArrayElem1234)
if yyq2[2] { if yyq2[2] {

2
pkg/api/types.go
View File

@ -2409,7 +2409,7 @@ type ConfigMapList struct {
unversioned.ListMeta `json:"metadata,omitempty"` unversioned.ListMeta `json:"metadata,omitempty"`
// Items is the list of ConfigMaps. // Items is the list of ConfigMaps.
Items []ConfigMap `json:"items,omitempty"` Items []ConfigMap `json:"items"`
} }
// These constants are for remote command execution and port forwarding and are // These constants are for remote command execution and port forwarding and are

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

@ -46567,14 +46567,13 @@ func (x *ConfigMapList) CodecEncodeSelf(e *codec1978.Encoder) {
_, _, _ = yysep2, yyq2, yy2arr2 _, _, _ = yysep2, yyq2, yy2arr2
const yyr2 bool = false const yyr2 bool = false
yyq2[0] = true yyq2[0] = true
yyq2[1] = len(x.Items) != 0
yyq2[2] = x.Kind != "" yyq2[2] = x.Kind != ""
yyq2[3] = x.APIVersion != "" yyq2[3] = x.APIVersion != ""
var yynn2 int var yynn2 int
if yyr2 || yy2arr2 { if yyr2 || yy2arr2 {
r.EncodeArrayStart(4) r.EncodeArrayStart(4)
} else { } else {
yynn2 = 0 yynn2 = 1
for _, b := range yyq2 { for _, b := range yyq2 {
if b { if b {
yynn2++ yynn2++
@ -46614,7 +46613,6 @@ func (x *ConfigMapList) CodecEncodeSelf(e *codec1978.Encoder) {
} }
if yyr2 || yy2arr2 { if yyr2 || yy2arr2 {
z.EncSendContainerState(codecSelfer_containerArrayElem1234) z.EncSendContainerState(codecSelfer_containerArrayElem1234)
if yyq2[1] {
if x.Items == nil { if x.Items == nil {
r.EncodeNil() r.EncodeNil()
} else { } else {
@ -46626,10 +46624,6 @@ func (x *ConfigMapList) CodecEncodeSelf(e *codec1978.Encoder) {
} }
} }
} else { } else {
r.EncodeNil()
}
} else {
if yyq2[1] {
z.EncSendContainerState(codecSelfer_containerMapKey1234) z.EncSendContainerState(codecSelfer_containerMapKey1234)
r.EncodeString(codecSelferC_UTF81234, string("items")) r.EncodeString(codecSelferC_UTF81234, string("items"))
z.EncSendContainerState(codecSelfer_containerMapValue1234) z.EncSendContainerState(codecSelfer_containerMapValue1234)
@ -46644,7 +46638,6 @@ func (x *ConfigMapList) CodecEncodeSelf(e *codec1978.Encoder) {
} }
} }
} }
}
if yyr2 || yy2arr2 { if yyr2 || yy2arr2 {
z.EncSendContainerState(codecSelfer_containerArrayElem1234) z.EncSendContainerState(codecSelfer_containerArrayElem1234)
if yyq2[2] { if yyq2[2] {

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

@ -2858,7 +2858,7 @@ type ConfigMapList struct {
unversioned.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` unversioned.ListMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
// Items is the list of ConfigMaps. // Items is the list of ConfigMaps.
Items []ConfigMap `json:"items,omitempty" protobuf:"bytes,2,rep,name=items"` Items []ConfigMap `json:"items" protobuf:"bytes,2,rep,name=items"`
} }
// Type and constants for component health validation. // Type and constants for component health validation.