github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-15 14:14:39 +00:00
Code Issues Projects Releases Wiki Activity

kubeadm: use bind-address instead of address

Browse Source 
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.
This commit is contained in:
Antonio Ojea
2019-12-20 22:03:49 +01:00
parent 449fe0b1ba
commit 7dc6c94395
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
cmd/kubeadm/app/util/staticpod/utils.go
View File

@@ -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"

4
cmd/kubeadm/app/util/staticpod/utils_test.go
View File

@@ -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",
},
},
},