Merge pull request #45369 from dmmcquay/kubeadm_remove_etcd3_default

Automatic merge from submit-queue (batch tested with PRs 45364, 45369, 45323) kubeadm: edit apiserver flags for storage-backend **What this PR does / why we need it**: Since storage-backend defaults to etcd3 in 1.6 (see https://github.com/kubernetes/kubernetes/pull/36229), no need to have a flag defining the default. **Special notes for your reviewer**: /cc @luxas **Release note**: ```release-note NONE ```

Merge pull request #45369 from dmmcquay/kubeadm_remove_etcd3_default
78e08cf7 · Kubernetes Submit Queue · GitHub · b3beeff9 · 2c052346 · 78e08cf7
Commit 78e08cf7 authored May 04, 2017 by Kubernetes Submit Queue Committed by GitHub May 04, 2017
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 5 deletions

manifests.go cmd/kubeadm/app/master/manifests.go +0 -1

manifests_test.go cmd/kubeadm/app/master/manifests_test.go +0 -4

No files found.
--- 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

--- 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",