From 7dc6c94395f0d2b6b03dff75e17fc82e43603308 Mon Sep 17 00:00:00 2001 From: Antonio Ojea Date: Fri, 20 Dec 2019 22:03:49 +0100 Subject: [PATCH] kubeadm: use bind-address instead of address kubeadm removed the deprecated "--address" flag for controller-manager and scheduler in favor of "--bind-address" We should use bind-address to configure the manifest probe addresses. --- cmd/kubeadm/app/util/staticpod/utils.go | 12 ++++++------ cmd/kubeadm/app/util/staticpod/utils_test.go | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/cmd/kubeadm/app/util/staticpod/utils.go b/cmd/kubeadm/app/util/staticpod/utils.go index 242e89bcb06..16a1a4cc5ae 100644 --- a/cmd/kubeadm/app/util/staticpod/utils.go +++ b/cmd/kubeadm/app/util/staticpod/utils.go @@ -38,11 +38,11 @@ import ( ) const ( - // kubeControllerManagerAddressArg represents the address argument of the kube-controller-manager configuration. - kubeControllerManagerAddressArg = "address" + // kubeControllerManagerBindAddressArg represents the bind-address argument of the kube-controller-manager configuration. + kubeControllerManagerBindAddressArg = "bind-address" - // kubeSchedulerAddressArg represents the address argument of the kube-scheduler configuration. - kubeSchedulerAddressArg = "address" + // kubeSchedulerBindAddressArg represents the bind-address argument of the kube-scheduler configuration. + kubeSchedulerBindAddressArg = "bind-address" ) // ComponentPod returns a Pod object from the container and volume specifications @@ -252,7 +252,7 @@ func GetAPIServerProbeAddress(endpoint *kubeadmapi.APIEndpoint) string { // GetControllerManagerProbeAddress returns the kubernetes controller manager probe address func GetControllerManagerProbeAddress(cfg *kubeadmapi.ClusterConfiguration) string { - if addr, exists := cfg.ControllerManager.ExtraArgs[kubeControllerManagerAddressArg]; exists { + if addr, exists := cfg.ControllerManager.ExtraArgs[kubeControllerManagerBindAddressArg]; exists { return addr } return "127.0.0.1" @@ -260,7 +260,7 @@ func GetControllerManagerProbeAddress(cfg *kubeadmapi.ClusterConfiguration) stri // GetSchedulerProbeAddress returns the kubernetes scheduler probe address func GetSchedulerProbeAddress(cfg *kubeadmapi.ClusterConfiguration) string { - if addr, exists := cfg.Scheduler.ExtraArgs[kubeSchedulerAddressArg]; exists { + if addr, exists := cfg.Scheduler.ExtraArgs[kubeSchedulerBindAddressArg]; exists { return addr } return "127.0.0.1" diff --git a/cmd/kubeadm/app/util/staticpod/utils_test.go b/cmd/kubeadm/app/util/staticpod/utils_test.go index 22276d52ead..2d6fc867721 100644 --- a/cmd/kubeadm/app/util/staticpod/utils_test.go +++ b/cmd/kubeadm/app/util/staticpod/utils_test.go @@ -104,7 +104,7 @@ func TestGetControllerManagerProbeAddress(t *testing.T) { cfg: &kubeadmapi.ClusterConfiguration{ ControllerManager: kubeadmapi.ControlPlaneComponent{ ExtraArgs: map[string]string{ - kubeControllerManagerAddressArg: "10.10.10.10", + kubeControllerManagerBindAddressArg: "10.10.10.10", }, }, }, @@ -115,7 +115,7 @@ func TestGetControllerManagerProbeAddress(t *testing.T) { cfg: &kubeadmapi.ClusterConfiguration{ ControllerManager: kubeadmapi.ControlPlaneComponent{ ExtraArgs: map[string]string{ - kubeControllerManagerAddressArg: "2001:abcd:bcda::1", + kubeControllerManagerBindAddressArg: "2001:abcd:bcda::1", }, }, },