diff --git a/pkg/api/deep_copy_generated.go b/pkg/api/deep_copy_generated.go index 31cb597a3a9..a8e15d70c7f 100644 --- a/pkg/api/deep_copy_generated.go +++ b/pkg/api/deep_copy_generated.go @@ -1011,7 +1011,7 @@ func deepCopy_api_NodeSystemInfo(in NodeSystemInfo, out *NodeSystemInfo, c *conv out.SystemUUID = in.SystemUUID out.BootID = in.BootID out.KernelVersion = in.KernelVersion - out.OsImage = in.OsImage + out.OSImage = in.OSImage out.ContainerRuntimeVersion = in.ContainerRuntimeVersion out.KubeletVersion = in.KubeletVersion out.KubeProxyVersion = in.KubeProxyVersion diff --git a/pkg/api/types.generated.go b/pkg/api/types.generated.go index 4d2b50c5776..8bcc621b823 100644 --- a/pkg/api/types.generated.go +++ b/pkg/api/types.generated.go @@ -28999,7 +28999,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) @@ -29009,7 +29009,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 { @@ -29156,9 +29156,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() { @@ -29268,9 +29268,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 { diff --git a/pkg/api/types.go b/pkg/api/types.go index 34d3e86cd1d..6f0d504b141 100644 --- a/pkg/api/types.go +++ b/pkg/api/types.go @@ -1458,7 +1458,7 @@ type NodeSystemInfo struct { // Kernel Version reported by the node. KernelVersion string `json:"kernelVersion"` // OS Image reported by the node. - OsImage string `json:"osImage"` + OSImage string `json:"osImage"` // ContainerRuntime Version reported by the node. ContainerRuntimeVersion string `json:"containerRuntimeVersion"` // Kubelet Version reported by the node. diff --git a/pkg/api/v1/conversion_generated.go b/pkg/api/v1/conversion_generated.go index fdef3cdc910..e0bf4084121 100644 --- a/pkg/api/v1/conversion_generated.go +++ b/pkg/api/v1/conversion_generated.go @@ -1428,7 +1428,7 @@ func autoconvert_api_NodeSystemInfo_To_v1_NodeSystemInfo(in *api.NodeSystemInfo, out.SystemUUID = in.SystemUUID out.BootID = in.BootID out.KernelVersion = in.KernelVersion - out.OsImage = in.OsImage + out.OSImage = in.OSImage out.ContainerRuntimeVersion = in.ContainerRuntimeVersion out.KubeletVersion = in.KubeletVersion out.KubeProxyVersion = in.KubeProxyVersion @@ -4483,7 +4483,7 @@ func autoconvert_v1_NodeSystemInfo_To_api_NodeSystemInfo(in *NodeSystemInfo, out out.SystemUUID = in.SystemUUID out.BootID = in.BootID out.KernelVersion = in.KernelVersion - out.OsImage = in.OsImage + out.OSImage = in.OSImage out.ContainerRuntimeVersion = in.ContainerRuntimeVersion out.KubeletVersion = in.KubeletVersion out.KubeProxyVersion = in.KubeProxyVersion diff --git a/pkg/api/v1/deep_copy_generated.go b/pkg/api/v1/deep_copy_generated.go index 4d44fa9986f..33bd83805bc 100644 --- a/pkg/api/v1/deep_copy_generated.go +++ b/pkg/api/v1/deep_copy_generated.go @@ -1060,7 +1060,7 @@ func deepCopy_v1_NodeSystemInfo(in NodeSystemInfo, out *NodeSystemInfo, c *conve out.SystemUUID = in.SystemUUID out.BootID = in.BootID out.KernelVersion = in.KernelVersion - out.OsImage = in.OsImage + out.OSImage = in.OSImage out.ContainerRuntimeVersion = in.ContainerRuntimeVersion out.KubeletVersion = in.KubeletVersion out.KubeProxyVersion = in.KubeProxyVersion diff --git a/pkg/api/v1/types.generated.go b/pkg/api/v1/types.generated.go index df68ce079d2..15659e054f1 100644 --- a/pkg/api/v1/types.generated.go +++ b/pkg/api/v1/types.generated.go @@ -28850,7 +28850,7 @@ func (x *NodeSystemInfo) CodecEncodeSelf(e *codec1978.Encoder) { _ = yym2259 if false { } else { - r.EncodeString(codecSelferC_UTF81234, string(x.OsImage)) + r.EncodeString(codecSelferC_UTF81234, string(x.OSImage)) } } else { z.EncSendContainerState(codecSelfer_containerMapKey1234) @@ -28860,7 +28860,7 @@ func (x *NodeSystemInfo) CodecEncodeSelf(e *codec1978.Encoder) { _ = yym2260 if false { } else { - r.EncodeString(codecSelferC_UTF81234, string(x.OsImage)) + r.EncodeString(codecSelferC_UTF81234, string(x.OSImage)) } } if yyr2245 || yy2arr2245 { @@ -29007,9 +29007,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() { @@ -29119,9 +29119,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()) } yyj2281++ if yyhl2281 { diff --git a/pkg/api/v1/types.go b/pkg/api/v1/types.go index eceb2682751..fafd2700649 100644 --- a/pkg/api/v1/types.go +++ b/pkg/api/v1/types.go @@ -1834,7 +1834,7 @@ type NodeSystemInfo struct { // Kernel Version reported by the node from 'uname -r' (e.g. 3.16.0-0.bpo.4-amd64). KernelVersion string `json:"kernelVersion"` // OS Image reported by the node from /etc/os-release (e.g. Debian GNU/Linux 7 (wheezy)). - OsImage string `json:"osImage"` + OSImage string `json:"osImage"` // ContainerRuntime Version reported by the node through runtime remote API (e.g. docker://1.5.0). ContainerRuntimeVersion string `json:"containerRuntimeVersion"` // Kubelet Version reported by the node. diff --git a/pkg/kubectl/describe.go b/pkg/kubectl/describe.go index 788f898d59a..aac155c7e58 100644 --- a/pkg/kubectl/describe.go +++ b/pkg/kubectl/describe.go @@ -1329,7 +1329,7 @@ func describeNode(node *api.Node, pods []*api.Pod, events *api.EventList) (strin fmt.Fprintf(out, " System UUID:\t%s\n", node.Status.NodeInfo.SystemUUID) fmt.Fprintf(out, " Boot ID:\t%s\n", node.Status.NodeInfo.BootID) fmt.Fprintf(out, " Kernel Version:\t%s\n", node.Status.NodeInfo.KernelVersion) - fmt.Fprintf(out, " OS Image:\t%s\n", node.Status.NodeInfo.OsImage) + fmt.Fprintf(out, " OS Image:\t%s\n", node.Status.NodeInfo.OSImage) fmt.Fprintf(out, " Container Runtime Version:\t%s\n", node.Status.NodeInfo.ContainerRuntimeVersion) fmt.Fprintf(out, " Kubelet Version:\t%s\n", node.Status.NodeInfo.KubeletVersion) fmt.Fprintf(out, " Kube-Proxy Version:\t%s\n", node.Status.NodeInfo.KubeProxyVersion) diff --git a/pkg/kubelet/kubelet.go b/pkg/kubelet/kubelet.go index 7d3954bf28a..1fbd6aa2fda 100644 --- a/pkg/kubelet/kubelet.go +++ b/pkg/kubelet/kubelet.go @@ -2776,7 +2776,7 @@ func (kl *Kubelet) setNodeStatusVersionInfo(node *api.Node) { glog.Errorf("Error getting version info: %v", err) } else { node.Status.NodeInfo.KernelVersion = verinfo.KernelVersion - node.Status.NodeInfo.OsImage = verinfo.ContainerOsVersion + node.Status.NodeInfo.OSImage = verinfo.ContainerOsVersion // TODO: Determine the runtime is docker or rocket node.Status.NodeInfo.ContainerRuntimeVersion = "docker://" + verinfo.DockerVersion node.Status.NodeInfo.KubeletVersion = version.Get().String() diff --git a/pkg/kubelet/kubelet_test.go b/pkg/kubelet/kubelet_test.go index 967a42828a6..bd361c78dfd 100644 --- a/pkg/kubelet/kubelet_test.go +++ b/pkg/kubelet/kubelet_test.go @@ -2491,7 +2491,7 @@ func TestUpdateNewNodeStatus(t *testing.T) { SystemUUID: "abc", BootID: "1b3", KernelVersion: "3.16.0-0.bpo.4-amd64", - OsImage: "Debian GNU/Linux 7 (wheezy)", + OSImage: "Debian GNU/Linux 7 (wheezy)", ContainerRuntimeVersion: "docker://1.5.0", KubeletVersion: version.Get().String(), KubeProxyVersion: version.Get().String(), @@ -2612,7 +2612,7 @@ func testDockerRuntimeVersion(t *testing.T) { SystemUUID: "abc", BootID: "1b3", KernelVersion: "3.16.0-0.bpo.4-amd64", - OsImage: "Debian GNU/Linux 7 (wheezy)", + OSImage: "Debian GNU/Linux 7 (wheezy)", ContainerRuntimeVersion: "docker://1.5.0", KubeletVersion: version.Get().String(), KubeProxyVersion: version.Get().String(), @@ -2782,7 +2782,7 @@ func TestUpdateExistingNodeStatus(t *testing.T) { SystemUUID: "abc", BootID: "1b3", KernelVersion: "3.16.0-0.bpo.4-amd64", - OsImage: "Debian GNU/Linux 7 (wheezy)", + OSImage: "Debian GNU/Linux 7 (wheezy)", ContainerRuntimeVersion: "docker://1.5.0", KubeletVersion: version.Get().String(), KubeProxyVersion: version.Get().String(), @@ -2909,7 +2909,7 @@ func TestUpdateNodeStatusWithoutContainerRuntime(t *testing.T) { SystemUUID: "abc", BootID: "1b3", KernelVersion: "3.16.0-0.bpo.4-amd64", - OsImage: "Debian GNU/Linux 7 (wheezy)", + OSImage: "Debian GNU/Linux 7 (wheezy)", ContainerRuntimeVersion: "docker://1.5.0", KubeletVersion: version.Get().String(), KubeProxyVersion: version.Get().String(),