From 44d9a30f685c649cf077ddd88a07380a9fe6c516 Mon Sep 17 00:00:00 2001 From: Justin Santa Barbara Date: Tue, 31 Jan 2017 10:39:32 -0500 Subject: [PATCH] Map NvidiaGPUs / --experimental-nvidia-gpus Issue #518 --- pkg/apis/kops/componentconfig.go | 5 +++-- pkg/apis/kops/v1alpha1/componentconfig.go | 5 +++-- pkg/apis/kops/v1alpha1/zz_generated.conversion.go | 2 ++ pkg/apis/kops/v1alpha2/componentconfig.go | 3 +++ 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/pkg/apis/kops/componentconfig.go b/pkg/apis/kops/componentconfig.go index 9926b7f8ff..bed6b0f05e 100644 --- a/pkg/apis/kops/componentconfig.go +++ b/pkg/apis/kops/componentconfig.go @@ -218,8 +218,9 @@ type KubeletConfigSpec struct { // maxPods is the number of pods that can run on this Kubelet. MaxPods *int32 `json:"maxPods,omitempty" flag:"max-pods"` - //// nvidiaGPUs is the number of NVIDIA GPU devices on this node. - //NvidiaGPUs int32 `json:"nvidiaGPUs"` + // nvidiaGPUs is the number of NVIDIA GPU devices on this node. + NvidiaGPUs int32 `json:"nvidiaGPUs,omitempty" flag:"experimental-nvidia-gpus"` + //// dockerExecHandlerName is the handler to use when executing a command //// in a container. Valid values are 'native' and 'nsenter'. Defaults to //// 'native'. diff --git a/pkg/apis/kops/v1alpha1/componentconfig.go b/pkg/apis/kops/v1alpha1/componentconfig.go index 00587a13f8..2686a5a420 100644 --- a/pkg/apis/kops/v1alpha1/componentconfig.go +++ b/pkg/apis/kops/v1alpha1/componentconfig.go @@ -217,8 +217,9 @@ type KubeletConfigSpec struct { // maxPods is the number of pods that can run on this Kubelet. MaxPods *int32 `json:"maxPods,omitempty" flag:"max-pods"` - //// nvidiaGPUs is the number of NVIDIA GPU devices on this node. - //NvidiaGPUs int32 `json:"nvidiaGPUs"` + // nvidiaGPUs is the number of NVIDIA GPU devices on this node. + NvidiaGPUs int32 `json:"nvidiaGPUs,omitempty" flag:"experimental-nvidia-gpus"` + //// dockerExecHandlerName is the handler to use when executing a command //// in a container. Valid values are 'native' and 'nsenter'. Defaults to //// 'native'. diff --git a/pkg/apis/kops/v1alpha1/zz_generated.conversion.go b/pkg/apis/kops/v1alpha1/zz_generated.conversion.go index a36c3b8806..fde1b962b3 100644 --- a/pkg/apis/kops/v1alpha1/zz_generated.conversion.go +++ b/pkg/apis/kops/v1alpha1/zz_generated.conversion.go @@ -1177,6 +1177,7 @@ func autoConvert_v1alpha1_KubeletConfigSpec_To_kops_KubeletConfigSpec(in *Kubele out.HairpinMode = in.HairpinMode out.BabysitDaemons = in.BabysitDaemons out.MaxPods = in.MaxPods + out.NvidiaGPUs = in.NvidiaGPUs out.PodCIDR = in.PodCIDR out.ReconcileCIDR = in.ReconcileCIDR out.RegisterSchedulable = in.RegisterSchedulable @@ -1213,6 +1214,7 @@ func autoConvert_kops_KubeletConfigSpec_To_v1alpha1_KubeletConfigSpec(in *kops.K out.HairpinMode = in.HairpinMode out.BabysitDaemons = in.BabysitDaemons out.MaxPods = in.MaxPods + out.NvidiaGPUs = in.NvidiaGPUs out.PodCIDR = in.PodCIDR out.ReconcileCIDR = in.ReconcileCIDR out.RegisterSchedulable = in.RegisterSchedulable diff --git a/pkg/apis/kops/v1alpha2/componentconfig.go b/pkg/apis/kops/v1alpha2/componentconfig.go index 54971b9945..723e23c7a8 100644 --- a/pkg/apis/kops/v1alpha2/componentconfig.go +++ b/pkg/apis/kops/v1alpha2/componentconfig.go @@ -81,6 +81,9 @@ type KubeletConfigSpec struct { // maxPods is the number of pods that can run on this Kubelet. MaxPods *int32 `json:"maxPods,omitempty" flag:"max-pods"` + // nvidiaGPUs is the number of NVIDIA GPU devices on this node. + NvidiaGPUs int32 `json:"nvidiaGPUs,omitempty" flag:"experimental-nvidia-gpus"` + // The CIDR to use for pod IP addresses, only used in standalone mode. // In cluster mode, this is obtained from the master. PodCIDR string `json:"podCIDR,omitempty" flag:"pod-cidr"`