diff --git a/cmd/kubeadm/app/phases/controlplane/manifests.go b/cmd/kubeadm/app/phases/controlplane/manifests.go index bcd6db80b2c..6e2037c20ef 100644 --- a/cmd/kubeadm/app/phases/controlplane/manifests.go +++ b/cmd/kubeadm/app/phases/controlplane/manifests.go @@ -332,6 +332,7 @@ func getControllerManagerCommand(cfg *kubeadmapi.ClusterConfiguration) []string caFile := filepath.Join(cfg.CertificatesDir, kubeadmconstants.CACertName) defaultArguments := map[string]string{ + "port": "0", "bind-address": "127.0.0.1", "leader-elect": "true", "kubeconfig": kubeconfigFile, @@ -402,6 +403,7 @@ func getControllerManagerCommand(cfg *kubeadmapi.ClusterConfiguration) []string func getSchedulerCommand(cfg *kubeadmapi.ClusterConfiguration) []string { kubeconfigFile := filepath.Join(kubeadmconstants.KubernetesDir, kubeadmconstants.SchedulerKubeConfigFileName) defaultArguments := map[string]string{ + "port": "0", "bind-address": "127.0.0.1", "leader-elect": "true", "kubeconfig": kubeconfigFile, diff --git a/cmd/kubeadm/app/phases/controlplane/manifests_test.go b/cmd/kubeadm/app/phases/controlplane/manifests_test.go index b12dc383b2b..138a24f6d20 100644 --- a/cmd/kubeadm/app/phases/controlplane/manifests_test.go +++ b/cmd/kubeadm/app/phases/controlplane/manifests_test.go @@ -634,6 +634,7 @@ func TestGetControllerManagerCommand(t *testing.T) { }, expected: []string{ "kube-controller-manager", + "--port=0", "--bind-address=127.0.0.1", "--leader-elect=true", "--kubeconfig=" + kubeadmconstants.KubernetesDir + "/controller-manager.conf", @@ -658,6 +659,7 @@ func TestGetControllerManagerCommand(t *testing.T) { }, expected: []string{ "kube-controller-manager", + "--port=0", "--bind-address=127.0.0.1", "--leader-elect=true", "--kubeconfig=" + kubeadmconstants.KubernetesDir + "/controller-manager.conf", @@ -682,6 +684,7 @@ func TestGetControllerManagerCommand(t *testing.T) { }, expected: []string{ "kube-controller-manager", + "--port=0", "--bind-address=127.0.0.1", "--leader-elect=true", "--kubeconfig=" + kubeadmconstants.KubernetesDir + "/controller-manager.conf", @@ -711,6 +714,7 @@ func TestGetControllerManagerCommand(t *testing.T) { }, expected: []string{ "kube-controller-manager", + "--port=0", "--bind-address=127.0.0.1", "--leader-elect=true", "--kubeconfig=" + kubeadmconstants.KubernetesDir + "/controller-manager.conf", @@ -742,6 +746,7 @@ func TestGetControllerManagerCommand(t *testing.T) { }, expected: []string{ "kube-controller-manager", + "--port=0", "--bind-address=127.0.0.1", "--leader-elect=true", "--kubeconfig=" + kubeadmconstants.KubernetesDir + "/controller-manager.conf", @@ -772,6 +777,7 @@ func TestGetControllerManagerCommand(t *testing.T) { }, expected: []string{ "kube-controller-manager", + "--port=0", "--bind-address=127.0.0.1", "--leader-elect=true", "--kubeconfig=" + kubeadmconstants.KubernetesDir + "/controller-manager.conf", @@ -804,6 +810,7 @@ func TestGetControllerManagerCommand(t *testing.T) { }, expected: []string{ "kube-controller-manager", + "--port=0", "--bind-address=127.0.0.1", "--leader-elect=true", "--kubeconfig=" + kubeadmconstants.KubernetesDir + "/controller-manager.conf", @@ -838,6 +845,7 @@ func TestGetControllerManagerCommand(t *testing.T) { }, expected: []string{ "kube-controller-manager", + "--port=0", "--bind-address=127.0.0.1", "--leader-elect=true", "--kubeconfig=" + kubeadmconstants.KubernetesDir + "/controller-manager.conf", @@ -987,6 +995,7 @@ func TestGetControllerManagerCommandExternalCA(t *testing.T) { expectedArgFunc: func(tmpdir string) []string { return []string{ "kube-controller-manager", + "--port=0", "--bind-address=127.0.0.1", "--leader-elect=true", "--kubeconfig=" + kubeadmconstants.KubernetesDir + "/controller-manager.conf", @@ -1016,6 +1025,7 @@ func TestGetControllerManagerCommandExternalCA(t *testing.T) { expectedArgFunc: func(tmpdir string) []string { return []string{ "kube-controller-manager", + "--port=0", "--bind-address=127.0.0.1", "--leader-elect=true", "--kubeconfig=" + kubeadmconstants.KubernetesDir + "/controller-manager.conf", @@ -1077,6 +1087,7 @@ func TestGetSchedulerCommand(t *testing.T) { cfg: &kubeadmapi.ClusterConfiguration{}, expected: []string{ "kube-scheduler", + "--port=0", "--bind-address=127.0.0.1", "--leader-elect=true", "--kubeconfig=" + kubeadmconstants.KubernetesDir + "/scheduler.conf",