Merge pull request #8581 from justinsb/kubelet_rotate_certificates_flag

kubelet: map rotate-certificates options
kubernetes · Feb 22, 2020 · d0892bb · d0892bb
2 parents cc61313 + 930207e
commit d0892bb
Show file tree

Hide file tree

Showing 10 changed files with 37 additions and 0 deletions.
diff --git a/k8s/crds/kops.k8s.io_clusters.yaml b/k8s/crds/kops.k8s.io_clusters.yaml
@@ -1973,6 +1973,9 @@ spec:
                   description: RootDir is the directory path for managing kubelet
                     files (volume mounts,etc)
                   type: string
+                rotateCertificates:
+                  description: rotateCertificates enables client certificate rotation.
+                  type: boolean
                 runtimeCgroups:
                   description: Cgroups that container runtime is expected to be isolated
                     in.
@@ -2328,6 +2331,9 @@ spec:
                   description: RootDir is the directory path for managing kubelet
                     files (volume mounts,etc)
                   type: string
+                rotateCertificates:
+                  description: rotateCertificates enables client certificate rotation.
+                  type: boolean
                 runtimeCgroups:
                   description: Cgroups that container runtime is expected to be isolated
                     in.

diff --git a/k8s/crds/kops.k8s.io_instancegroups.yaml b/k8s/crds/kops.k8s.io_instancegroups.yaml
@@ -492,6 +492,9 @@ spec:
                   description: RootDir is the directory path for managing kubelet
                     files (volume mounts,etc)
                   type: string
+                rotateCertificates:
+                  description: rotateCertificates enables client certificate rotation.
+                  type: boolean
                 runtimeCgroups:
                   description: Cgroups that container runtime is expected to be isolated
                     in.

diff --git a/pkg/apis/kops/componentconfig.go b/pkg/apis/kops/componentconfig.go
@@ -196,6 +196,9 @@ type KubeletConfigSpec struct {
 	RegistryPullQPS *int32 `json:"registryPullQPS,omitempty" flag:"registry-qps"`
 	//RegistryBurst Maximum size of a bursty pulls, temporarily allows pulls to burst to this number, while still not exceeding registry-qps. Only used if --registry-qps > 0 (default 10)
 	RegistryBurst *int32 `json:"registryBurst,omitempty" flag:"registry-burst"`
+
+	// rotateCertificates enables client certificate rotation.
+	RotateCertificates *bool `json:"rotateCertificates,omitempty" flag:"rotate-certificates"`
 }
 
 // KubeProxyConfig defines the configuration for a proxy

diff --git a/pkg/apis/kops/v1alpha1/componentconfig.go b/pkg/apis/kops/v1alpha1/componentconfig.go
@@ -196,6 +196,9 @@ type KubeletConfigSpec struct {
 	RegistryPullQPS *int32 `json:"registryPullQPS,omitempty" flag:"registry-qps"`
 	//RegistryBurst Maximum size of a bursty pulls, temporarily allows pulls to burst to this number, while still not exceeding registry-qps. Only used if --registry-qps > 0 (default 10)
 	RegistryBurst *int32 `json:"registryBurst,omitempty" flag:"registry-burst"`
+
+	// rotateCertificates enables client certificate rotation.
+	RotateCertificates *bool `json:"rotateCertificates,omitempty" flag:"rotate-certificates"`
 }
 
 // KubeProxyConfig defines the configuration for a proxy

diff --git a/pkg/apis/kops/v1alpha1/zz_generated.conversion.go b/pkg/apis/kops/v1alpha1/zz_generated.conversion.go
diff --git a/pkg/apis/kops/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/kops/v1alpha1/zz_generated.deepcopy.go
diff --git a/pkg/apis/kops/v1alpha2/componentconfig.go b/pkg/apis/kops/v1alpha2/componentconfig.go
@@ -196,6 +196,9 @@ type KubeletConfigSpec struct {
 	RegistryPullQPS *int32 `json:"registryPullQPS,omitempty" flag:"registry-qps"`
 	//RegistryBurst Maximum size of a bursty pulls, temporarily allows pulls to burst to this number, while still not exceeding registry-qps. Only used if --registry-qps > 0 (default 10)
 	RegistryBurst *int32 `json:"registryBurst,omitempty" flag:"registry-burst"`
+
+	// rotateCertificates enables client certificate rotation.
+	RotateCertificates *bool `json:"rotateCertificates,omitempty" flag:"rotate-certificates"`
 }
 
 // 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
diff --git a/pkg/apis/kops/v1alpha2/zz_generated.deepcopy.go b/pkg/apis/kops/v1alpha2/zz_generated.deepcopy.go
diff --git a/pkg/apis/kops/zz_generated.deepcopy.go b/pkg/apis/kops/zz_generated.deepcopy.go