github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-07-21 08:47:16 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #133347 from SataQiu/clean-20250801

Browse Source 
kubeadm: simplify error handling in getAPIEndpointWithRetry
This commit is contained in:
Kubernetes Prow Robot
2025-08-27 17:17:49 -07:00
committed by GitHub
parent 52f45c822f d959186056
commit 48db4470cc
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
cmd/kubeadm/app/util/config/cluster.go
View File

@@ -29,7 +29,6 @@ import (
authv1 "k8s.io/api/authentication/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
errorsutil "k8s.io/apimachinery/pkg/util/errors"
"k8s.io/apimachinery/pkg/util/wait"
clientset "k8s.io/client-go/kubernetes"
"k8s.io/client-go/tools/clientcmd"
@@ -265,14 +264,11 @@ func getAPIEndpoint(client clientset.Interface, nodeName string, apiEndpoint *ku
func getAPIEndpointWithRetry(client clientset.Interface, nodeName string, apiEndpoint *kubeadmapi.APIEndpoint,
interval, timeout time.Duration) error {
var err error
var errs []error
if err = getAPIEndpointFromPodAnnotation(client, nodeName, apiEndpoint, interval, timeout); err == nil {
return nil
err := getAPIEndpointFromPodAnnotation(client, nodeName, apiEndpoint, interval, timeout)
if err != nil {
return errors.WithMessagef(err, "could not retrieve API endpoints for node %q using pod annotations", nodeName)
}
errs = append(errs, errors.WithMessagef(err, "could not retrieve API endpoints for node %q using pod annotations", nodeName))
return errorsutil.NewAggregate(errs)
return nil
}
func getAPIEndpointFromPodAnnotation(client clientset.Interface, nodeName string, apiEndpoint *kubeadmapi.APIEndpoint,