kubeadm: kube-proxy needs to know the pod subnet CIDR in order to und…

…erstand what's internal and external traffic. Fixes kubernetes/kubeadm#102
lzqmyb · Jan 4, 2017 · cae862d · cae862d
1 parent f143ce0
commit cae862d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/cmd/kubeadm/app/master/manifests.go b/cmd/kubeadm/app/master/manifests.go
@@ -386,7 +386,9 @@ func getSchedulerCommand(cfg *kubeadmapi.MasterConfiguration) []string {
 }
 
 func getProxyCommand(cfg *kubeadmapi.MasterConfiguration) []string {
-	return getComponentBaseCommand(proxy)
+	return append(getComponentBaseCommand(proxy),
+		"--cluster-cidr="+cfg.Networking.PodSubnet,
+	)
 }
 
 func getProxyEnvVars() []api.EnvVar {

diff --git a/cmd/kubeadm/app/master/manifests_test.go b/cmd/kubeadm/app/master/manifests_test.go
@@ -572,9 +572,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",
 			},
 		},
 	}