Skip to content

Commit 7c146cc

Browse files
authored
Fix(k8s): set waiting pool ready as mandatory (#1045)
1 parent 762337a commit 7c146cc

14 files changed

+26964
-5066
lines changed

scaleway/helpers_k8s.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ const (
4242
defaultK8SPoolTimeout = 10 * time.Minute
4343
K8SClusterWaitForPoolRequiredTimeout = 10 * time.Minute
4444
K8SClusterWaitForDeletedTimeout = 10 * time.Minute
45-
K8SPoolWaitForReadyTimeout = 10 * time.Minute
45+
K8SPoolWaitForReadyTimeout = 15 * time.Minute
4646
)
4747

4848
func k8sAPIWithRegion(d *schema.ResourceData, m interface{}) (*k8s.API, scw.Region, error) {

scaleway/resource_k8s_pool.go

+5-5
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ func resourceScalewayK8SPool() *schema.Resource {
9696
"wait_for_pool_ready": {
9797
Type: schema.TypeBool,
9898
Optional: true,
99-
Default: false,
99+
Default: true,
100100
Description: "Whether to wait for the pool to be ready",
101101
},
102102
"placement_group_id": {
@@ -277,15 +277,15 @@ func resourceScalewayK8SPoolCreate(ctx context.Context, d *schema.ResourceData,
277277

278278
d.SetId(newRegionalIDString(region, res.ID))
279279

280-
if waitForCluster {
281-
_, err = waitK8SCluster(ctx, k8sAPI, region, cluster.ID)
280+
if d.Get("wait_for_pool_ready").(bool) { // wait for the pool to be ready if specified (including all its nodes)
281+
err = waitK8SPoolReady(ctx, k8sAPI, region, res.ID)
282282
if err != nil {
283283
return diag.FromErr(err)
284284
}
285285
}
286286

287-
if d.Get("wait_for_pool_ready").(bool) { // wait for the pool to be ready if specified (including all its nodes)
288-
err = waitK8SPoolReady(ctx, k8sAPI, region, res.ID)
287+
if waitForCluster {
288+
_, err = waitK8SCluster(ctx, k8sAPI, region, cluster.ID)
289289
if err != nil {
290290
return diag.FromErr(err)
291291
}

scaleway/testdata/data-source-k8s-cluster-basic.cassette.yaml

+3,332-329
Large diffs are not rendered by default.

scaleway/testdata/data-source-k8s-pool-basic.cassette.yaml

+4,426-368
Large diffs are not rendered by default.

scaleway/testdata/k8s-cluster-auto-upgrade.cassette.yaml

+368-368
Large diffs are not rendered by default.

scaleway/testdata/k8s-cluster-autoscaling.cassette.yaml

+145-112
Large diffs are not rendered by default.

scaleway/testdata/k8s-cluster-basic.cassette.yaml

+147-481
Large diffs are not rendered by default.

scaleway/testdata/k8s-cluster-oidc.cassette.yaml

+2,036-716
Large diffs are not rendered by default.

scaleway/testdata/k8s-cluster-pool-basic.cassette.yaml

+3,819-322
Large diffs are not rendered by default.

scaleway/testdata/k8s-cluster-pool-kubelet-args.cassette.yaml

+2,455-278
Large diffs are not rendered by default.

scaleway/testdata/k8s-cluster-pool-placement-group.cassette.yaml

+2,509-298
Large diffs are not rendered by default.

scaleway/testdata/k8s-cluster-pool-upgrade-policy.cassette.yaml

+2,824-284
Large diffs are not rendered by default.

scaleway/testdata/k8s-cluster-pool-wait.cassette.yaml

+3,004-1,293
Large diffs are not rendered by default.

scaleway/testdata/k8s-cluster-pool-zone.cassette.yaml

+1,893-211
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)