Update kubeconfig when --kubie is set (#610)

giantswarm · Mar 1, 2021 · 82bfcd4 · 82bfcd4
1 parent b69a1a6
commit 82bfcd4
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/commands/create/kubeconfig/command.go b/commands/create/kubeconfig/command.go
@@ -591,17 +591,17 @@ func createKubeconfig(ctx context.Context, args Arguments) (createKubeconfigResu
 			result.contextName = "giantswarm-" + clusterID
 		}
 
+		// edit kubectl config
+		if err := util.KubectlSetCluster(clusterID, result.apiEndpoint, result.caCertPath); err != nil {
+			return result, microerror.Mask(util.CouldNotSetKubectlClusterError)
+		}
+		if err := util.KubectlSetCredentials(clusterID, result.clientKeyPath, result.clientCertPath); err != nil {
+			return result, microerror.Mask(util.CouldNotSetKubectlCredentialsError)
+		}
+		if err := util.KubectlSetContext(result.contextName, clusterID); err != nil {
+			return result, microerror.Mask(util.CouldNotSetKubectlContextError)
+		}
 		if !args.useKubie {
-			// edit kubectl config
-			if err := util.KubectlSetCluster(clusterID, result.apiEndpoint, result.caCertPath); err != nil {
-				return result, microerror.Mask(util.CouldNotSetKubectlClusterError)
-			}
-			if err := util.KubectlSetCredentials(clusterID, result.clientKeyPath, result.clientCertPath); err != nil {
-				return result, microerror.Mask(util.CouldNotSetKubectlCredentialsError)
-			}
-			if err := util.KubectlSetContext(result.contextName, clusterID); err != nil {
-				return result, microerror.Mask(util.CouldNotSetKubectlContextError)
-			}
 			if err := util.KubectlUseContext(result.contextName); err != nil {
 				return result, microerror.Mask(util.CouldNotUseKubectlContextError)
 			}