From 2c05234674d0d59d24ac322e07c5f6c9267c1e5f Mon Sep 17 00:00:00 2001 From: Derek McQuay Date: Thu, 4 May 2017 11:06:23 -0700 Subject: [PATCH] kubeadm: edit apiserver flags for storage-backend Since storage-backend defaults to etcd3 in 1.6, no need to have a flag defining the default. --- cmd/kubeadm/app/master/manifests.go | 1 - cmd/kubeadm/app/master/manifests_test.go | 4 ---- 2 files changed, 5 deletions(-) diff --git a/cmd/kubeadm/app/master/manifests.go b/cmd/kubeadm/app/master/manifests.go index 8a2be0a9c1..cf4a42291a 100644 --- a/cmd/kubeadm/app/master/manifests.go +++ b/cmd/kubeadm/app/master/manifests.go @@ -341,7 +341,6 @@ func getAPIServerCommand(cfg *kubeadmapi.MasterConfiguration, selfHosted bool, k "secure-port": fmt.Sprintf("%d", cfg.API.BindPort), "allow-privileged": "true", "experimental-bootstrap-token-auth": "true", - "storage-backend": "etcd3", "kubelet-preferred-address-types": "InternalIP,ExternalIP,Hostname", // add options to configure the front proxy. Without the generated client cert, this will never be useable // so add it unconditionally with recommended values diff --git a/cmd/kubeadm/app/master/manifests_test.go b/cmd/kubeadm/app/master/manifests_test.go index d803722548..e392e5eab3 100644 --- a/cmd/kubeadm/app/master/manifests_test.go +++ b/cmd/kubeadm/app/master/manifests_test.go @@ -529,7 +529,6 @@ func TestGetAPIServerCommand(t *testing.T) { "--kubelet-client-key=" + testCertsDir + "/apiserver-kubelet-client.key", fmt.Sprintf("--secure-port=%d", 123), "--allow-privileged=true", - "--storage-backend=etcd3", "--kubelet-preferred-address-types=InternalIP,ExternalIP,Hostname", "--experimental-bootstrap-token-auth=true", "--requestheader-username-headers=X-Remote-User", @@ -562,7 +561,6 @@ func TestGetAPIServerCommand(t *testing.T) { "--kubelet-client-key=" + testCertsDir + "/apiserver-kubelet-client.key", fmt.Sprintf("--secure-port=%d", 123), "--allow-privileged=true", - "--storage-backend=etcd3", "--kubelet-preferred-address-types=InternalIP,ExternalIP,Hostname", "--experimental-bootstrap-token-auth=true", "--requestheader-username-headers=X-Remote-User", @@ -596,7 +594,6 @@ func TestGetAPIServerCommand(t *testing.T) { "--kubelet-client-key=" + testCertsDir + "/apiserver-kubelet-client.key", fmt.Sprintf("--secure-port=%d", 123), "--allow-privileged=true", - "--storage-backend=etcd3", "--kubelet-preferred-address-types=InternalIP,ExternalIP,Hostname", "--experimental-bootstrap-token-auth=true", "--requestheader-username-headers=X-Remote-User", @@ -632,7 +629,6 @@ func TestGetAPIServerCommand(t *testing.T) { "--kubelet-client-key=" + testCertsDir + "/apiserver-kubelet-client.key", fmt.Sprintf("--secure-port=%d", 123), "--allow-privileged=true", - "--storage-backend=etcd3", "--kubelet-preferred-address-types=InternalIP,ExternalIP,Hostname", "--experimental-bootstrap-token-auth=true", "--proxy-client-cert-file=/var/lib/certs/front-proxy-client.crt",