Skip to content

K
k3s
Commit 674e24a1 authored by k8s-merge-robot's avatar k8s-merge-robot
Browse files
Options

Merge pull request #18617 from mqliang/OSImage

Auto commit by PR queue bot
parents af55b690 a21dd8a3
Hide whitespace changes
Inline Side-by-side
Showing with 24 additions and 24 deletions
pkg/api/deep_copy_generated.go
View file @ 674e24a1
......@@ -1023,7 +1023,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
......
pkg/api/types.generated.go
View file @ 674e24a1
......@@ -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 {
pkg/api/types.go
View file @ 674e24a1
......@@ -1478,7 +1478,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.
......
pkg/api/v1/conversion_generated.go
View file @ 674e24a1
......@@ -1440,7 +1440,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
......@@ -4539,7 +4539,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
......
pkg/api/v1/deep_copy_generated.go
View file @ 674e24a1
......@@ -1081,7 +1081,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
......
pkg/api/v1/types.generated.go
View file @ 674e24a1
......@@ -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 {
pkg/api/v1/types.go
View file @ 674e24a1
......@@ -1853,7 +1853,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.
......
pkg/kubectl/describe.go
View file @ 674e24a1
......@@ -1376,7 +1376,7 @@ func describeNode(node *api.Node, nodeNonTerminatedPodsList *api.PodList, events
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)
......
pkg/kubelet/kubelet.go
View file @ 674e24a1
......@@ -2754,7 +2754,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()
......
pkg/kubelet/kubelet_test.go
View file @ 674e24a1
......@@ -2492,7 +2492,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(),
......@@ -2613,7 +2613,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(),
......@@ -2783,7 +2783,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(),
......@@ -2910,7 +2910,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(),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment