Skip to content

Commit

Permalink
revert part of kubernetes#122529 to allow a client may fail
Browse files Browse the repository at this point in the history
  • Loading branch information
pacoxu committed Jan 16, 2024
1 parent ebb79e5 commit aeabb6e
Showing 1 changed file with 10 additions and 11 deletions.
21 changes: 10 additions & 11 deletions cmd/kubeadm/app/util/apiclient/idempotency.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ import (
"k8s.io/apimachinery/pkg/util/strategicpatch"
"k8s.io/apimachinery/pkg/util/wait"
clientset "k8s.io/client-go/kubernetes"
clientsetretry "k8s.io/client-go/util/retry"

kubeadmapi "k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm"
"k8s.io/kubernetes/cmd/kubeadm/app/constants"
Expand Down Expand Up @@ -336,17 +337,15 @@ func PatchNode(client clientset.Interface, nodeName string, patchFn func(*v1.Nod
func GetConfigMapWithRetry(client clientset.Interface, namespace, name string) (*v1.ConfigMap, error) {
var cm *v1.ConfigMap
var lastError error
err := wait.PollUntilContextTimeout(context.Background(),
constants.KubernetesAPICallRetryInterval, kubeadmapi.GetActiveTimeouts().KubernetesAPICall.Duration,
true, func(ctx context.Context) (bool, error) {
var err error
cm, err = client.CoreV1().ConfigMaps(namespace).Get(ctx, name, metav1.GetOptions{})
if err == nil {
return true, nil
}
lastError = err
return false, nil
})
err := wait.ExponentialBackoff(clientsetretry.DefaultBackoff, func() (bool, error) {
var err error
cm, err = client.CoreV1().ConfigMaps(namespace).Get(context.TODO(), name, metav1.GetOptions{})
if err == nil {
return true, nil
}
lastError = err
return false, nil
})
if err == nil {
return cm, nil
}
Expand Down

0 comments on commit aeabb6e

Please sign in to comment.