Merge pull request #9879 from bmelbourne/add-kubelet-cgroup-driver

Add kubelet cgroup driver property
kubernetes · Sep 7, 2020 · bb63f29 · bb63f29
2 parents 1c7a6d4 + 21fe46c
commit bb63f29
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 4 deletions.
diff --git a/k8s/crds/kops.k8s.io_clusters.yaml b/k8s/crds/kops.k8s.io_clusters.yaml
@@ -1552,6 +1552,9 @@ spec:
                   bootstrapKubeconfig:
                     description: BootstrapKubeconfig is the path to a kubeconfig file that will be used to get client certificate for kubelet
                     type: string
+                  cgroupDriver:
+                    description: CgroupDriver allows the explicit setting of the kubelet cgroup driver. If omitted, defaults to cgroupfs.
+                    type: string
                   cgroupRoot:
                     description: cgroupRoot is the root cgroup to use for pods. This is handled by the container runtime on a best effort basis.
                     type: string
@@ -1827,6 +1830,9 @@ spec:
                   bootstrapKubeconfig:
                     description: BootstrapKubeconfig is the path to a kubeconfig file that will be used to get client certificate for kubelet
                     type: string
+                  cgroupDriver:
+                    description: CgroupDriver allows the explicit setting of the kubelet cgroup driver. If omitted, defaults to cgroupfs.
+                    type: string
                   cgroupRoot:
                     description: cgroupRoot is the root cgroup to use for pods. This is handled by the container runtime on a best effort basis.
                     type: string

diff --git a/k8s/crds/kops.k8s.io_instancegroups.yaml b/k8s/crds/kops.k8s.io_instancegroups.yaml
@@ -225,6 +225,9 @@ spec:
                   bootstrapKubeconfig:
                     description: BootstrapKubeconfig is the path to a kubeconfig file that will be used to get client certificate for kubelet
                     type: string
+                  cgroupDriver:
+                    description: CgroupDriver allows the explicit setting of the kubelet cgroup driver. If omitted, defaults to cgroupfs.
+                    type: string
                   cgroupRoot:
                     description: cgroupRoot is the root cgroup to use for pods. This is handled by the container runtime on a best effort basis.
                     type: string

diff --git a/pkg/apis/kops/componentconfig.go b/pkg/apis/kops/componentconfig.go
@@ -198,13 +198,13 @@ type KubeletConfigSpec struct {
 	RegistryBurst *int32 `json:"registryBurst,omitempty" flag:"registry-burst"`
 	//TopologyManagerPolicy determines the allocation policy for the topology manager.
 	TopologyManagerPolicy string `json:"topologyManagerPolicy,omitempty" flag:"topology-manager-policy"`
-
 	// rotateCertificates enables client certificate rotation.
 	RotateCertificates *bool `json:"rotateCertificates,omitempty" flag:"rotate-certificates"`
-
 	// Default kubelet behaviour for kernel tuning. If set, kubelet errors if any of kernel tunables is different than kubelet defaults.
 	// (DEPRECATED: This parameter should be set via the config file specified by the Kubelet's --config flag.
 	ProtectKernelDefaults *bool `json:"protectKernelDefaults,omitempty" flag:"protect-kernel-defaults"`
+	// CgroupDriver allows the explicit setting of the kubelet cgroup driver. If omitted, defaults to cgroupfs.
+	CgroupDriver string `json:"cgroupDriver,omitempty" flag:"cgroup-driver"`
 }
 
 // KubeProxyConfig defines the configuration for a proxy

diff --git a/pkg/apis/kops/v1alpha2/componentconfig.go b/pkg/apis/kops/v1alpha2/componentconfig.go
@@ -198,13 +198,13 @@ type KubeletConfigSpec struct {
 	RegistryBurst *int32 `json:"registryBurst,omitempty" flag:"registry-burst"`
 	//TopologyManagerPolicy determines the allocation policy for the topology manager.
 	TopologyManagerPolicy string `json:"topologyManagerPolicy,omitempty" flag:"topology-manager-policy"`
-
 	// rotateCertificates enables client certificate rotation.
 	RotateCertificates *bool `json:"rotateCertificates,omitempty" flag:"rotate-certificates"`
-
 	// Default kubelet behaviour for kernel tuning. If set, kubelet errors if any of kernel tunables is different than kubelet defaults.
 	// (DEPRECATED: This parameter should be set via the config file specified by the Kubelet's --config flag.
 	ProtectKernelDefaults *bool `json:"protectKernelDefaults,omitempty" flag:"protect-kernel-defaults"`
+	// CgroupDriver allows the explicit setting of the kubelet cgroup driver. If omitted, defaults to cgroupfs.
+	CgroupDriver string `json:"cgroupDriver,omitempty" flag:"cgroup-driver"`
 }
 
 // KubeProxyConfig defines the configuration for a proxy

diff --git a/pkg/apis/kops/v1alpha2/zz_generated.conversion.go b/pkg/apis/kops/v1alpha2/zz_generated.conversion.go