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

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
parent f143ce01
...@@ -386,7 +386,9 @@ func getSchedulerCommand(cfg *kubeadmapi.MasterConfiguration) []string { ...@@ -386,7 +386,9 @@ func getSchedulerCommand(cfg *kubeadmapi.MasterConfiguration) []string {
} }
func getProxyCommand(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 { func getProxyEnvVars() []api.EnvVar {
......
...@@ -572,9 +572,14 @@ func TestGetProxyCommand(t *testing.T) { ...@@ -572,9 +572,14 @@ func TestGetProxyCommand(t *testing.T) {
expected []string expected []string
}{ }{
{ {
cfg: &kubeadmapi.MasterConfiguration{}, cfg: &kubeadmapi.MasterConfiguration{
Networking: kubeadm.Networking{
PodSubnet: "bar",
},
},
expected: []string{ expected: []string{
"kube-proxy", "kube-proxy",
"--cluster-cidr=bar",
}, },
}, },
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment