Merge pull request #385 from shapeblue/fix-cks-sync-normal-user

k8s-ci-robot · web-flow · commit 3ae856f414dd · 2024-07-03T03:16:36.000-07:00
Fix cks cluster sync for a normal user
diff --git a/pkg/cloud/cks_cluster.go b/pkg/cloud/cks_cluster.go
@@ -74,10 +74,11 @@ func (c *client) GetOrCreateCksCluster(cluster *clusterv1.Cluster, csCluster *in
 		if accountName == "" {
 			userParams := c.cs.User.NewGetUserParams(c.config.APIKey)
 			user, err := c.cs.User.GetUser(userParams)
-			if err != nil {
+			if err != nil && !strings.Contains(err.Error(), "does not exist or is not available for the account") {
 				return err
+			} else if err == nil {
+				accountName = user.Account
 			}
-			accountName = user.Account
 		}
 		// NewCreateKubernetesClusterParams(description string, kubernetesversionid string, name string, serviceofferingid string, size int64, zoneid string) *CreateKubernetesClusterParams
 		params := c.cs.Kubernetes.NewCreateKubernetesClusterParams(fmt.Sprintf("%s managed by CAPC", clusterName), "", clusterName, "", 0, fd.Zone.ID)

Original file line number	Diff line number	Diff line change
`@@ -74,10 +74,11 @@ func (c client) GetOrCreateCksCluster(cluster clusterv1.Cluster, csCluster *in`
`74`	`74`	`if accountName == "" {`
`75`	`75`	`userParams := c.cs.User.NewGetUserParams(c.config.APIKey)`
`76`	`76`	`user, err := c.cs.User.GetUser(userParams)`
`77`		`- if err != nil {`
	`77`	`+ if err != nil && !strings.Contains(err.Error(), "does not exist or is not available for the account") {`
`78`	`78`	`return err`
	`79`	`+ } else if err == nil {`
	`80`	`+ accountName = user.Account`
`79`	`81`	`}`
`80`		`- accountName = user.Account`
`81`	`82`	`}`
`82`	`83`	`// NewCreateKubernetesClusterParams(description string, kubernetesversionid string, name string, serviceofferingid string, size int64, zoneid string) *CreateKubernetesClusterParams`
`83`	`84`	`params := c.cs.Kubernetes.NewCreateKubernetesClusterParams(fmt.Sprintf("%s managed by CAPC", clusterName), "", clusterName, "", 0, fd.Zone.ID)`