github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-16 22:53:22 +00:00
Code Issues Projects Releases Wiki Activity

Mark --kubelet-https deprecated, unconditionally use https for apiserver->kubelet connections

Browse Source
This commit is contained in:
Jordan Liggitt
2020-06-01 10:43:26 -04:00
parent 081f97aa2b
commit 2e8461a5bc
4 changed files with 11 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/kube-apiserver/app/options/options.go
View File

@@ -120,7 +120,6 @@ func NewServerRunOptions() *ServerRunOptions {
string(api.NodeExternalDNS),
string(api.NodeExternalIP),
},
EnableHTTPS: true,
HTTPTimeout: time.Duration(5) * time.Second,
},
ServiceNodePortRange: kubeoptions.DefaultServiceNodePortRange,
@@ -200,8 +199,9 @@ func (s *ServerRunOptions) Flags() (fss cliflag.NamedFlagSets) {
"Example: '30000-32767'. Inclusive at both ends of the range.")
// Kubelet related flags:
fs.BoolVar(&s.KubeletConfig.EnableHTTPS, "kubelet-https", s.KubeletConfig.EnableHTTPS,
"Use https for kubelet connections.")
kubeletHTTPS := true
fs.BoolVar(&kubeletHTTPS, "kubelet-https", kubeletHTTPS, "Use https for kubelet connections.")
fs.MarkDeprecated("kubelet-https", "API Server connections to kubelets always use https. This flag will be removed in 1.22.")
fs.StringSliceVar(&s.KubeletConfig.PreferredAddressTypes, "kubelet-preferred-address-types", s.KubeletConfig.PreferredAddressTypes,
"List of the preferred NodeAddressTypes to use for kubelet connections.")

2
cmd/kube-apiserver/app/options/options_test.go
View File

@@ -106,7 +106,6 @@ func TestAddFlags(t *testing.T) {
"--etcd-certfile=/var/run/kubernetes/etcdce.crt",
"--etcd-cafile=/var/run/kubernetes/etcdca.crt",
"--http2-max-streams-per-connection=42",
"--kubelet-https=true",
"--kubelet-read-only-port=10255",
"--kubelet-timeout=5s",
"--kubelet-client-certificate=/var/run/kubernetes/ceserver.crt",
@@ -193,7 +192,6 @@ func TestAddFlags(t *testing.T) {
string(kapi.NodeExternalDNS),
string(kapi.NodeExternalIP),
},
EnableHTTPS: true,
HTTPTimeout: time.Duration(5) * time.Second,
TLSClientConfig: restclient.TLSClientConfig{
CertFile: "/var/run/kubernetes/ceserver.crt",