From cae862dadf00a72e307bc97dd252f8a8dba9178f Mon Sep 17 00:00:00 2001 From: Paulo Pires Date: Wed, 4 Jan 2017 20:32:27 +0000 Subject: [PATCH] kubeadm: kube-proxy needs to know the pod subnet CIDR in order to understand what's internal and external traffic. Fixes https://github.com/kubernetes/kubeadm/issues/102 --- cmd/kubeadm/app/master/manifests.go | 4 +++- cmd/kubeadm/app/master/manifests_test.go | 7 ++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/cmd/kubeadm/app/master/manifests.go b/cmd/kubeadm/app/master/manifests.go index b54e2ee48b9..f4009b4a7c3 100644 --- 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 index 270ceb4fd01..b9cd6828f34 100644 --- 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", }, }, }