github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 03:41:45 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #78625 from Nordix/issue-1591-kubeadm-service-cidr

Browse Source 
Fix kubeadm service-cidr mapping to service-cluster-ip-rage for kube-controller-manager.
This commit is contained in:
Kubernetes Prow Robot 2019-06-14 11:52:35 -07:00 committed by GitHub
commit 54f7e5269c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 38 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/kubeadm/app/phases/controlplane/manifests.go
View File

@ -297,6 +297,9 @@ func getControllerManagerCommand(cfg *kubeadmapi.ClusterConfiguration, k8sVersio
defaultArguments["allocate-node-cidrs"] = "true" defaultArguments["allocate-node-cidrs"] = "true"
defaultArguments["cluster-cidr"] = cfg.Networking.PodSubnet defaultArguments["cluster-cidr"] = cfg.Networking.PodSubnet
defaultArguments["node-cidr-mask-size"] = maskSize defaultArguments["node-cidr-mask-size"] = maskSize
if cfg.Networking.ServiceSubnet != "" {
defaultArguments["service-cluster-ip-range"] = cfg.Networking.ServiceSubnet
}
} }
command := []string{"kube-controller-manager"} command := []string{"kube-controller-manager"}

36
cmd/kubeadm/app/phases/controlplane/manifests_test.go
View File

@ -577,6 +577,36 @@ func TestGetControllerManagerCommand(t *testing.T) {
"--node-cidr-mask-size=24", "--node-cidr-mask-size=24",
}, },
}, },
{
name: "custom service-cluster-ip-range for " + cpVersion,
cfg: &kubeadmapi.ClusterConfiguration{
Networking: kubeadmapi.Networking{
PodSubnet: "10.0.1.15/16",
ServiceSubnet: "172.20.0.0/24"},
CertificatesDir: testCertsDir,
KubernetesVersion: cpVersion,
},
expected: []string{
"kube-controller-manager",
"--bind-address=127.0.0.1",
"--leader-elect=true",
"--kubeconfig=" + kubeadmconstants.KubernetesDir + "/controller-manager.conf",
"--root-ca-file=" + testCertsDir + "/ca.crt",
"--service-account-private-key-file=" + testCertsDir + "/sa.key",
"--cluster-signing-cert-file=" + testCertsDir + "/ca.crt",
"--cluster-signing-key-file=" + testCertsDir + "/ca.key",
"--use-service-account-credentials=true",
"--controllers=*,bootstrapsigner,tokencleaner",
"--authentication-kubeconfig=" + kubeadmconstants.KubernetesDir + "/controller-manager.conf",
"--authorization-kubeconfig=" + kubeadmconstants.KubernetesDir + "/controller-manager.conf",
"--client-ca-file=" + testCertsDir + "/ca.crt",
"--requestheader-client-ca-file=" + testCertsDir + "/front-proxy-ca.crt",
"--allocate-node-cidrs=true",
"--cluster-cidr=10.0.1.15/16",
"--node-cidr-mask-size=24",
"--service-cluster-ip-range=172.20.0.0/24",
},
},
{ {
name: "custom extra-args for " + cpVersion, name: "custom extra-args for " + cpVersion,
cfg: &kubeadmapi.ClusterConfiguration{ cfg: &kubeadmapi.ClusterConfiguration{
@ -610,7 +640,10 @@ func TestGetControllerManagerCommand(t *testing.T) {
{ {
name: "custom IPv6 networking for " + cpVersion, name: "custom IPv6 networking for " + cpVersion,
cfg: &kubeadmapi.ClusterConfiguration{ cfg: &kubeadmapi.ClusterConfiguration{
Networking: kubeadmapi.Networking{PodSubnet: "2001:db8::/64"}, Networking: kubeadmapi.Networking{
PodSubnet: "2001:db8::/64",
ServiceSubnet: "fd03::/112",
},
CertificatesDir: testCertsDir, CertificatesDir: testCertsDir,
KubernetesVersion: cpVersion, KubernetesVersion: cpVersion,
}, },
@ -632,6 +665,7 @@ func TestGetControllerManagerCommand(t *testing.T) {
"--allocate-node-cidrs=true", "--allocate-node-cidrs=true",
"--cluster-cidr=2001:db8::/64", "--cluster-cidr=2001:db8::/64",
"--node-cidr-mask-size=80", "--node-cidr-mask-size=80",
"--service-cluster-ip-range=fd03::/112",
}, },
}, },
} }