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

Merge pull request #128532 from neolit123/1.32-handle-custom-addreses-comp-readyz

Browse Source 
kubeadm: use advertise address for WaitForAllControlPlaneComponents
This commit is contained in:
Kubernetes Prow Robot 2024-11-06 08:51:29 +00:00 committed by GitHub
commit 3dcad5f0db
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 43 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/kubeadm/app/cmd/phases/init/waitcontrolplane.go
View File

@ -124,7 +124,8 @@ func runWaitControlPlanePhase(c workflow.RunData) error {
waiter.SetTimeout(data.Cfg().Timeouts.ControlPlaneComponentHealthCheck.Duration) waiter.SetTimeout(data.Cfg().Timeouts.ControlPlaneComponentHealthCheck.Duration)
if features.Enabled(data.Cfg().ClusterConfiguration.FeatureGates, features.WaitForAllControlPlaneComponents) { if features.Enabled(data.Cfg().ClusterConfiguration.FeatureGates, features.WaitForAllControlPlaneComponents) {
err = waiter.WaitForControlPlaneComponents(&data.Cfg().ClusterConfiguration) err = waiter.WaitForControlPlaneComponents(&data.Cfg().ClusterConfiguration,
data.Cfg().LocalAPIEndpoint.AdvertiseAddress)
} else { } else {
err = waiter.WaitForAPI() err = waiter.WaitForAPI()
} }

3
cmd/kubeadm/app/cmd/phases/join/waitcontrolplane.go
View File

@ -71,7 +71,8 @@ func runWaitControlPlanePhase(c workflow.RunData) error {
} }
waiter.SetTimeout(data.Cfg().Timeouts.ControlPlaneComponentHealthCheck.Duration) waiter.SetTimeout(data.Cfg().Timeouts.ControlPlaneComponentHealthCheck.Duration)
if err := waiter.WaitForControlPlaneComponents(&initCfg.ClusterConfiguration); err != nil { if err := waiter.WaitForControlPlaneComponents(&initCfg.ClusterConfiguration,
data.Cfg().ControlPlane.LocalAPIEndpoint.AdvertiseAddress); err != nil {
return err return err
} }

2
cmd/kubeadm/app/phases/upgrade/staticpods_test.go
View File

@ -99,7 +99,7 @@ func NewFakeStaticPodWaiter(errsToReturn map[string]error) apiclient.Waiter {
} }
// WaitForControlPlaneComponents just returns a dummy nil, to indicate that the program should just proceed // WaitForControlPlaneComponents just returns a dummy nil, to indicate that the program should just proceed
func (w *fakeWaiter) WaitForControlPlaneComponents(cfg *kubeadmapi.ClusterConfiguration) error { func (w *fakeWaiter) WaitForControlPlaneComponents(cfg *kubeadmapi.ClusterConfiguration, apiServerAddress string) error {
return nil return nil
} }

45
cmd/kubeadm/app/util/apiclient/wait.go
View File

@ -21,6 +21,7 @@ import (
"crypto/tls" "crypto/tls"
"fmt" "fmt"
"io" "io"
"net"
"net/http" "net/http"
"time" "time"
@ -40,7 +41,7 @@ import (
// Waiter is an interface for waiting for criteria in Kubernetes to happen // Waiter is an interface for waiting for criteria in Kubernetes to happen
type Waiter interface { type Waiter interface {
// WaitForControlPlaneComponents waits for all control plane components to be ready. // WaitForControlPlaneComponents waits for all control plane components to be ready.
WaitForControlPlaneComponents(cfg *kubeadmapi.ClusterConfiguration) error WaitForControlPlaneComponents(cfg *kubeadmapi.ClusterConfiguration, apiServerAddress string) error
// WaitForAPI waits for the API Server's /healthz endpoint to become "ok" // WaitForAPI waits for the API Server's /healthz endpoint to become "ok"
// TODO: remove WaitForAPI once WaitForAllControlPlaneComponents goes GA: // TODO: remove WaitForAPI once WaitForAllControlPlaneComponents goes GA:
// https://github.com/kubernetes/kubeadm/issues/2907 // https://github.com/kubernetes/kubeadm/issues/2907
@ -91,11 +92,17 @@ const (
// getControlPlaneComponents takes a ClusterConfiguration and returns a slice of // getControlPlaneComponents takes a ClusterConfiguration and returns a slice of
// control plane components and their health check URLs. // control plane components and their health check URLs.
func getControlPlaneComponents(cfg *kubeadmapi.ClusterConfiguration) []controlPlaneComponent { func getControlPlaneComponents(cfg *kubeadmapi.ClusterConfiguration, defaultAddressAPIServer string) []controlPlaneComponent {
const ( const (
portArg = "secure-port" portArg = "secure-port"
addressArg = "bind-address" bindAddressArg = "bind-address"
defaultAddress = "127.0.0.1" // By default, for kube-api-server, kubeadm does not apply a --bind-address flag.
// Check --advertise-address instead, which can override the defaultAddressAPIServer value.
advertiseAddressArg = "advertise-address"
// By default kubeadm deploys the kube-controller-manager and kube-scheduler
// with --bind-address=127.0.0.1. This should match get{Scheduler|ControllerManager}Command().
defaultAddressKCM = "127.0.0.1"
defaultAddressScheduler = "127.0.0.1"
) )
portAPIServer, idx := kubeadmapi.GetArgValue(cfg.APIServer.ExtraArgs, portArg, -1) portAPIServer, idx := kubeadmapi.GetArgValue(cfg.APIServer.ExtraArgs, portArg, -1)
@ -111,33 +118,39 @@ func getControlPlaneComponents(cfg *kubeadmapi.ClusterConfiguration) []controlPl
portScheduler = fmt.Sprintf("%d", constants.KubeSchedulerPort) portScheduler = fmt.Sprintf("%d", constants.KubeSchedulerPort)
} }
addressAPIServer, idx := kubeadmapi.GetArgValue(cfg.APIServer.ExtraArgs, addressArg, -1) addressAPIServer, idx := kubeadmapi.GetArgValue(cfg.APIServer.ExtraArgs, advertiseAddressArg, -1)
if idx == -1 { if idx == -1 {
addressAPIServer = defaultAddress addressAPIServer = defaultAddressAPIServer
} }
addressKCM, idx := kubeadmapi.GetArgValue(cfg.ControllerManager.ExtraArgs, addressArg, -1) addressKCM, idx := kubeadmapi.GetArgValue(cfg.ControllerManager.ExtraArgs, bindAddressArg, -1)
if idx == -1 { if idx == -1 {
addressKCM = defaultAddress addressKCM = defaultAddressKCM
} }
addressScheduler, idx := kubeadmapi.GetArgValue(cfg.Scheduler.ExtraArgs, addressArg, -1) addressScheduler, idx := kubeadmapi.GetArgValue(cfg.Scheduler.ExtraArgs, bindAddressArg, -1)
if idx == -1 { if idx == -1 {
addressScheduler = defaultAddress addressScheduler = defaultAddressScheduler
} }
urlFormat := "https://%s:%s/%s" getURL := func(address, port, endpoint string) string {
return fmt.Sprintf(
"https://%s/%s",
net.JoinHostPort(address, port),
endpoint,
)
}
return []controlPlaneComponent{ return []controlPlaneComponent{
{name: "kube-apiserver", url: fmt.Sprintf(urlFormat, addressAPIServer, portAPIServer, endpointLivez)}, {name: "kube-apiserver", url: getURL(addressAPIServer, portAPIServer, endpointLivez)},
{name: "kube-controller-manager", url: fmt.Sprintf(urlFormat, addressKCM, portKCM, endpointHealthz)}, {name: "kube-controller-manager", url: getURL(addressKCM, portKCM, endpointHealthz)},
{name: "kube-scheduler", url: fmt.Sprintf(urlFormat, addressScheduler, portScheduler, endpointLivez)}, {name: "kube-scheduler", url: getURL(addressScheduler, portScheduler, endpointLivez)},
} }
} }
// WaitForControlPlaneComponents waits for all control plane components to report "ok". // WaitForControlPlaneComponents waits for all control plane components to report "ok".
func (w *KubeWaiter) WaitForControlPlaneComponents(cfg *kubeadmapi.ClusterConfiguration) error { func (w *KubeWaiter) WaitForControlPlaneComponents(cfg *kubeadmapi.ClusterConfiguration, apiSeverAddress string) error {
fmt.Printf("[control-plane-check] Waiting for healthy control plane components."+ fmt.Printf("[control-plane-check] Waiting for healthy control plane components."+
" This can take up to %v\n", w.timeout) " This can take up to %v\n", w.timeout)
components := getControlPlaneComponents(cfg) components := getControlPlaneComponents(cfg, apiSeverAddress)
var errs []error var errs []error
errChan := make(chan error, len(components)) errChan := make(chan error, len(components))

16
cmd/kubeadm/app/util/apiclient/wait_test.go
View File

@ -37,34 +37,34 @@ func TestGetControlPlaneComponents(t *testing.T) {
ControlPlaneComponent: kubeadmapi.ControlPlaneComponent{ ControlPlaneComponent: kubeadmapi.ControlPlaneComponent{
ExtraArgs: []kubeadmapi.Arg{ ExtraArgs: []kubeadmapi.Arg{
{Name: "secure-port", Value: "1111"}, {Name: "secure-port", Value: "1111"},
{Name: "bind-address", Value: "0.0.0.0"}, {Name: "advertise-address", Value: "fd00:1::"},
}, },
}, },
}, },
ControllerManager: kubeadmapi.ControlPlaneComponent{ ControllerManager: kubeadmapi.ControlPlaneComponent{
ExtraArgs: []kubeadmapi.Arg{ ExtraArgs: []kubeadmapi.Arg{
{Name: "secure-port", Value: "2222"}, {Name: "secure-port", Value: "2222"},
{Name: "bind-address", Value: "0.0.0.0"}, {Name: "bind-address", Value: "127.0.0.1"},
}, },
}, },
Scheduler: kubeadmapi.ControlPlaneComponent{ Scheduler: kubeadmapi.ControlPlaneComponent{
ExtraArgs: []kubeadmapi.Arg{ ExtraArgs: []kubeadmapi.Arg{
{Name: "secure-port", Value: "3333"}, {Name: "secure-port", Value: "3333"},
{Name: "bind-address", Value: "0.0.0.0"}, {Name: "bind-address", Value: "127.0.0.1"},
}, },
}, },
}, },
expected: []controlPlaneComponent{ expected: []controlPlaneComponent{
{name: "kube-apiserver", url: fmt.Sprintf("https://0.0.0.0:1111/%s", endpointLivez)}, {name: "kube-apiserver", url: fmt.Sprintf("https://[fd00:1::]:1111/%s", endpointLivez)},
{name: "kube-controller-manager", url: fmt.Sprintf("https://0.0.0.0:2222/%s", endpointHealthz)}, {name: "kube-controller-manager", url: fmt.Sprintf("https://127.0.0.1:2222/%s", endpointHealthz)},
{name: "kube-scheduler", url: fmt.Sprintf("https://0.0.0.0:3333/%s", endpointLivez)}, {name: "kube-scheduler", url: fmt.Sprintf("https://127.0.0.1:3333/%s", endpointLivez)},
}, },
}, },
{ {
name: "default ports and addresses", name: "default ports and addresses",
cfg: &kubeadmapi.ClusterConfiguration{}, cfg: &kubeadmapi.ClusterConfiguration{},
expected: []controlPlaneComponent{ expected: []controlPlaneComponent{
{name: "kube-apiserver", url: fmt.Sprintf("https://127.0.0.1:6443/%s", endpointLivez)}, {name: "kube-apiserver", url: fmt.Sprintf("https://192.168.0.1:6443/%s", endpointLivez)},
{name: "kube-controller-manager", url: fmt.Sprintf("https://127.0.0.1:10257/%s", endpointHealthz)}, {name: "kube-controller-manager", url: fmt.Sprintf("https://127.0.0.1:10257/%s", endpointHealthz)},
{name: "kube-scheduler", url: fmt.Sprintf("https://127.0.0.1:10259/%s", endpointLivez)}, {name: "kube-scheduler", url: fmt.Sprintf("https://127.0.0.1:10259/%s", endpointLivez)},
}, },
@ -73,7 +73,7 @@ func TestGetControlPlaneComponents(t *testing.T) {
for _, tc := range testcases { for _, tc := range testcases {
t.Run(tc.name, func(t *testing.T) { t.Run(tc.name, func(t *testing.T) {
actual := getControlPlaneComponents(tc.cfg) actual := getControlPlaneComponents(tc.cfg, "192.168.0.1")
if !reflect.DeepEqual(tc.expected, actual) { if !reflect.DeepEqual(tc.expected, actual) {
t.Fatalf("expected result: %+v, got: %+v", tc.expected, actual) t.Fatalf("expected result: %+v, got: %+v", tc.expected, actual)
} }

2
cmd/kubeadm/app/util/dryrun/dryrun.go
View File

@ -90,7 +90,7 @@ func NewWaiter() apiclient.Waiter {
} }
// WaitForControlPlaneComponents just returns a dummy nil, to indicate that the program should just proceed // WaitForControlPlaneComponents just returns a dummy nil, to indicate that the program should just proceed
func (w *Waiter) WaitForControlPlaneComponents(cfg *kubeadmapi.ClusterConfiguration) error { func (w *Waiter) WaitForControlPlaneComponents(cfg *kubeadmapi.ClusterConfiguration, apiServerAddress string) error {
return nil return nil
} }