From 6148992056e78273ccb5998bf3dc1ae7515b369c Mon Sep 17 00:00:00 2001 From: dmaiocchi Date: Thu, 20 Dec 2018 22:14:16 +0100 Subject: [PATCH] Replace address with bind-address --- .../app/phases/controlplane/manifests.go | 4 +-- .../app/phases/controlplane/manifests_test.go | 26 +++++++++---------- .../phases/selfhosting/selfhosting_test.go | 8 +++--- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/cmd/kubeadm/app/phases/controlplane/manifests.go b/cmd/kubeadm/app/phases/controlplane/manifests.go index 0f618a8471..d48a86d138 100644 --- a/cmd/kubeadm/app/phases/controlplane/manifests.go +++ b/cmd/kubeadm/app/phases/controlplane/manifests.go @@ -246,7 +246,7 @@ func calcNodeCidrSize(podSubnet string) string { // getControllerManagerCommand builds the right controller manager command from the given config object and version func getControllerManagerCommand(cfg *kubeadmapi.InitConfiguration, k8sVersion *version.Version) []string { defaultArguments := map[string]string{ - "address": "127.0.0.1", + "bind-address": "127.0.0.1", "leader-elect": "true", "kubeconfig": filepath.Join(kubeadmconstants.KubernetesDir, kubeadmconstants.ControllerManagerKubeConfigFileName), "root-ca-file": filepath.Join(cfg.CertificatesDir, kubeadmconstants.CACertName), @@ -290,7 +290,7 @@ func getControllerManagerCommand(cfg *kubeadmapi.InitConfiguration, k8sVersion * // getSchedulerCommand builds the right scheduler command from the given config object and version func getSchedulerCommand(cfg *kubeadmapi.InitConfiguration) []string { defaultArguments := map[string]string{ - "address": "127.0.0.1", + "bind-address": "127.0.0.1", "leader-elect": "true", "kubeconfig": filepath.Join(kubeadmconstants.KubernetesDir, kubeadmconstants.SchedulerKubeConfigFileName), } diff --git a/cmd/kubeadm/app/phases/controlplane/manifests_test.go b/cmd/kubeadm/app/phases/controlplane/manifests_test.go index fa45da8019..1581a47ad3 100644 --- a/cmd/kubeadm/app/phases/controlplane/manifests_test.go +++ b/cmd/kubeadm/app/phases/controlplane/manifests_test.go @@ -581,7 +581,7 @@ func TestGetControllerManagerCommand(t *testing.T) { }, expected: []string{ "kube-controller-manager", - "--address=127.0.0.1", + "--bind-address=127.0.0.1", "--leader-elect=true", "--kubeconfig=" + kubeadmconstants.KubernetesDir + "/controller-manager.conf", "--root-ca-file=" + testCertsDir + "/ca.crt", @@ -605,7 +605,7 @@ func TestGetControllerManagerCommand(t *testing.T) { }, expected: []string{ "kube-controller-manager", - "--address=127.0.0.1", + "--bind-address=127.0.0.1", "--leader-elect=true", "--kubeconfig=" + kubeadmconstants.KubernetesDir + "/controller-manager.conf", "--root-ca-file=" + testCertsDir + "/ca.crt", @@ -635,7 +635,7 @@ func TestGetControllerManagerCommand(t *testing.T) { }, expected: []string{ "kube-controller-manager", - "--address=127.0.0.1", + "--bind-address=127.0.0.1", "--leader-elect=true", "--kubeconfig=" + kubeadmconstants.KubernetesDir + "/controller-manager.conf", "--root-ca-file=" + testCertsDir + "/ca.crt", @@ -662,7 +662,7 @@ func TestGetControllerManagerCommand(t *testing.T) { }, expected: []string{ "kube-controller-manager", - "--address=127.0.0.1", + "--bind-address=127.0.0.1", "--leader-elect=true", "--kubeconfig=" + kubeadmconstants.KubernetesDir + "/controller-manager.conf", "--root-ca-file=" + testCertsDir + "/ca.crt", @@ -688,7 +688,7 @@ func TestGetControllerManagerCommand(t *testing.T) { }, expected: []string{ "kube-controller-manager", - "--address=127.0.0.1", + "--bind-address=127.0.0.1", "--leader-elect=true", "--kubeconfig=" + kubeadmconstants.KubernetesDir + "/controller-manager.conf", "--root-ca-file=" + testCertsDir + "/ca.crt", @@ -708,7 +708,7 @@ func TestGetControllerManagerCommand(t *testing.T) { }, expected: []string{ "kube-controller-manager", - "--address=127.0.0.1", + "--bind-address=127.0.0.1", "--leader-elect=true", "--kubeconfig=" + kubeadmconstants.KubernetesDir + "/controller-manager.conf", "--root-ca-file=" + testCertsDir + "/ca.crt", @@ -734,7 +734,7 @@ func TestGetControllerManagerCommand(t *testing.T) { }, expected: []string{ "kube-controller-manager", - "--address=127.0.0.1", + "--bind-address=127.0.0.1", "--leader-elect=true", "--kubeconfig=" + kubeadmconstants.KubernetesDir + "/controller-manager.conf", "--root-ca-file=" + testCertsDir + "/ca.crt", @@ -757,7 +757,7 @@ func TestGetControllerManagerCommand(t *testing.T) { }, expected: []string{ "kube-controller-manager", - "--address=127.0.0.1", + "--bind-address=127.0.0.1", "--leader-elect=true", "--kubeconfig=" + kubeadmconstants.KubernetesDir + "/controller-manager.conf", "--root-ca-file=" + testCertsDir + "/ca.crt", @@ -884,7 +884,7 @@ func TestGetControllerManagerCommandExternalCA(t *testing.T) { expectedArgFunc: func(tmpdir string) []string { return []string{ "kube-controller-manager", - "--address=127.0.0.1", + "--bind-address=127.0.0.1", "--leader-elect=true", "--kubeconfig=" + kubeadmconstants.KubernetesDir + "/controller-manager.conf", "--root-ca-file=" + tmpdir + "/ca.crt", @@ -913,7 +913,7 @@ func TestGetControllerManagerCommandExternalCA(t *testing.T) { expectedArgFunc: func(tmpdir string) []string { return []string{ "kube-controller-manager", - "--address=127.0.0.1", + "--bind-address=127.0.0.1", "--leader-elect=true", "--kubeconfig=" + kubeadmconstants.KubernetesDir + "/controller-manager.conf", "--root-ca-file=" + tmpdir + "/ca.crt", @@ -942,7 +942,7 @@ func TestGetControllerManagerCommandExternalCA(t *testing.T) { expectedArgFunc: func(tmpdir string) []string { return []string{ "kube-controller-manager", - "--address=127.0.0.1", + "--bind-address=127.0.0.1", "--leader-elect=true", "--kubeconfig=" + kubeadmconstants.KubernetesDir + "/controller-manager.conf", "--root-ca-file=" + tmpdir + "/ca.crt", @@ -967,7 +967,7 @@ func TestGetControllerManagerCommandExternalCA(t *testing.T) { expectedArgFunc: func(tmpdir string) []string { return []string{ "kube-controller-manager", - "--address=127.0.0.1", + "--bind-address=127.0.0.1", "--leader-elect=true", "--kubeconfig=" + kubeadmconstants.KubernetesDir + "/controller-manager.conf", "--root-ca-file=" + tmpdir + "/ca.crt", @@ -1022,7 +1022,7 @@ func TestGetSchedulerCommand(t *testing.T) { cfg: &kubeadmapi.ClusterConfiguration{}, expected: []string{ "kube-scheduler", - "--address=127.0.0.1", + "--bind-address=127.0.0.1", "--leader-elect=true", "--kubeconfig=" + kubeadmconstants.KubernetesDir + "/scheduler.conf", }, diff --git a/cmd/kubeadm/app/phases/selfhosting/selfhosting_test.go b/cmd/kubeadm/app/phases/selfhosting/selfhosting_test.go index 9532367d41..2fb5552a4e 100644 --- a/cmd/kubeadm/app/phases/selfhosting/selfhosting_test.go +++ b/cmd/kubeadm/app/phases/selfhosting/selfhosting_test.go @@ -223,7 +223,7 @@ spec: - --service-account-private-key-file=/etc/kubernetes/pki/sa.key - --cluster-signing-cert-file=/etc/kubernetes/pki/ca.crt - --cluster-signing-key-file=/etc/kubernetes/pki/ca.key - - --address=127.0.0.1 + - --bind-address=127.0.0.1 - --use-service-account-credentials=true image: k8s.gcr.io/kube-controller-manager-amd64:v1.7.4 livenessProbe: @@ -298,7 +298,7 @@ spec: - --service-account-private-key-file=/etc/kubernetes/pki/sa.key - --cluster-signing-cert-file=/etc/kubernetes/pki/ca.crt - --cluster-signing-key-file=/etc/kubernetes/pki/ca.key - - --address=127.0.0.1 + - --bind-address=127.0.0.1 - --use-service-account-credentials=true image: k8s.gcr.io/kube-controller-manager-amd64:v1.7.4 livenessProbe: @@ -372,7 +372,7 @@ spec: - kube-scheduler - --leader-elect=true - --kubeconfig=/etc/kubernetes/scheduler.conf - - --address=127.0.0.1 + - --bind-address=127.0.0.1 image: k8s.gcr.io/kube-scheduler-amd64:v1.7.4 livenessProbe: failureThreshold: 8 @@ -423,7 +423,7 @@ spec: - kube-scheduler - --leader-elect=true - --kubeconfig=/etc/kubernetes/scheduler.conf - - --address=127.0.0.1 + - --bind-address=127.0.0.1 image: k8s.gcr.io/kube-scheduler-amd64:v1.7.4 livenessProbe: failureThreshold: 8