Skip to content

Commit 8f36555

Browse files
authored
fix(k8s): fix precondition failed in nightly tests (#2301)
1 parent 4fc85ac commit 8f36555

17 files changed

+11197
-10833
lines changed

scaleway/resource_k8s_cluster.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -490,7 +490,7 @@ func resourceScalewayK8SClusterCreate(ctx context.Context, d *schema.ResourceDat
490490
}
491491

492492
d.SetId(newRegionalIDString(region, res.ID))
493-
if clusterType.(string) == "multicloud" {
493+
if strings.Contains(clusterType.(string), "multicloud") {
494494
// In case of multi-cloud, we do not have the guarantee that a pool will be created in Scaleway.
495495
_, err = waitK8SCluster(ctx, k8sAPI, region, res.ID, d.Timeout(schema.TimeoutCreate))
496496
} else {
@@ -610,7 +610,8 @@ func resourceScalewayK8SClusterUpdate(ctx context.Context, d *schema.ResourceDat
610610
if err != nil {
611611
return diag.FromErr(err)
612612
}
613-
_, err = waitK8SCluster(ctx, k8sAPI, region, clusterID, defaultK8SClusterTimeout)
613+
// We have to wait for the pools to reach a stable state too (e.g. being detached from the private network)
614+
_, err = waitK8SClusterPool(ctx, k8sAPI, region, clusterID, defaultK8SClusterTimeout)
614615
if err != nil {
615616
return diag.FromErr(err)
616617
}

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

Lines changed: 1038 additions & 510 deletions
Large diffs are not rendered by default.

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

Lines changed: 441 additions & 540 deletions
Large diffs are not rendered by default.

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

Lines changed: 147 additions & 147 deletions
Large diffs are not rendered by default.

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

Lines changed: 164 additions & 197 deletions
Large diffs are not rendered by default.

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

Lines changed: 524 additions & 557 deletions
Large diffs are not rendered by default.

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

Lines changed: 147 additions & 147 deletions
Large diffs are not rendered by default.

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

Lines changed: 992 additions & 827 deletions
Large diffs are not rendered by default.

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

Lines changed: 887 additions & 491 deletions
Large diffs are not rendered by default.

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

Lines changed: 1307 additions & 1505 deletions
Large diffs are not rendered by default.

scaleway/testdata/k8s-cluster-pool-public-ip-disabled.cassette.yaml

Lines changed: 998 additions & 1922 deletions
Large diffs are not rendered by default.

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

Lines changed: 582 additions & 483 deletions
Large diffs are not rendered by default.

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

Lines changed: 737 additions & 506 deletions
Large diffs are not rendered by default.

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

Lines changed: 1101 additions & 1200 deletions
Large diffs are not rendered by default.

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

Lines changed: 827 additions & 431 deletions
Large diffs are not rendered by default.

scaleway/testdata/k8s-cluster-private-network.cassette.yaml

Lines changed: 201 additions & 201 deletions
Large diffs are not rendered by default.

scaleway/testdata/k8s-cluster-type-change.cassette.yaml

Lines changed: 1101 additions & 1167 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)