github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 20:53:33 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #92720 from neolit123/1.19-add-kcm-port

Browse Source 
kubeadm: add --port=0 for kube-controller-manager and kube-scheduler
This commit is contained in:
Kubernetes Prow Robot 2020-07-03 05:03:25 -07:00 committed by GitHub
commit 046ac5100e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -332,6 +332,7 @@ func getControllerManagerCommand(cfg *kubeadmapi.ClusterConfiguration) []string
caFile := filepath.Join(cfg.CertificatesDir, kubeadmconstants.CACertName) caFile := filepath.Join(cfg.CertificatesDir, kubeadmconstants.CACertName)
defaultArguments := map[string]string{ defaultArguments := map[string]string{
"port": "0",
"bind-address": "127.0.0.1", "bind-address": "127.0.0.1",
"leader-elect": "true", "leader-elect": "true",
"kubeconfig": kubeconfigFile, "kubeconfig": kubeconfigFile,
@ -402,6 +403,7 @@ func getControllerManagerCommand(cfg *kubeadmapi.ClusterConfiguration) []string
func getSchedulerCommand(cfg *kubeadmapi.ClusterConfiguration) []string { func getSchedulerCommand(cfg *kubeadmapi.ClusterConfiguration) []string {
kubeconfigFile := filepath.Join(kubeadmconstants.KubernetesDir, kubeadmconstants.SchedulerKubeConfigFileName) kubeconfigFile := filepath.Join(kubeadmconstants.KubernetesDir, kubeadmconstants.SchedulerKubeConfigFileName)
defaultArguments := map[string]string{ defaultArguments := map[string]string{
"port": "0",
"bind-address": "127.0.0.1", "bind-address": "127.0.0.1",
"leader-elect": "true", "leader-elect": "true",
"kubeconfig": kubeconfigFile, "kubeconfig": kubeconfigFile,

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

@ -634,6 +634,7 @@ func TestGetControllerManagerCommand(t *testing.T) {
}, },
expected: []string{ expected: []string{
"kube-controller-manager", "kube-controller-manager",
"--port=0",
"--bind-address=127.0.0.1", "--bind-address=127.0.0.1",
"--leader-elect=true", "--leader-elect=true",
"--kubeconfig=" + kubeadmconstants.KubernetesDir + "/controller-manager.conf", "--kubeconfig=" + kubeadmconstants.KubernetesDir + "/controller-manager.conf",
@ -658,6 +659,7 @@ func TestGetControllerManagerCommand(t *testing.T) {
}, },
expected: []string{ expected: []string{
"kube-controller-manager", "kube-controller-manager",
"--port=0",
"--bind-address=127.0.0.1", "--bind-address=127.0.0.1",
"--leader-elect=true", "--leader-elect=true",
"--kubeconfig=" + kubeadmconstants.KubernetesDir + "/controller-manager.conf", "--kubeconfig=" + kubeadmconstants.KubernetesDir + "/controller-manager.conf",
@ -682,6 +684,7 @@ func TestGetControllerManagerCommand(t *testing.T) {
}, },
expected: []string{ expected: []string{
"kube-controller-manager", "kube-controller-manager",
"--port=0",
"--bind-address=127.0.0.1", "--bind-address=127.0.0.1",
"--leader-elect=true", "--leader-elect=true",
"--kubeconfig=" + kubeadmconstants.KubernetesDir + "/controller-manager.conf", "--kubeconfig=" + kubeadmconstants.KubernetesDir + "/controller-manager.conf",
@ -711,6 +714,7 @@ func TestGetControllerManagerCommand(t *testing.T) {
}, },
expected: []string{ expected: []string{
"kube-controller-manager", "kube-controller-manager",
"--port=0",
"--bind-address=127.0.0.1", "--bind-address=127.0.0.1",
"--leader-elect=true", "--leader-elect=true",
"--kubeconfig=" + kubeadmconstants.KubernetesDir + "/controller-manager.conf", "--kubeconfig=" + kubeadmconstants.KubernetesDir + "/controller-manager.conf",
@ -742,6 +746,7 @@ func TestGetControllerManagerCommand(t *testing.T) {
}, },
expected: []string{ expected: []string{
"kube-controller-manager", "kube-controller-manager",
"--port=0",
"--bind-address=127.0.0.1", "--bind-address=127.0.0.1",
"--leader-elect=true", "--leader-elect=true",
"--kubeconfig=" + kubeadmconstants.KubernetesDir + "/controller-manager.conf", "--kubeconfig=" + kubeadmconstants.KubernetesDir + "/controller-manager.conf",
@ -772,6 +777,7 @@ func TestGetControllerManagerCommand(t *testing.T) {
}, },
expected: []string{ expected: []string{
"kube-controller-manager", "kube-controller-manager",
"--port=0",
"--bind-address=127.0.0.1", "--bind-address=127.0.0.1",
"--leader-elect=true", "--leader-elect=true",
"--kubeconfig=" + kubeadmconstants.KubernetesDir + "/controller-manager.conf", "--kubeconfig=" + kubeadmconstants.KubernetesDir + "/controller-manager.conf",
@ -804,6 +810,7 @@ func TestGetControllerManagerCommand(t *testing.T) {
}, },
expected: []string{ expected: []string{
"kube-controller-manager", "kube-controller-manager",
"--port=0",
"--bind-address=127.0.0.1", "--bind-address=127.0.0.1",
"--leader-elect=true", "--leader-elect=true",
"--kubeconfig=" + kubeadmconstants.KubernetesDir + "/controller-manager.conf", "--kubeconfig=" + kubeadmconstants.KubernetesDir + "/controller-manager.conf",
@ -838,6 +845,7 @@ func TestGetControllerManagerCommand(t *testing.T) {
}, },
expected: []string{ expected: []string{
"kube-controller-manager", "kube-controller-manager",
"--port=0",
"--bind-address=127.0.0.1", "--bind-address=127.0.0.1",
"--leader-elect=true", "--leader-elect=true",
"--kubeconfig=" + kubeadmconstants.KubernetesDir + "/controller-manager.conf", "--kubeconfig=" + kubeadmconstants.KubernetesDir + "/controller-manager.conf",
@ -987,6 +995,7 @@ func TestGetControllerManagerCommandExternalCA(t *testing.T) {
expectedArgFunc: func(tmpdir string) []string { expectedArgFunc: func(tmpdir string) []string {
return []string{ return []string{
"kube-controller-manager", "kube-controller-manager",
"--port=0",
"--bind-address=127.0.0.1", "--bind-address=127.0.0.1",
"--leader-elect=true", "--leader-elect=true",
"--kubeconfig=" + kubeadmconstants.KubernetesDir + "/controller-manager.conf", "--kubeconfig=" + kubeadmconstants.KubernetesDir + "/controller-manager.conf",
@ -1016,6 +1025,7 @@ func TestGetControllerManagerCommandExternalCA(t *testing.T) {
expectedArgFunc: func(tmpdir string) []string { expectedArgFunc: func(tmpdir string) []string {
return []string{ return []string{
"kube-controller-manager", "kube-controller-manager",
"--port=0",
"--bind-address=127.0.0.1", "--bind-address=127.0.0.1",
"--leader-elect=true", "--leader-elect=true",
"--kubeconfig=" + kubeadmconstants.KubernetesDir + "/controller-manager.conf", "--kubeconfig=" + kubeadmconstants.KubernetesDir + "/controller-manager.conf",
@ -1077,6 +1087,7 @@ func TestGetSchedulerCommand(t *testing.T) {
cfg: &kubeadmapi.ClusterConfiguration{}, cfg: &kubeadmapi.ClusterConfiguration{},
expected: []string{ expected: []string{
"kube-scheduler", "kube-scheduler",
"--port=0",
"--bind-address=127.0.0.1", "--bind-address=127.0.0.1",
"--leader-elect=true", "--leader-elect=true",
"--kubeconfig=" + kubeadmconstants.KubernetesDir + "/scheduler.conf", "--kubeconfig=" + kubeadmconstants.KubernetesDir + "/scheduler.conf",