merge(#3642): fix GKE 1.24 fix 3

fix(GKE,1.24): fixed error msg match
banzaicloud · Sep 22, 2022 · 25fe49b · 25fe49b
2 parents ec032c4 + 1915983
commit 25fe49b
Showing 1 changed file with 21 additions and 22 deletions.
diff --git a/src/cluster/gke.go b/src/cluster/gke.go
@@ -1379,31 +1379,30 @@ func generateServiceAccountToken(clientset *kubernetes.Clientset) (string, error
 	}
 
 	secretObj, err = clientset.CoreV1().Secrets(adminSANamespace).Get(ctx, secretName, metav1.GetOptions{})
-	if err != nil {
-		if googleErr, ok := errors.Cause(err).(*googleapi.Error); ok && googleErr.Code == http.StatusNotFound { // Note: secret not found, let's create one.
-			adminSATokenSecret := v1.Secret{
-				ObjectMeta: metav1.ObjectMeta{
-					Name:      secretName,
-					Namespace: adminSANamespace,
-					Annotations: map[string]string{
-						"kubernetes.io/service-account.name": adminSAName,
-					},
+	if err != nil &&
+		k8sErrors.IsNotFound(err) {
+		adminSATokenSecret := v1.Secret{
+			ObjectMeta: metav1.ObjectMeta{
+				Name:      secretName,
+				Namespace: adminSANamespace,
+				Annotations: map[string]string{
+					"kubernetes.io/service-account.name": adminSAName,
 				},
-				Type: "kubernetes.io/service-account-token",
-			}
+			},
+			Type: "kubernetes.io/service-account-token",
+		}
 
-			secretObj, err = clientset.CoreV1().Secrets(adminSANamespace).Create(ctx, &adminSATokenSecret, metav1.CreateOptions{})
-			if err != nil {
-				return "", errors.WrapIfWithDetails(err, "creating kubernetes secret failed", "namespace", adminSANamespace, "secret", secretName)
-			}
-		} else {
-			return "", errors.WrapIfWithDetails(
-				err,
-				"retrieving kubernetes secret failed with unexpected error",
-				"namespace", adminSANamespace,
-				"secret", secretName,
-			)
+		secretObj, err = clientset.CoreV1().Secrets(adminSANamespace).Create(ctx, &adminSATokenSecret, metav1.CreateOptions{})
+		if err != nil {
+			return "", errors.WrapIfWithDetails(err, "creating kubernetes secret failed", "namespace", adminSANamespace, "secret", secretName)
 		}
+	} else if err != nil { // && !k8sErrors.IsNotFound(err) {
+		return "", errors.WrapIfWithDetails(
+			err,
+			"retrieving kubernetes secret failed with unexpected error",
+			"namespace", adminSANamespace,
+			"secret", secretName,
+		)
 	}
 
 	token, ok := secretObj.Data["token"]