From 87db1c900700875553f8fd4d3f6b3c9c2a0359f4 Mon Sep 17 00:00:00 2001 From: Dawn Chen Date: Fri, 27 Mar 2015 11:03:43 -0700 Subject: [PATCH] Rename DockerVerstion to ContainerRuntimeVersion for rocket support --- pkg/api/types.go | 4 ++-- pkg/api/v1beta1/types.go | 4 ++-- pkg/api/v1beta2/types.go | 4 ++-- pkg/api/v1beta3/types.go | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkg/api/types.go b/pkg/api/types.go index 3dc8d13935..73140e632e 100644 --- a/pkg/api/types.go +++ b/pkg/api/types.go @@ -972,8 +972,8 @@ type NodeSystemInfo struct { KernelVersion string `json:"kernelVersion""` // OS image used reported by the node OsImage string `json:"osImage"` - // Docker version reported by the node - DockerVersion string `json:"dockerVersion"` + // Container runtime version reported by the node + ContainerRuntimeVersion string `json:"containerRuntimeVersion"` // Kubelet version reported by the node KubeletVersion string `json:"kubeletVersion"` // Kube-proxy version reported by the node diff --git a/pkg/api/v1beta1/types.go b/pkg/api/v1beta1/types.go index 9e07bfb122..d884984226 100644 --- a/pkg/api/v1beta1/types.go +++ b/pkg/api/v1beta1/types.go @@ -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)"` // 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))"` - // Docker 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)"` + // Container runtime version reported by the node + 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 KubeletVersion string `json:"kubeletVersion" description:"Kubelet version reported by the node"` // Kube-proxy version reported by the node diff --git a/pkg/api/v1beta2/types.go b/pkg/api/v1beta2/types.go index 3d63f49632..b3d4ec37fc 100644 --- a/pkg/api/v1beta2/types.go +++ b/pkg/api/v1beta2/types.go @@ -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)"` // 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))"` - // Docker 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)"` + // Container runtime version reported by the node + 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 KubeletVersion string `json:"kubeletVersion" description:"Kubelet version reported by the node"` // Kube-proxy version reported by the node diff --git a/pkg/api/v1beta3/types.go b/pkg/api/v1beta3/types.go index 9e3560fd85..78dd10439e 100644 --- a/pkg/api/v1beta3/types.go +++ b/pkg/api/v1beta3/types.go @@ -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)"` // 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))"` - // Docker 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)"` + // Container runtime version reported by the node + 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 KubeletVersion string `json:"kubeletVersion" description:"Kubelet version reported by the node"` // Kube-proxy version reported by the node