From 64ffe00b1cd27ad4c1ecd95acc1350d5eac4a1ea Mon Sep 17 00:00:00 2001 From: tanjunchen Date: Sun, 1 Mar 2020 23:40:33 +0800 Subject: [PATCH] support apiserver --kubelet-certificate-authority flag --- k8s/crds/kops.k8s.io_clusters.yaml | 4 ++++ pkg/apis/kops/componentconfig.go | 2 ++ pkg/apis/kops/v1alpha1/componentconfig.go | 2 ++ pkg/apis/kops/v1alpha1/zz_generated.conversion.go | 2 ++ pkg/apis/kops/v1alpha2/componentconfig.go | 2 ++ pkg/apis/kops/v1alpha2/zz_generated.conversion.go | 2 ++ 6 files changed, 14 insertions(+) diff --git a/k8s/crds/kops.k8s.io_clusters.yaml b/k8s/crds/kops.k8s.io_clusters.yaml index 33b1de603a..467790e398 100644 --- a/k8s/crds/kops.k8s.io_clusters.yaml +++ b/k8s/crds/kops.k8s.io_clusters.yaml @@ -1054,6 +1054,10 @@ spec: description: InsecurePort is the port the insecure api runs format: int32 type: integer + kubeletCertificateAuthority: + description: KubeletCertificateAuthority is the path of a certificate + authority for secure communication between api and kubelet. + type: string kubeletClientCertificate: description: KubeletClientCertificate is the path of a certificate for secure communication between api and kubelet diff --git a/pkg/apis/kops/componentconfig.go b/pkg/apis/kops/componentconfig.go index a301622249..be09a1b427 100644 --- a/pkg/apis/kops/componentconfig.go +++ b/pkg/apis/kops/componentconfig.go @@ -315,6 +315,8 @@ type KubeAPIServerConfig struct { RuntimeConfig map[string]string `json:"runtimeConfig,omitempty" flag:"runtime-config"` // KubeletClientCertificate is the path of a certificate for secure communication between api and kubelet KubeletClientCertificate string `json:"kubeletClientCertificate,omitempty" flag:"kubelet-client-certificate"` + // KubeletCertificateAuthority is the path of a certificate authority for secure communication between api and kubelet. + KubeletCertificateAuthority string `json:"kubeletCertificateAuthority,omitempty" flag:"kubelet-certificate-authority"` // KubeletClientKey is the path of a private to secure communication between api and kubelet KubeletClientKey string `json:"kubeletClientKey,omitempty" flag:"kubelet-client-key"` // AnonymousAuth indicates if anonymous authentication is permitted diff --git a/pkg/apis/kops/v1alpha1/componentconfig.go b/pkg/apis/kops/v1alpha1/componentconfig.go index a357ca0f96..5147488d0f 100644 --- a/pkg/apis/kops/v1alpha1/componentconfig.go +++ b/pkg/apis/kops/v1alpha1/componentconfig.go @@ -315,6 +315,8 @@ type KubeAPIServerConfig struct { RuntimeConfig map[string]string `json:"runtimeConfig,omitempty" flag:"runtime-config"` // KubeletClientCertificate is the path of a certificate for secure communication between api and kubelet KubeletClientCertificate string `json:"kubeletClientCertificate,omitempty" flag:"kubelet-client-certificate"` + // KubeletCertificateAuthority is the path of a certificate authority for secure communication between api and kubelet. + KubeletCertificateAuthority string `json:"kubeletCertificateAuthority,omitempty" flag:"kubelet-certificate-authority"` // KubeletClientKey is the path of a private to secure communication between api and kubelet KubeletClientKey string `json:"kubeletClientKey,omitempty" flag:"kubelet-client-key"` // AnonymousAuth indicates if anonymous authentication is permitted diff --git a/pkg/apis/kops/v1alpha1/zz_generated.conversion.go b/pkg/apis/kops/v1alpha1/zz_generated.conversion.go index f3c2b94bcc..39342e26e4 100644 --- a/pkg/apis/kops/v1alpha1/zz_generated.conversion.go +++ b/pkg/apis/kops/v1alpha1/zz_generated.conversion.go @@ -3363,6 +3363,7 @@ func autoConvert_v1alpha1_KubeAPIServerConfig_To_kops_KubeAPIServerConfig(in *Ku out.APIServerCount = in.APIServerCount out.RuntimeConfig = in.RuntimeConfig out.KubeletClientCertificate = in.KubeletClientCertificate + out.KubeletCertificateAuthority = in.KubeletCertificateAuthority out.KubeletClientKey = in.KubeletClientKey out.AnonymousAuth = in.AnonymousAuth out.KubeletPreferredAddressTypes = in.KubeletPreferredAddressTypes @@ -3463,6 +3464,7 @@ func autoConvert_kops_KubeAPIServerConfig_To_v1alpha1_KubeAPIServerConfig(in *ko out.APIServerCount = in.APIServerCount out.RuntimeConfig = in.RuntimeConfig out.KubeletClientCertificate = in.KubeletClientCertificate + out.KubeletCertificateAuthority = in.KubeletCertificateAuthority out.KubeletClientKey = in.KubeletClientKey out.AnonymousAuth = in.AnonymousAuth out.KubeletPreferredAddressTypes = in.KubeletPreferredAddressTypes diff --git a/pkg/apis/kops/v1alpha2/componentconfig.go b/pkg/apis/kops/v1alpha2/componentconfig.go index 50f7553ce3..562a276c21 100644 --- a/pkg/apis/kops/v1alpha2/componentconfig.go +++ b/pkg/apis/kops/v1alpha2/componentconfig.go @@ -315,6 +315,8 @@ type KubeAPIServerConfig struct { RuntimeConfig map[string]string `json:"runtimeConfig,omitempty" flag:"runtime-config"` // KubeletClientCertificate is the path of a certificate for secure communication between api and kubelet KubeletClientCertificate string `json:"kubeletClientCertificate,omitempty" flag:"kubelet-client-certificate"` + // KubeletCertificateAuthority is the path of a certificate authority for secure communication between api and kubelet. + KubeletCertificateAuthority string `json:"kubeletCertificateAuthority,omitempty" flag:"kubelet-certificate-authority"` // KubeletClientKey is the path of a private to secure communication between api and kubelet KubeletClientKey string `json:"kubeletClientKey,omitempty" flag:"kubelet-client-key"` // AnonymousAuth indicates if anonymous authentication is permitted diff --git a/pkg/apis/kops/v1alpha2/zz_generated.conversion.go b/pkg/apis/kops/v1alpha2/zz_generated.conversion.go index cbc80b612a..054c0e1437 100644 --- a/pkg/apis/kops/v1alpha2/zz_generated.conversion.go +++ b/pkg/apis/kops/v1alpha2/zz_generated.conversion.go @@ -3633,6 +3633,7 @@ func autoConvert_v1alpha2_KubeAPIServerConfig_To_kops_KubeAPIServerConfig(in *Ku out.APIServerCount = in.APIServerCount out.RuntimeConfig = in.RuntimeConfig out.KubeletClientCertificate = in.KubeletClientCertificate + out.KubeletCertificateAuthority = in.KubeletCertificateAuthority out.KubeletClientKey = in.KubeletClientKey out.AnonymousAuth = in.AnonymousAuth out.KubeletPreferredAddressTypes = in.KubeletPreferredAddressTypes @@ -3733,6 +3734,7 @@ func autoConvert_kops_KubeAPIServerConfig_To_v1alpha2_KubeAPIServerConfig(in *ko out.APIServerCount = in.APIServerCount out.RuntimeConfig = in.RuntimeConfig out.KubeletClientCertificate = in.KubeletClientCertificate + out.KubeletCertificateAuthority = in.KubeletCertificateAuthority out.KubeletClientKey = in.KubeletClientKey out.AnonymousAuth = in.AnonymousAuth out.KubeletPreferredAddressTypes = in.KubeletPreferredAddressTypes