github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 13:37:30 +00:00
Code Issues Projects Releases Wiki Activity

kubeadm: kube-proxy needs to know the pod subnet CIDR in order to understand what's internal and external traffic.

Browse Source 
Fixes https://github.com/kubernetes/kubeadm/issues/102
This commit is contained in:
Paulo Pires 2017-01-04 20:32:27 +00:00
parent f143ce01e9
commit cae862dadf
No known key found for this signature in database
GPG Key ID: F3F6ED5C522EAA71
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/kubeadm/app/master/manifests.go
View File

@ -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 {

7
cmd/kubeadm/app/master/manifests_test.go
View File

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