github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-05 15:37:24 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #18617 from mqliang/OSImage

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2015-12-17 08:50:48 -08:00
parent af55b6903d a21dd8a32b
commit 674e24a16e
10 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29010,7 +29010,7 @@ func (x *NodeSystemInfo) CodecEncodeSelf(e *codec1978.Encoder) {
_ = yym2272
if false {
} else {
r.EncodeString(codecSelferC_UTF81234, string(x.OsImage))
r.EncodeString(codecSelferC_UTF81234, string(x.OSImage))
}
} else {
z.EncSendContainerState(codecSelfer_containerMapKey1234)
@@ -29020,7 +29020,7 @@ func (x *NodeSystemInfo) CodecEncodeSelf(e *codec1978.Encoder) {
_ = yym2273
if false {
} else {
r.EncodeString(codecSelferC_UTF81234, string(x.OsImage))
r.EncodeString(codecSelferC_UTF81234, string(x.OSImage))
}
}
if yyr2258 || yy2arr2258 {
@@ -29167,9 +29167,9 @@ func (x *NodeSystemInfo) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
}
case "osImage":
if r.TryDecodeAsNil() {
x.OsImage = ""
x.OSImage = ""
} else {
x.OsImage = string(r.DecodeString())
x.OSImage = string(r.DecodeString())
}
case "containerRuntimeVersion":
if r.TryDecodeAsNil() {
@@ -29279,9 +29279,9 @@ func (x *NodeSystemInfo) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
}
z.DecSendContainerState(codecSelfer_containerArrayElem1234)
if r.TryDecodeAsNil() {
x.OsImage = ""
x.OSImage = ""
} else {
x.OsImage = string(r.DecodeString())
x.OSImage = string(r.DecodeString())
}
yyj2294++
if yyhl2294 {