From 7938631e224bffab899fb59ccd3c056c69737e10 Mon Sep 17 00:00:00 2001 From: "Lubomir I. Ivanov" Date: Sat, 14 Jan 2023 00:11:49 +0200 Subject: [PATCH] Revert "UpdateOrCreateToken get secrets err handling optimization" --- cmd/kubeadm/app/phases/bootstraptoken/node/token.go | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/cmd/kubeadm/app/phases/bootstraptoken/node/token.go b/cmd/kubeadm/app/phases/bootstraptoken/node/token.go index b8f3375de89..539d7ef623c 100644 --- a/cmd/kubeadm/app/phases/bootstraptoken/node/token.go +++ b/cmd/kubeadm/app/phases/bootstraptoken/node/token.go @@ -21,7 +21,6 @@ import ( "github.com/pkg/errors" - apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" clientset "k8s.io/client-go/kubernetes" bootstraputil "k8s.io/cluster-bootstrap/token/util" @@ -42,10 +41,7 @@ func UpdateOrCreateTokens(client clientset.Interface, failIfExists bool, tokens secretName := bootstraputil.BootstrapTokenSecretName(token.Token.ID) secret, err := client.CoreV1().Secrets(metav1.NamespaceSystem).Get(context.TODO(), secretName, metav1.GetOptions{}) - if err != nil && !apierrors.IsNotFound(err) { - return err - } - if secret != nil && failIfExists { + if secret != nil && err == nil && failIfExists { return errors.Errorf("a token with id %q already exists", token.Token.ID) }