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

Merge pull request #104157 from knight42/remove-port-from-kubeadm-manifest

Browse Source 
refactor(kubeadm): remove the flag --port from KCM manifest
This commit is contained in:
Kubernetes Prow Robot 2021-08-05 16:37:10 -07:00 committed by GitHub
commit 5eeaafd2b4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -306,7 +306,6 @@ 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,

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

@ -550,7 +550,6 @@ 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",
@ -576,7 +575,6 @@ 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",
@ -601,7 +599,6 @@ 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",
@ -633,7 +630,6 @@ 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",
@ -665,7 +661,6 @@ 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",
@ -698,7 +693,6 @@ 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",
@ -733,7 +727,6 @@ 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",
@ -766,7 +759,6 @@ 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",
@ -801,7 +793,6 @@ 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",
@ -855,7 +846,6 @@ 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",
@ -885,7 +875,6 @@ 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",