Merge pull request #39440 from apprenda/kubeadm_102-fix_proxy

Automatic merge from submit-queue (batch tested with PRs 40574, 40806, 40308, 40771, 39440) kubeadm: kube-proxy needs to know the pod subnet CIDR **What this PR does / why we need it**: `kube-proxy` 1.5 has a new flag `cluster-cidr` that isn't specified by `kubeadm`, thus resulting in bug https://github.com/kubernetes/kubeadm/issues/102. **Which issue this PR fixes**: fixes https://github.com/kubernetes/kubeadm/issues/102 **Special notes for your reviewer**: /cc @luxas @dmmcquay

Merge pull request #39440 from apprenda/kubeadm_102-fix_proxy
9dedf92d · Kubernetes Submit Queue · GitHub · 2ee058c2 · cae862da · 9dedf92d
Commit 9dedf92d authored Feb 01, 2017 by Kubernetes Submit Queue Committed by GitHub Feb 01, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 2 deletions

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

manifests_test.go cmd/kubeadm/app/master/manifests_test.go +6 -1

No files found.
--- a/cmd/kubeadm/app/master/manifests.go
+++ b/cmd/kubeadm/app/master/manifests.go
@@ -425,7 +425,9 @@ func getSchedulerCommand(cfg *kubeadmapi.MasterConfiguration, selfHosted bool) [
 }

 func getProxyCommand(cfg *kubeadmapi.MasterConfiguration) []string {
-	return getComponentBaseCommand(proxy)
+	return append(getComponentBaseCommand(proxy),
+		"--cluster-cidr="+cfg.Networking.PodSubnet,
+	)
 }

 func getProxyEnvVars() []api.EnvVar {

--- a/cmd/kubeadm/app/master/manifests_test.go
+++ b/cmd/kubeadm/app/master/manifests_test.go
@@ -559,9 +559,14 @@ func TestGetProxyCommand(t *testing.T) {
 		expected []string
 	}{
 		{
-			cfg: &kubeadmapi.MasterConfiguration{},
+			cfg: &kubeadmapi.MasterConfiguration{
+				Networking: kubeadm.Networking{
+					PodSubnet: "bar",
+				},
+			},
 			expected: []string{
 				"kube-proxy",
+				"--cluster-cidr=bar",
 			},
 		},
 	}