github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #68473 from detiber/controllerManager 

[kubeadm] - Update controller manager arguments for v1.12+
pull/8/head
k8s-ci-robot 2018-09-10 15:03:37 -07:00 committed by GitHub
parent c5353a7635 a0d7a76ea8
commit 5510be276b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -292,6 +292,10 @@ func getControllerManagerCommand(cfg *kubeadmapi.InitConfiguration, k8sVersion *
"cluster-signing-key-file": filepath.Join(cfg.CertificatesDir, kubeadmconstants.CAKeyName), "cluster-signing-key-file": filepath.Join(cfg.CertificatesDir, kubeadmconstants.CAKeyName),
"use-service-account-credentials": "true", "use-service-account-credentials": "true",
"controllers": "*,bootstrapsigner,tokencleaner", "controllers": "*,bootstrapsigner,tokencleaner",
"authentication-kubeconfig": filepath.Join(kubeadmconstants.KubernetesDir, kubeadmconstants.ControllerManagerKubeConfigFileName),
"authorization-kubeconfig": filepath.Join(kubeadmconstants.KubernetesDir, kubeadmconstants.ControllerManagerKubeConfigFileName),
"client-ca-file": filepath.Join(cfg.CertificatesDir, kubeadmconstants.CACertName),
"requestheader-client-ca-file": filepath.Join(cfg.CertificatesDir, kubeadmconstants.FrontProxyCACertName),
} }
// If using external CA, pass empty string to controller manager instead of ca.key/ca.crt path, // If using external CA, pass empty string to controller manager instead of ca.key/ca.crt path,

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

@ -679,6 +679,10 @@ func TestGetControllerManagerCommand(t *testing.T) {
"--cluster-signing-key-file=" + testCertsDir + "/ca.key", "--cluster-signing-key-file=" + testCertsDir + "/ca.key",
"--use-service-account-credentials=true", "--use-service-account-credentials=true",
"--controllers=*,bootstrapsigner,tokencleaner", "--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",
}, },
}, },
{ {
@ -699,6 +703,10 @@ func TestGetControllerManagerCommand(t *testing.T) {
"--cluster-signing-key-file=" + testCertsDir + "/ca.key", "--cluster-signing-key-file=" + testCertsDir + "/ca.key",
"--use-service-account-credentials=true", "--use-service-account-credentials=true",
"--controllers=*,bootstrapsigner,tokencleaner", "--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", "--allocate-node-cidrs=true",
"--cluster-cidr=10.0.1.15/16", "--cluster-cidr=10.0.1.15/16",
"--node-cidr-mask-size=24", "--node-cidr-mask-size=24",
@ -723,6 +731,10 @@ func TestGetControllerManagerCommand(t *testing.T) {
"--cluster-signing-key-file=" + testCertsDir + "/ca.key", "--cluster-signing-key-file=" + testCertsDir + "/ca.key",
"--use-service-account-credentials=true", "--use-service-account-credentials=true",
"--controllers=*,bootstrapsigner,tokencleaner", "--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", "--allocate-node-cidrs=true",
"--cluster-cidr=10.0.1.15/16", "--cluster-cidr=10.0.1.15/16",
"--node-cidr-mask-size=20", "--node-cidr-mask-size=20",
@ -746,6 +758,10 @@ func TestGetControllerManagerCommand(t *testing.T) {
"--cluster-signing-key-file=" + testCertsDir + "/ca.key", "--cluster-signing-key-file=" + testCertsDir + "/ca.key",
"--use-service-account-credentials=true", "--use-service-account-credentials=true",
"--controllers=*,bootstrapsigner,tokencleaner", "--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", "--allocate-node-cidrs=true",
"--cluster-cidr=2001:db8::/64", "--cluster-cidr=2001:db8::/64",
"--node-cidr-mask-size=80", "--node-cidr-mask-size=80",
@ -873,6 +889,10 @@ func TestGetControllerManagerCommandExternalCA(t *testing.T) {
"--cluster-signing-key-file=", "--cluster-signing-key-file=",
"--use-service-account-credentials=true", "--use-service-account-credentials=true",
"--controllers=*,bootstrapsigner,tokencleaner", "--controllers=*,bootstrapsigner,tokencleaner",
"--authentication-kubeconfig=" + kubeadmconstants.KubernetesDir + "/controller-manager.conf",
"--authorization-kubeconfig=" + kubeadmconstants.KubernetesDir + "/controller-manager.conf",
"--client-ca-file=" + tmpdir + "/ca.crt",
"--requestheader-client-ca-file=" + tmpdir + "/front-proxy-ca.crt",
} }
}, },
}, },
@ -898,6 +918,10 @@ func TestGetControllerManagerCommandExternalCA(t *testing.T) {
"--cluster-signing-key-file=" + tmpdir + "/ca.key", "--cluster-signing-key-file=" + tmpdir + "/ca.key",
"--use-service-account-credentials=true", "--use-service-account-credentials=true",
"--controllers=*,bootstrapsigner,tokencleaner", "--controllers=*,bootstrapsigner,tokencleaner",
"--authentication-kubeconfig=" + kubeadmconstants.KubernetesDir + "/controller-manager.conf",
"--authorization-kubeconfig=" + kubeadmconstants.KubernetesDir + "/controller-manager.conf",
"--client-ca-file=" + tmpdir + "/ca.crt",
"--requestheader-client-ca-file=" + tmpdir + "/front-proxy-ca.crt",
} }
}, },
}, },