Fix(k8s): cluster waiting pool (#1031)

Author: Monitob

scaleway/data_source_k8s_cluster_test.go

@@ -24,15 +24,15 @@ func TestAccScalewayDataSourceK8SCluster_Basic(t *testing.T) {
 						version = "%s"
 						cni     = "cilium"
 					  	tags    = [ "terraform-test", "data_scaleway_k8s_cluster", "basic" ]
-					}`, clusterName, version),
-			},
-			{
-				Config: fmt.Sprintf(`
-					resource "scaleway_k8s_cluster" "main" {
-					  	name 	= "%s"
-						version = "%s"
-						cni     = "cilium"
-					  	tags    = [ "terraform-test", "data_scaleway_k8s_cluster", "basic" ]
+					}
+
+					resource "scaleway_k8s_pool" "default" {
+						name = "default"
+						cluster_id = "${scaleway_k8s_cluster.main.id}"
+						node_type = "gp1_xs"
+						autohealing = true
+						autoscaling = true
+						size = 1
 					}
 					
 					data "scaleway_k8s_cluster" "prod" {

scaleway/helpers_k8s.go

@@ -102,24 +102,22 @@ func k8sGetLatestVersionFromMinor(ctx context.Context, k8sAPI *k8s.API, region s
 	return "", fmt.Errorf("no available upstream version found for %s", version)
 }
 
-func waitK8SCluster(ctx context.Context, k8sAPI *k8s.API, region scw.Region, clusterID string, desiredStates ...k8s.ClusterStatus) error {
-	cluster, err := k8sAPI.WaitForCluster(&k8s.WaitForClusterRequest{
+func waitK8SCluster(ctx context.Context, k8sAPI *k8s.API, region scw.Region, clusterID string) (*k8s.Cluster, error) {
+	return k8sAPI.WaitForCluster(&k8s.WaitForClusterRequest{
 		ClusterID:     clusterID,
 		Region:        region,
 		Timeout:       scw.TimeDurationPtr(K8SClusterWaitForPoolRequiredTimeout),
 		RetryInterval: DefaultWaitRetryInterval,
 	}, scw.WithContext(ctx))
-	if err != nil {
-		return err
-	}
-
-	for _, desiredState := range desiredStates {
-		if cluster.Status == desiredState {
-			return nil
-		}
-	}
+}
 
-	return fmt.Errorf("cluster %s has state %s, wants one of %+q", clusterID, cluster.Status, desiredStates)
+func waitK8SClusterPool(ctx context.Context, k8sAPI *k8s.API, region scw.Region, clusterID string) (*k8s.Cluster, error) {
+	return k8sAPI.WaitForClusterPool(&k8s.WaitForClusterRequest{
+		ClusterID:     clusterID,
+		Region:        region,
+		Timeout:       scw.TimeDurationPtr(K8SClusterWaitForPoolRequiredTimeout),
+		RetryInterval: DefaultWaitRetryInterval,
+	}, scw.WithContext(ctx))
 }
 
 func waitK8SClusterDeleted(ctx context.Context, k8sAPI *k8s.API, region scw.Region, clusterID string) error {
@@ -151,10 +149,10 @@ func waitK8SPoolReady(ctx context.Context, k8sAPI *k8s.API, region scw.Region, p
 		return err
 	}
 
-	if pool.Status == k8s.PoolStatusReady {
-		return nil
+	if pool.Status != k8s.PoolStatusReady {
+		return fmt.Errorf("pool %s has state %s, wants %s", poolID, pool.Status, k8s.PoolStatusReady)
 	}
-	return fmt.Errorf("pool %s has state %s, wants %s", poolID, pool.Status, k8s.PoolStatusReady)
+	return nil
 }
 
 // convert a list of nodes to a list of map

scaleway/resource_k8s_cluster.go

@@ -379,7 +379,7 @@ func resourceScalewayK8SClusterCreate(ctx context.Context, d *schema.ResourceDat
 		return diag.FromErr(err)
 	}
 
-	err = waitK8SCluster(ctx, k8sAPI, region, res.ID, k8s.ClusterStatusReady, k8s.ClusterStatusPoolRequired)
+	res, err = waitK8SClusterPool(ctx, k8sAPI, region, res.ID)
 	if err != nil {
 		return diag.FromErr(err)
 	}
@@ -398,10 +398,7 @@ func resourceScalewayK8SClusterRead(ctx context.Context, d *schema.ResourceData,
 	////
 	// Read Cluster
 	////
-	response, err := k8sAPI.GetCluster(&k8s.GetClusterRequest{
-		Region:    region,
-		ClusterID: clusterID,
-	}, scw.WithContext(ctx))
+	cluster, err := waitK8SCluster(ctx, k8sAPI, region, clusterID)
 	if err != nil {
 		if is404Error(err) {
 			d.SetId("")
@@ -411,26 +408,26 @@ func resourceScalewayK8SClusterRead(ctx context.Context, d *schema.ResourceData,
 	}
 
 	_ = d.Set("region", string(region))
-	_ = d.Set("name", response.Name)
-	_ = d.Set("type", response.Type)
-	_ = d.Set("organization_id", response.OrganizationID)
-	_ = d.Set("project_id", response.ProjectID)
-	_ = d.Set("description", response.Description)
-	_ = d.Set("cni", response.Cni)
-	_ = d.Set("tags", response.Tags)
-	_ = d.Set("apiserver_cert_sans", response.ApiserverCertSans)
-	_ = d.Set("created_at", response.CreatedAt.Format(time.RFC3339))
-	_ = d.Set("updated_at", response.UpdatedAt.Format(time.RFC3339))
-	_ = d.Set("apiserver_url", response.ClusterURL)
-	_ = d.Set("wildcard_dns", response.DNSWildcard)
-	_ = d.Set("status", response.Status.String())
-	_ = d.Set("upgrade_available", response.UpgradeAvailable)
-	_ = d.Set("feature_gates", response.FeatureGates)
-	_ = d.Set("admission_plugins", response.AdmissionPlugins)
+	_ = d.Set("name", cluster.Name)
+	_ = d.Set("type", cluster.Type)
+	_ = d.Set("organization_id", cluster.OrganizationID)
+	_ = d.Set("project_id", cluster.ProjectID)
+	_ = d.Set("description", cluster.Description)
+	_ = d.Set("cni", cluster.Cni)
+	_ = d.Set("tags", cluster.Tags)
+	_ = d.Set("apiserver_cert_sans", cluster.ApiserverCertSans)
+	_ = d.Set("created_at", cluster.CreatedAt.Format(time.RFC3339))
+	_ = d.Set("updated_at", cluster.UpdatedAt.Format(time.RFC3339))
+	_ = d.Set("apiserver_url", cluster.ClusterURL)
+	_ = d.Set("wildcard_dns", cluster.DNSWildcard)
+	_ = d.Set("status", cluster.Status.String())
+	_ = d.Set("upgrade_available", cluster.UpgradeAvailable)
+	_ = d.Set("feature_gates", cluster.FeatureGates)
+	_ = d.Set("admission_plugins", cluster.AdmissionPlugins)
 
 	// if autoupgrade is enabled, we only set the minor k8s version (x.y)
-	version := response.Version
-	if response.AutoUpgrade != nil && response.AutoUpgrade.Enabled {
+	version := cluster.Version
+	if cluster.AutoUpgrade != nil && cluster.AutoUpgrade.Enabled {
 		version, err = k8sGetMinorVersionFromFull(version)
 		if err != nil {
 			return diag.FromErr(err)
@@ -439,9 +436,9 @@ func resourceScalewayK8SClusterRead(ctx context.Context, d *schema.ResourceData,
 	_ = d.Set("version", version)
 
 	// autoscaler_config
-	_ = d.Set("autoscaler_config", clusterAutoscalerConfigFlatten(response))
-	_ = d.Set("open_id_connect_config", clusterOpenIDConnectConfigFlatten(response))
-	_ = d.Set("auto_upgrade", clusterAutoUpgradeFlatten(response))
+	_ = d.Set("autoscaler_config", clusterAutoscalerConfigFlatten(cluster))
+	_ = d.Set("open_id_connect_config", clusterOpenIDConnectConfigFlatten(cluster))
+	_ = d.Set("auto_upgrade", clusterAutoUpgradeFlatten(cluster))
 
 	////
 	// Read kubeconfig
@@ -653,7 +650,7 @@ func resourceScalewayK8SClusterUpdate(ctx context.Context, d *schema.ResourceDat
 		return diag.FromErr(err)
 	}
 
-	err = waitK8SCluster(ctx, k8sAPI, region, clusterID, k8s.ClusterStatusReady, k8s.ClusterStatusPoolRequired)
+	_, err = waitK8SCluster(ctx, k8sAPI, region, clusterID)
 	if err != nil {
 		return diag.FromErr(err)
 	}
@@ -673,7 +670,7 @@ func resourceScalewayK8SClusterUpdate(ctx context.Context, d *schema.ResourceDat
 			return diag.FromErr(err)
 		}
 
-		err = waitK8SCluster(ctx, k8sAPI, region, clusterID, k8s.ClusterStatusReady, k8s.ClusterStatusPoolRequired)
+		_, err = waitK8SCluster(ctx, k8sAPI, region, clusterID)
 		if err != nil {
 			return diag.FromErr(err)
 		}

scaleway/resource_k8s_cluster_test.go

@@ -282,7 +282,7 @@ func TestAccScalewayK8SCluster_OIDC(t *testing.T) {
 					testAccCheckScalewayK8SClusterExists(tt, "scaleway_k8s_cluster.oidc"),
 					resource.TestCheckResourceAttr("scaleway_k8s_cluster.oidc", "version", latestK8SVersion),
 					resource.TestCheckResourceAttr("scaleway_k8s_cluster.oidc", "cni", "cilium"),
-					resource.TestCheckResourceAttr("scaleway_k8s_cluster.oidc", "status", k8s.ClusterStatusPoolRequired.String()),
+					resource.TestCheckResourceAttr("scaleway_k8s_cluster.oidc", "status", k8s.ClusterStatusReady.String()),
 					resource.TestCheckResourceAttrSet("scaleway_k8s_cluster.oidc", "kubeconfig.0.config_file"),
 					resource.TestCheckResourceAttrSet("scaleway_k8s_cluster.oidc", "kubeconfig.0.host"),
 					resource.TestCheckResourceAttrSet("scaleway_k8s_cluster.oidc", "kubeconfig.0.cluster_ca_certificate"),
@@ -454,6 +454,7 @@ resource "scaleway_k8s_cluster" "autoscaler" {
 	cni = "calico"
 	version = "%s"
 	name = "autoscaler-01"
+	region = "nl-ams"
 	autoscaler_config {
 		disable_scale_down = true
 		scale_down_delay_after_add = "20m"
@@ -476,6 +477,7 @@ resource "scaleway_k8s_cluster" "autoscaler" {
 	cni = "calico"
 	version = "%s"
 	name = "autoscaler-02"
+	region = "nl-ams"
 	autoscaler_config {
 		disable_scale_down = false
 		scale_down_delay_after_add = "20m"
@@ -504,7 +506,18 @@ resource "scaleway_k8s_cluster" "oidc" {
 		groups_prefix = "pouf"
 	}
 	tags = [ "terraform-test", "scaleway_k8s_cluster", "oidc-config" ]
-}`, version)
+}
+
+resource "scaleway_k8s_pool" "minimal" {
+    name = "minimal"
+	cluster_id = "${scaleway_k8s_cluster.oidc.id}"
+	node_type = "gp1_xs"
+	autohealing = true
+	autoscaling = true
+	size = 1
+	tags = [ "terraform-test", "scaleway_k8s_cluster", "minimal" ]
+}
+`, version)
 }
 
 func testAccCheckScalewayK8SClusterConfigOIDCChange(version string) string {
@@ -521,7 +534,18 @@ resource "scaleway_k8s_cluster" "oidc" {
 		username_prefix = "boo"
 	}
 	tags = [ "terraform-test", "scaleway_k8s_cluster", "oidc-config" ]
-}`, version)
+}
+
+resource "scaleway_k8s_pool" "oidc" {
+    name = "minimal"
+	cluster_id = "${scaleway_k8s_cluster.oidc.id}"
+	node_type = "gp1_xs"
+	autohealing = true
+	autoscaling = true
+	size = 1
+	tags = [ "terraform-test", "scaleway_k8s_cluster", "minimal" ]
+}
+`, version)
 }
 
 func testAccCheckScalewayK8SClusterAutoUpgrade(enable bool, day string, hour uint64, version string) string {

scaleway/resource_k8s_pool.go

@@ -264,7 +264,7 @@ func resourceScalewayK8SPoolCreate(ctx context.Context, d *schema.ResourceData,
 	if cluster.Status == k8s.ClusterStatusPoolRequired {
 		waitForCluster = true
 	} else if cluster.Status == k8s.ClusterStatusCreating {
-		err = waitK8SCluster(ctx, k8sAPI, region, cluster.ID, k8s.ClusterStatusReady)
+		_, err = waitK8SCluster(ctx, k8sAPI, region, cluster.ID)
 		if err != nil {
 			return diag.FromErr(err)
 		}
@@ -278,7 +278,7 @@ func resourceScalewayK8SPoolCreate(ctx context.Context, d *schema.ResourceData,
 	d.SetId(newRegionalIDString(region, res.ID))
 
 	if waitForCluster {
-		err = waitK8SCluster(ctx, k8sAPI, region, cluster.ID, k8s.ClusterStatusReady)
+		_, err = waitK8SCluster(ctx, k8sAPI, region, cluster.ID)
 		if err != nil {
 			return diag.FromErr(err)
 		}