diff --git a/pkg/api/testing/node_example.json b/pkg/api/testing/node_example.json index 6e32f3d6d50..e2ebd3a1e02 100644 --- a/pkg/api/testing/node_example.json +++ b/pkg/api/testing/node_example.json @@ -40,7 +40,7 @@ "bootID": "44a832f3-8cfb-4de5-b7d2-d66030b6cd95", "kernelVersion": "3.16.0-0.bpo.4-amd64", "osImage": "Debian GNU/Linux 7 (wheezy)", - "containerRuntimeVersion": "docker://1.5.0", + "containerRuntimeVersion": "containerd://1.4.2", "kubeletVersion": "v0.15.0-484-g0c8ee980d705a3-dirty", "kubeProxyVersion": "v0.15.0-484-g0c8ee980d705a3-dirty" } diff --git a/staging/src/k8s.io/api/core/v1/types.go b/staging/src/k8s.io/api/core/v1/types.go index 1900bc5a8c8..a5c21bbcc65 100644 --- a/staging/src/k8s.io/api/core/v1/types.go +++ b/staging/src/k8s.io/api/core/v1/types.go @@ -4900,7 +4900,7 @@ type NodeSystemInfo struct { KernelVersion string `json:"kernelVersion" protobuf:"bytes,4,opt,name=kernelVersion"` // OS Image reported by the node from /etc/os-release (e.g. Debian GNU/Linux 7 (wheezy)). OSImage string `json:"osImage" protobuf:"bytes,5,opt,name=osImage"` - // ContainerRuntime Version reported by the node through runtime remote API (e.g. docker://1.5.0). + // ContainerRuntime Version reported by the node through runtime remote API (e.g. containerd://1.4.2). ContainerRuntimeVersion string `json:"containerRuntimeVersion" protobuf:"bytes,6,opt,name=containerRuntimeVersion"` // Kubelet Version reported by the node. KubeletVersion string `json:"kubeletVersion" protobuf:"bytes,7,opt,name=kubeletVersion"`