From 086bb1ac0930398ca98c708cd971636fa2800f04 Mon Sep 17 00:00:00 2001 From: Dawn Chen Date: Wed, 25 Mar 2015 13:49:38 -0700 Subject: [PATCH] Add node components version to API --- pkg/api/types.go | 10 ++++++++++ pkg/api/v1beta1/types.go | 10 ++++++++++ pkg/api/v1beta2/types.go | 10 ++++++++++ pkg/api/v1beta3/types.go | 10 ++++++++++ 4 files changed, 40 insertions(+) diff --git a/pkg/api/types.go b/pkg/api/types.go index 273e59ad09d..3dc8d139352 100644 --- a/pkg/api/types.go +++ b/pkg/api/types.go @@ -968,6 +968,16 @@ type NodeSystemInfo struct { SystemUUID string `json:"systemUUID"` // BootID is the boot-id reported by the node BootID string `json:"bootID"` + // Kernel version reported by the node + 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"` + // Kubelet version reported by the node + KubeletVersion string `json:"kubeletVersion"` + // Kube-proxy version reported by the node + KubeProxyVersion string `json:"kubeProxyVersion"` } // NodeStatus is information about the current status of a node. diff --git a/pkg/api/v1beta1/types.go b/pkg/api/v1beta1/types.go index a8cda9ca232..9e07bfb122e 100644 --- a/pkg/api/v1beta1/types.go +++ b/pkg/api/v1beta1/types.go @@ -784,6 +784,16 @@ type NodeSystemInfo struct { SystemUUID string `json:"systemUUID" description:"system uuid is the system-uuid reported by the node"` // BootID is the boot-id reported by the node BootID string `json:"bootID" description:"boot id is the boot-id reported by the node"` + // Kernel version reported by the node + 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)"` + // Kubelet version reported by the node + KubeletVersion string `json:"kubeletVersion" description:"Kubelet version reported by the node"` + // Kube-proxy version reported by the node + KubeProxyVersion string `json:"KubeProxyVersion" description:"Kube-proxy version reported by the node"` } // NodeStatus is information about the current status of a node. diff --git a/pkg/api/v1beta2/types.go b/pkg/api/v1beta2/types.go index 325dd419bbe..3d63f496322 100644 --- a/pkg/api/v1beta2/types.go +++ b/pkg/api/v1beta2/types.go @@ -785,6 +785,16 @@ type NodeSystemInfo struct { SystemUUID string `json:"systemUUID" description:"system uuid is the system-uuid reported by the node"` // BootID is the boot-id reported by the node BootID string `json:"bootID" description:"boot id is the boot-id reported by the node"` + // Kernel version reported by the node + 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)"` + // Kubelet version reported by the node + KubeletVersion string `json:"kubeletVersion" description:"Kubelet version reported by the node"` + // Kube-proxy version reported by the node + KubeProxyVersion string `json:"KubeProxyVersion" description:"Kube-proxy version reported by the node"` } // NodeStatus is information about the current status of a node. diff --git a/pkg/api/v1beta3/types.go b/pkg/api/v1beta3/types.go index ca8105bdcf9..9e3560fd858 100644 --- a/pkg/api/v1beta3/types.go +++ b/pkg/api/v1beta3/types.go @@ -966,6 +966,16 @@ type NodeSystemInfo struct { SystemUUID string `json:"systemUUID"` // BootID is the boot-id reported by the node BootID string `json:"bootID" description:"boot id is the boot-id reported by the node"` + // Kernel version reported by the node + 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)"` + // Kubelet version reported by the node + KubeletVersion string `json:"kubeletVersion" description:"Kubelet version reported by the node"` + // Kube-proxy version reported by the node + KubeProxyVersion string `json:"KubeProxyVersion" description:"Kube-proxy version reported by the node"` } // NodeStatus is information about the current status of a node.