fix(k8s): avoid concurrency when creating pools

Author: Mia-Cross

scaleway/helpers_k8s.go

@@ -105,24 +105,27 @@ func waitK8SClusterPool(ctx context.Context, k8sAPI *k8s.API, region scw.Region,
 	}, scw.WithContext(ctx))
 }
 
-func waitK8SClusterDeleted(ctx context.Context, k8sAPI *k8s.API, region scw.Region, clusterID string, timeout time.Duration) error {
+func waitK8SClusterStatus(ctx context.Context, k8sAPI *k8s.API, cluster *k8s.Cluster, status k8s.ClusterStatus, timeout time.Duration) (*k8s.Cluster, error) {
 	retryInterval := defaultK8SRetryInterval
 	if DefaultWaitRetryInterval != nil {
 		retryInterval = *DefaultWaitRetryInterval
 	}
 
-	_, err := k8sAPI.WaitForCluster(&k8s.WaitForClusterRequest{
-		ClusterID:     clusterID,
-		Region:        region,
-		Status:        k8s.ClusterStatusDeleted,
+	cluster, err := k8sAPI.WaitForCluster(&k8s.WaitForClusterRequest{
+		ClusterID:     cluster.ID,
+		Region:        cluster.Region,
+		Status:        status,
 		Timeout:       scw.TimeDurationPtr(timeout),
 		RetryInterval: &retryInterval,
 	}, scw.WithContext(ctx))
-	if err != nil && !is404Error(err) {
-		return err
+	if err != nil {
+		if status == k8s.ClusterStatusDeleted && is404Error(err) {
+			return cluster, nil
+		}
+		return cluster, err
 	}
 
-	return nil
+	return cluster, nil
 }
 
 func waitK8SPoolReady(ctx context.Context, k8sAPI *k8s.API, region scw.Region, poolID string, timeout time.Duration) (*k8s.Pool, error) {

scaleway/resource_k8s_cluster.go

@@ -871,7 +871,7 @@ func resourceScalewayK8SClusterDelete(ctx context.Context, d *schema.ResourceDat
 	////
 	// Delete Cluster
 	////
-	_, err = k8sAPI.DeleteCluster(&k8s.DeleteClusterRequest{
+	cluster, err := k8sAPI.DeleteCluster(&k8s.DeleteClusterRequest{
 		Region:                  region,
 		ClusterID:               clusterID,
 		WithAdditionalResources: deleteAdditionalResources,
@@ -883,7 +883,7 @@ func resourceScalewayK8SClusterDelete(ctx context.Context, d *schema.ResourceDat
 		return diag.FromErr(err)
 	}
 
-	err = waitK8SClusterDeleted(ctx, k8sAPI, region, clusterID, d.Timeout(schema.TimeoutDelete))
+	_, err = waitK8SClusterStatus(ctx, k8sAPI, cluster, k8s.ClusterStatusDeleted, d.Timeout(schema.TimeoutDelete))
 	if err != nil {
 		return diag.FromErr(err)
 	}

scaleway/resource_k8s_pool.go

@@ -305,12 +305,8 @@ func resourceScalewayK8SPoolCreate(ctx context.Context, d *schema.ResourceData,
 		return diag.FromErr(err)
 	}
 
-	waitForCluster := false
-
-	if cluster.Status == k8s.ClusterStatusPoolRequired {
-		waitForCluster = true
-	} else if cluster.Status == k8s.ClusterStatusCreating {
-		_, err = waitK8SCluster(ctx, k8sAPI, region, cluster.ID, d.Timeout(schema.TimeoutCreate))
+	if cluster.Status == k8s.ClusterStatusCreating {
+		_, err = waitK8SClusterStatus(ctx, k8sAPI, cluster, k8s.ClusterStatusReady, d.Timeout(schema.TimeoutCreate))
 		if err != nil {
 			return diag.FromErr(err)
 		}
@@ -330,11 +326,9 @@ func resourceScalewayK8SPoolCreate(ctx context.Context, d *schema.ResourceData,
 		}
 	}
 
-	if waitForCluster {
-		_, err = waitK8SCluster(ctx, k8sAPI, region, cluster.ID, d.Timeout(schema.TimeoutCreate))
-		if err != nil {
-			return diag.FromErr(err)
-		}
+	_, err = waitK8SCluster(ctx, k8sAPI, region, cluster.ID, d.Timeout(schema.TimeoutCreate))
+	if err != nil {
+		return diag.FromErr(err)
 	}
 
 	return resourceScalewayK8SPoolRead(ctx, d, meta)