kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8661 from tanjunchen/add-flag 

support apiserver --kubelet-certificate-authority  flag
This commit is contained in:
Kubernetes Prow Robot 2020-03-02 16:27:37 -08:00 committed by GitHub
parent 0624935ba1 64ffe00b1c
commit 45957e15a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
k8s/crds/kops.k8s.io_clusters.yaml
View File

@ -1054,6 +1054,10 @@ spec:
description: InsecurePort is the port the insecure api runs description: InsecurePort is the port the insecure api runs
format: int32 format: int32
type: integer type: integer
kubeletCertificateAuthority:
description: KubeletCertificateAuthority is the path of a certificate
authority for secure communication between api and kubelet.
type: string
kubeletClientCertificate: kubeletClientCertificate:
description: KubeletClientCertificate is the path of a certificate description: KubeletClientCertificate is the path of a certificate
for secure communication between api and kubelet for secure communication between api and kubelet

2
pkg/apis/kops/componentconfig.go
View File

@ -315,6 +315,8 @@ type KubeAPIServerConfig struct {
RuntimeConfig map[string]string `json:"runtimeConfig,omitempty" flag:"runtime-config"` 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 is the path of a certificate for secure communication between api and kubelet
KubeletClientCertificate string `json:"kubeletClientCertificate,omitempty" flag:"kubelet-client-certificate"` 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 is the path of a private to secure communication between api and kubelet
KubeletClientKey string `json:"kubeletClientKey,omitempty" flag:"kubelet-client-key"` KubeletClientKey string `json:"kubeletClientKey,omitempty" flag:"kubelet-client-key"`
// AnonymousAuth indicates if anonymous authentication is permitted // AnonymousAuth indicates if anonymous authentication is permitted

2
pkg/apis/kops/v1alpha1/componentconfig.go
View File

@ -315,6 +315,8 @@ type KubeAPIServerConfig struct {
RuntimeConfig map[string]string `json:"runtimeConfig,omitempty" flag:"runtime-config"` 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 is the path of a certificate for secure communication between api and kubelet
KubeletClientCertificate string `json:"kubeletClientCertificate,omitempty" flag:"kubelet-client-certificate"` 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 is the path of a private to secure communication between api and kubelet
KubeletClientKey string `json:"kubeletClientKey,omitempty" flag:"kubelet-client-key"` KubeletClientKey string `json:"kubeletClientKey,omitempty" flag:"kubelet-client-key"`
// AnonymousAuth indicates if anonymous authentication is permitted // AnonymousAuth indicates if anonymous authentication is permitted

2
pkg/apis/kops/v1alpha1/zz_generated.conversion.go
View File

@ -3363,6 +3363,7 @@ func autoConvert_v1alpha1_KubeAPIServerConfig_To_kops_KubeAPIServerConfig(in *Ku
out.APIServerCount = in.APIServerCount out.APIServerCount = in.APIServerCount
out.RuntimeConfig = in.RuntimeConfig out.RuntimeConfig = in.RuntimeConfig
out.KubeletClientCertificate = in.KubeletClientCertificate out.KubeletClientCertificate = in.KubeletClientCertificate
out.KubeletCertificateAuthority = in.KubeletCertificateAuthority
out.KubeletClientKey = in.KubeletClientKey out.KubeletClientKey = in.KubeletClientKey
out.AnonymousAuth = in.AnonymousAuth out.AnonymousAuth = in.AnonymousAuth
out.KubeletPreferredAddressTypes = in.KubeletPreferredAddressTypes out.KubeletPreferredAddressTypes = in.KubeletPreferredAddressTypes
@ -3463,6 +3464,7 @@ func autoConvert_kops_KubeAPIServerConfig_To_v1alpha1_KubeAPIServerConfig(in *ko
out.APIServerCount = in.APIServerCount out.APIServerCount = in.APIServerCount
out.RuntimeConfig = in.RuntimeConfig out.RuntimeConfig = in.RuntimeConfig
out.KubeletClientCertificate = in.KubeletClientCertificate out.KubeletClientCertificate = in.KubeletClientCertificate
out.KubeletCertificateAuthority = in.KubeletCertificateAuthority
out.KubeletClientKey = in.KubeletClientKey out.KubeletClientKey = in.KubeletClientKey
out.AnonymousAuth = in.AnonymousAuth out.AnonymousAuth = in.AnonymousAuth
out.KubeletPreferredAddressTypes = in.KubeletPreferredAddressTypes out.KubeletPreferredAddressTypes = in.KubeletPreferredAddressTypes

2
pkg/apis/kops/v1alpha2/componentconfig.go
View File

@ -315,6 +315,8 @@ type KubeAPIServerConfig struct {
RuntimeConfig map[string]string `json:"runtimeConfig,omitempty" flag:"runtime-config"` 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 is the path of a certificate for secure communication between api and kubelet
KubeletClientCertificate string `json:"kubeletClientCertificate,omitempty" flag:"kubelet-client-certificate"` 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 is the path of a private to secure communication between api and kubelet
KubeletClientKey string `json:"kubeletClientKey,omitempty" flag:"kubelet-client-key"` KubeletClientKey string `json:"kubeletClientKey,omitempty" flag:"kubelet-client-key"`
// AnonymousAuth indicates if anonymous authentication is permitted // AnonymousAuth indicates if anonymous authentication is permitted

2
pkg/apis/kops/v1alpha2/zz_generated.conversion.go
View File

@ -3633,6 +3633,7 @@ func autoConvert_v1alpha2_KubeAPIServerConfig_To_kops_KubeAPIServerConfig(in *Ku
out.APIServerCount = in.APIServerCount out.APIServerCount = in.APIServerCount
out.RuntimeConfig = in.RuntimeConfig out.RuntimeConfig = in.RuntimeConfig
out.KubeletClientCertificate = in.KubeletClientCertificate out.KubeletClientCertificate = in.KubeletClientCertificate
out.KubeletCertificateAuthority = in.KubeletCertificateAuthority
out.KubeletClientKey = in.KubeletClientKey out.KubeletClientKey = in.KubeletClientKey
out.AnonymousAuth = in.AnonymousAuth out.AnonymousAuth = in.AnonymousAuth
out.KubeletPreferredAddressTypes = in.KubeletPreferredAddressTypes out.KubeletPreferredAddressTypes = in.KubeletPreferredAddressTypes
@ -3733,6 +3734,7 @@ func autoConvert_kops_KubeAPIServerConfig_To_v1alpha2_KubeAPIServerConfig(in *ko
out.APIServerCount = in.APIServerCount out.APIServerCount = in.APIServerCount
out.RuntimeConfig = in.RuntimeConfig out.RuntimeConfig = in.RuntimeConfig
out.KubeletClientCertificate = in.KubeletClientCertificate out.KubeletClientCertificate = in.KubeletClientCertificate
out.KubeletCertificateAuthority = in.KubeletCertificateAuthority
out.KubeletClientKey = in.KubeletClientKey out.KubeletClientKey = in.KubeletClientKey
out.AnonymousAuth = in.AnonymousAuth out.AnonymousAuth = in.AnonymousAuth
out.KubeletPreferredAddressTypes = in.KubeletPreferredAddressTypes out.KubeletPreferredAddressTypes = in.KubeletPreferredAddressTypes