github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Rename DockerVerstion to ContainerRuntimeVersion for rocket support

pull/6/head
Dawn Chen 2015-03-27 11:03:43 -07:00
parent 086bb1ac09
commit 87db1c9007
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/api/types.go
View File

@ -972,8 +972,8 @@ type NodeSystemInfo struct {
KernelVersion string `json:"kernelVersion""` KernelVersion string `json:"kernelVersion""`
// OS image used reported by the node // OS image used reported by the node
OsImage string `json:"osImage"` OsImage string `json:"osImage"`
// Docker version reported by the node // Container runtime version reported by the node
DockerVersion string `json:"dockerVersion"` ContainerRuntimeVersion string `json:"containerRuntimeVersion"`
// Kubelet version reported by the node // Kubelet version reported by the node
KubeletVersion string `json:"kubeletVersion"` KubeletVersion string `json:"kubeletVersion"`
// Kube-proxy version reported by the node // Kube-proxy version reported by the node

4
pkg/api/v1beta1/types.go
View File

@ -788,8 +788,8 @@ type NodeSystemInfo struct {
KernelVersion string `json:"kernelVersion" description:"Kernel version reported by the node from 'uname -r' (e.g. 3.16.0-0.bpo.4-amd64)"` KernelVersion string `json:"kernelVersion" description:"Kernel version reported by the node from 'uname -r' (e.g. 3.16.0-0.bpo.4-amd64)"`
// OS image used reported by the node // OS image used reported by the node
OsImage string `json:"osImage" description:"OS image used reported by the node from /etc/os-release (e.g. Debian GNU/Linux 7 (wheezy))"` OsImage string `json:"osImage" description:"OS image used reported by the node from /etc/os-release (e.g. Debian GNU/Linux 7 (wheezy))"`
// Docker version reported by the node // Container runtime version reported by the node
DockerVersion string `json:"dockerVersion" description:"Docker version reported by the node through docker remote API (e.g. 1.5.0)"` ContainerRuntimeVersion string `json:"containerRuntimeVersion" description:"Container runtime version reported by the node through runtime remote API (e.g. docker://1.5.0)"`
// Kubelet version reported by the node // Kubelet version reported by the node
KubeletVersion string `json:"kubeletVersion" description:"Kubelet version reported by the node"` KubeletVersion string `json:"kubeletVersion" description:"Kubelet version reported by the node"`
// Kube-proxy version reported by the node // Kube-proxy version reported by the node

4
pkg/api/v1beta2/types.go
View File

@ -789,8 +789,8 @@ type NodeSystemInfo struct {
KernelVersion string `json:"kernelVersion" description:"Kernel version reported by the node from 'uname -r' (e.g. 3.16.0-0.bpo.4-amd64)"` KernelVersion string `json:"kernelVersion" description:"Kernel version reported by the node from 'uname -r' (e.g. 3.16.0-0.bpo.4-amd64)"`
// OS image used reported by the node // OS image used reported by the node
OsImage string `json:"osImage" description:"OS image used reported by the node from /etc/os-release (e.g. Debian GNU/Linux 7 (wheezy))"` OsImage string `json:"osImage" description:"OS image used reported by the node from /etc/os-release (e.g. Debian GNU/Linux 7 (wheezy))"`
// Docker version reported by the node // Container runtime version reported by the node
DockerVersion string `json:"dockerVersion" description:"Docker version reported by the node through docker remote API (e.g. 1.5.0)"` ContainerRuntimeVersion string `json:"containerRuntimeVersion" description:"Container runtime version reported by the node through runtime remote API (e.g. docker://1.5.0)"`
// Kubelet version reported by the node // Kubelet version reported by the node
KubeletVersion string `json:"kubeletVersion" description:"Kubelet version reported by the node"` KubeletVersion string `json:"kubeletVersion" description:"Kubelet version reported by the node"`
// Kube-proxy version reported by the node // Kube-proxy version reported by the node

4
pkg/api/v1beta3/types.go
View File

@ -970,8 +970,8 @@ type NodeSystemInfo struct {
KernelVersion string `json:"kernelVersion" description:"Kernel version reported by the node from 'uname -r' (e.g. 3.16.0-0.bpo.4-amd64)"` KernelVersion string `json:"kernelVersion" description:"Kernel version reported by the node from 'uname -r' (e.g. 3.16.0-0.bpo.4-amd64)"`
// OS image used reported by the node // OS image used reported by the node
OsImage string `json:"osImage" description:"OS image used reported by the node from /etc/os-release (e.g. Debian GNU/Linux 7 (wheezy))"` OsImage string `json:"osImage" description:"OS image used reported by the node from /etc/os-release (e.g. Debian GNU/Linux 7 (wheezy))"`
// Docker version reported by the node // Container runtime version reported by the node
DockerVersion string `json:"dockerVersion" description:"Docker version reported by the node through docker remote API (e.g. 1.5.0)"` ContainerRuntimeVersion string `json:"containerRuntimeVersion" description:"Container runtime version reported by the node through runtime remote API (e.g. docker://1.5.0)"`
// Kubelet version reported by the node // Kubelet version reported by the node
KubeletVersion string `json:"kubeletVersion" description:"Kubelet version reported by the node"` KubeletVersion string `json:"kubeletVersion" description:"Kubelet version reported by the node"`
// Kube-proxy version reported by the node // Kube-proxy version reported by the node