github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 11:50:44 +00:00
Code Issues Projects Releases Wiki Activity

Avoid using Docker Engine as example for container runtime

Browse Source 
Docker Engine isn't directly compatible with recent Kubernetes.
This commit is contained in:
Tim Bannister 2022-03-01 23:07:00 +00:00
parent b803c8ebe2
commit 539b6173e9
No known key found for this signature in database
GPG Key ID: 1E76582C4F66FA48
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/api/testing/node_example.json
View File

@ -40,7 +40,7 @@
"bootID": "44a832f3-8cfb-4de5-b7d2-d66030b6cd95", "bootID": "44a832f3-8cfb-4de5-b7d2-d66030b6cd95",
"kernelVersion": "3.16.0-0.bpo.4-amd64", "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", "containerRuntimeVersion": "containerd://1.4.2",
"kubeletVersion": "v0.15.0-484-g0c8ee980d705a3-dirty", "kubeletVersion": "v0.15.0-484-g0c8ee980d705a3-dirty",
"kubeProxyVersion": "v0.15.0-484-g0c8ee980d705a3-dirty" "kubeProxyVersion": "v0.15.0-484-g0c8ee980d705a3-dirty"
} }

2
staging/src/k8s.io/api/core/v1/types.go
View File

@ -4900,7 +4900,7 @@ type NodeSystemInfo struct {
KernelVersion string `json:"kernelVersion" protobuf:"bytes,4,opt,name=kernelVersion"` 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)). // 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"` 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"` ContainerRuntimeVersion string `json:"containerRuntimeVersion" protobuf:"bytes,6,opt,name=containerRuntimeVersion"`
// Kubelet Version reported by the node. // Kubelet Version reported by the node.
KubeletVersion string `json:"kubeletVersion" protobuf:"bytes,7,opt,name=kubeletVersion"` KubeletVersion string `json:"kubeletVersion" protobuf:"bytes,7,opt,name=kubeletVersion"`