Skip to content

Commit e8ab5f7

Browse files
fix(k8s): set PNID to empty string in read if no PN (#2077)
* fix(k8s): set PNID to empty string in read if no PN * Update scaleway/resource_k8s_cluster.go Co-authored-by: Nathanael Demacon <[email protected]> --------- Co-authored-by: Nathanael Demacon <[email protected]> Co-authored-by: Nathanael Demacon <[email protected]>
1 parent 1c6fedb commit e8ab5f7

17 files changed

+6737
-18232
lines changed

scaleway/resource_k8s_cluster.go

+1-3
Original file line numberDiff line numberDiff line change
@@ -520,9 +520,7 @@ func resourceScalewayK8SClusterRead(ctx context.Context, d *schema.ResourceData,
520520
_ = d.Set("auto_upgrade", clusterAutoUpgradeFlatten(cluster))
521521

522522
// private_network
523-
if cluster.PrivateNetworkID != nil {
524-
_ = d.Set("private_network_id", cluster.PrivateNetworkID)
525-
}
523+
_ = d.Set("private_network_id", flattenStringPtr(cluster.PrivateNetworkID))
526524

527525
////
528526
// Read kubeconfig

scaleway/resource_k8s_cluster_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -403,7 +403,7 @@ func TestAccScalewayK8SCluster_PrivateNetwork(t *testing.T) {
403403
Check: resource.ComposeTestCheckFunc(
404404
testAccCheckScalewayK8SClusterExists(tt, "scaleway_k8s_cluster.private_network"),
405405
testAccCheckScalewayVPCPrivateNetworkExists(tt, "scaleway_vpc_private_network.private_network"),
406-
resource.TestCheckNoResourceAttr("scaleway_k8s_cluster.private_network", "private_network_id"),
406+
resource.TestCheckResourceAttr("scaleway_k8s_cluster.private_network", "private_network_id", ""),
407407
),
408408
},
409409
{

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

+462-1,649
Large diffs are not rendered by default.

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

+425-2,331
Large diffs are not rendered by default.

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

+110-109
Large diffs are not rendered by default.

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

+143-207
Large diffs are not rendered by default.

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

+278-739
Large diffs are not rendered by default.

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

+112-1,068
Large diffs are not rendered by default.

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

+548-1,042
Large diffs are not rendered by default.

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

+382-2,328
Large diffs are not rendered by default.

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

+1,173-1,073
Large diffs are not rendered by default.

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

+882-485
Large diffs are not rendered by default.

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

+405-1,888
Large diffs are not rendered by default.

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

+356-1,510
Large diffs are not rendered by default.

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

+870-2,057
Large diffs are not rendered by default.

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

+306-1,460
Large diffs are not rendered by default.

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

+283-282
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)