Skip to content

Commit

Permalink
test(k8s): fix naming + pn error in nightly tests (#2511)
Browse files Browse the repository at this point in the history
* rename pool tests

* set delete_additional_resources to false in all tests

* cassettes

* cassettes

* fix 500 errors
  • Loading branch information
Mia-Cross authored Apr 9, 2024
1 parent 88f8643 commit b565b53
Show file tree
Hide file tree
Showing 31 changed files with 126,254 additions and 82,003 deletions.
2 changes: 1 addition & 1 deletion internal/services/k8s/cluster_data_source_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ func TestAccDataSourceCluster_Basic(t *testing.T) {
version = "%s"
cni = "cilium"
tags = [ "terraform-test", "data_scaleway_k8s_cluster", "basic" ]
delete_additional_resources = true
delete_additional_resources = false
private_network_id = scaleway_vpc_private_network.main.id
}
Expand Down
14 changes: 7 additions & 7 deletions internal/services/k8s/cluster_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -610,7 +610,7 @@ resource "scaleway_k8s_cluster" "minimal" {
version = "%s"
name = "test-minimal"
tags = [ "terraform-test", "scaleway_k8s_cluster", "minimal" ]
delete_additional_resources = true
delete_additional_resources = false
private_network_id = scaleway_vpc_private_network.minimal.id
}`, version)
}
Expand Down Expand Up @@ -639,7 +639,7 @@ resource "scaleway_k8s_cluster" "autoscaler" {
max_graceful_termination_sec = 1337
}
tags = [ "terraform-test", "scaleway_k8s_cluster", "autoscaler-config" ]
delete_additional_resources = true
delete_additional_resources = false
private_network_id = scaleway_vpc_private_network.autoscaler.id
}`, version)
}
Expand All @@ -666,7 +666,7 @@ resource "scaleway_k8s_cluster" "autoscaler" {
max_graceful_termination_sec = 2664
}
tags = [ "terraform-test", "scaleway_k8s_cluster", "autoscaler-config" ]
delete_additional_resources = true
delete_additional_resources = false
private_network_id = scaleway_vpc_private_network.autoscaler.id
}`, version)
}
Expand All @@ -688,7 +688,7 @@ resource "scaleway_k8s_cluster" "oidc" {
groups_prefix = "pouf"
}
tags = [ "terraform-test", "scaleway_k8s_cluster", "oidc-config" ]
delete_additional_resources = true
delete_additional_resources = false
private_network_id = scaleway_vpc_private_network.oidc.id
}
`, version)
Expand All @@ -711,7 +711,7 @@ resource "scaleway_k8s_cluster" "oidc" {
username_prefix = "boo"
}
tags = [ "terraform-test", "scaleway_k8s_cluster", "oidc-config" ]
delete_additional_resources = true
delete_additional_resources = false
private_network_id = scaleway_vpc_private_network.oidc.id
}
`, version)
Expand All @@ -732,7 +732,7 @@ resource "scaleway_k8s_cluster" "auto_upgrade" {
maintenance_window_day = "%s"
}
tags = [ "terraform-test", "scaleway_k8s_cluster", "auto_upgrade" ]
delete_additional_resources = true
delete_additional_resources = false
private_network_id = scaleway_vpc_private_network.auto_upgrade.id
}`, version, enable, hour, day)
}
Expand Down Expand Up @@ -779,7 +779,7 @@ resource "scaleway_k8s_cluster" "multicloud" {
version = "%s"
cni = "kilo"
type = "multicloud"
delete_additional_resources = true
delete_additional_resources = false
}
resource "scaleway_k8s_pool" "multicloud" {
Expand Down
4 changes: 2 additions & 2 deletions internal/services/k8s/pool_data_source_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ func TestAccDataSourcePool_Basic(t *testing.T) {
version = "%s"
cni = "cilium"
tags = [ "terraform-test", "data_scaleway_k8s_pool", "basic" ]
delete_additional_resources = true
delete_additional_resources = false
private_network_id = scaleway_vpc_private_network.main.id
}
Expand All @@ -58,7 +58,7 @@ func TestAccDataSourcePool_Basic(t *testing.T) {
version = "%s"
cni = "cilium"
tags = [ "terraform-test", "data_scaleway_k8s_cluster", "basic" ]
delete_additional_resources = true
delete_additional_resources = false
private_network_id = scaleway_vpc_private_network.main.id
}
Expand Down
40 changes: 20 additions & 20 deletions internal/services/k8s/pool_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
vpcgwchecks "github.com/scaleway/terraform-provider-scaleway/v2/internal/services/vpcgw/testfuncs"
)

func TestAccCluster_PoolBasic(t *testing.T) {
func TestAccPool_Basic(t *testing.T) {
tt := acctest.NewTestTools(t)
defer tt.Cleanup()

Expand Down Expand Up @@ -83,7 +83,7 @@ func TestAccCluster_PoolBasic(t *testing.T) {
})
}

func TestAccCluster_PoolWait(t *testing.T) {
func TestAccPool_Wait(t *testing.T) {
tt := acctest.NewTestTools(t)
defer tt.Cleanup()
latestK8SVersion := testAccK8SClusterGetLatestK8SVersion(tt)
Expand Down Expand Up @@ -162,7 +162,7 @@ func TestAccCluster_PoolWait(t *testing.T) {
})
}

func TestAccCluster_PoolPlacementGroup(t *testing.T) {
func TestAccPool_PlacementGroup(t *testing.T) {
tt := acctest.NewTestTools(t)
defer tt.Cleanup()

Expand Down Expand Up @@ -219,7 +219,7 @@ func TestAccCluster_PoolPlacementGroup(t *testing.T) {
})
}

func TestAccCluster_PoolUpgradePolicy(t *testing.T) {
func TestAccPool_UpgradePolicy(t *testing.T) {
tt := acctest.NewTestTools(t)
defer tt.Cleanup()

Expand Down Expand Up @@ -274,7 +274,7 @@ func TestAccCluster_PoolUpgradePolicy(t *testing.T) {
})
}

func TestAccCluster_PoolKubeletArgs(t *testing.T) {
func TestAccPool_KubeletArgs(t *testing.T) {
tt := acctest.NewTestTools(t)
defer tt.Cleanup()

Expand Down Expand Up @@ -313,7 +313,7 @@ func TestAccCluster_PoolKubeletArgs(t *testing.T) {
})
}

func TestAccCluster_PoolZone(t *testing.T) {
func TestAccPool_Zone(t *testing.T) {
tt := acctest.NewTestTools(t)
defer tt.Cleanup()

Expand Down Expand Up @@ -342,7 +342,7 @@ func TestAccCluster_PoolZone(t *testing.T) {
})
}

func TestAccCluster_PoolSize(t *testing.T) {
func TestAccPool_Size(t *testing.T) {
tt := acctest.NewTestTools(t)
defer tt.Cleanup()

Expand All @@ -366,7 +366,7 @@ func TestAccCluster_PoolSize(t *testing.T) {
name = "test-pool-size"
version = "%s"
cni = "cilium"
delete_additional_resources = true
delete_additional_resources = false
private_network_id = scaleway_vpc_private_network.test-pool-size.id
auto_upgrade {
enable = true
Expand Down Expand Up @@ -394,7 +394,7 @@ func TestAccCluster_PoolSize(t *testing.T) {
name = "test-pool-size"
version = "%s"
cni = "cilium"
delete_additional_resources = true
delete_additional_resources = false
private_network_id = scaleway_vpc_private_network.test-pool-size.id
auto_upgrade {
enable = true
Expand All @@ -419,7 +419,7 @@ func TestAccCluster_PoolSize(t *testing.T) {
})
}

func TestAccCluster_PoolPublicIPDisabled(t *testing.T) {
func TestAccPool_PublicIPDisabled(t *testing.T) {
tt := acctest.NewTestTools(t)
defer tt.Cleanup()

Expand Down Expand Up @@ -449,7 +449,7 @@ func TestAccCluster_PoolPublicIPDisabled(t *testing.T) {
cni = "cilium"
private_network_id = scaleway_vpc_private_network.public_ip.id
tags = [ "terraform-test", "scaleway_k8s_cluster", "public_ip" ]
delete_additional_resources = true
delete_additional_resources = false
depends_on = [scaleway_vpc_private_network.public_ip]
}
Expand Down Expand Up @@ -495,7 +495,7 @@ func TestAccCluster_PoolPublicIPDisabled(t *testing.T) {
cni = "cilium"
private_network_id = scaleway_vpc_private_network.public_ip.id
tags = [ "terraform-test", "scaleway_k8s_cluster", "public_ip" ]
delete_additional_resources = true
delete_additional_resources = false
depends_on = [
scaleway_vpc_private_network.public_ip,
scaleway_vpc_gateway_network.public_ip,
Expand Down Expand Up @@ -740,7 +740,7 @@ resource "scaleway_k8s_cluster" "minimal" {
cni = "calico"
version = "%s"
tags = [ "terraform-test", "scaleway_k8s_cluster", "minimal" ]
delete_additional_resources = true
delete_additional_resources = false
private_network_id = scaleway_vpc_private_network.minimal.id
}
%s`, version, pool)
Expand Down Expand Up @@ -782,7 +782,7 @@ resource "scaleway_k8s_cluster" "minimal" {
cni = "calico"
version = "%s"
tags = [ "terraform-test", "scaleway_k8s_cluster", "minimal" ]
delete_additional_resources = true
delete_additional_resources = false
private_network_id = scaleway_vpc_private_network.minimal.id
}
%s`, version, pool)
Expand Down Expand Up @@ -813,7 +813,7 @@ resource "scaleway_k8s_cluster" "placement_group" {
cni = "calico"
version = "%s"
tags = [ "terraform-test", "scaleway_k8s_cluster", "placement_group" ]
delete_additional_resources = true
delete_additional_resources = false
private_network_id = scaleway_vpc_private_network.placement_group.id
}`, version)
}
Expand Down Expand Up @@ -848,7 +848,7 @@ resource "scaleway_k8s_cluster" "placement_group_2" {
version = "%s"
tags = [ "terraform-test", "scaleway_k8s_cluster", "placement_group" ]
region = "nl-ams"
delete_additional_resources = true
delete_additional_resources = false
private_network_id = scaleway_vpc_private_network.placement_group.id
}`, version)
}
Expand Down Expand Up @@ -879,7 +879,7 @@ resource "scaleway_k8s_cluster" "placement_group_2" {
tags = [ "terraform-test", "scaleway_k8s_cluster", "placement_group" ]
region = "fr-par"
type = "multicloud"
delete_additional_resources = true
delete_additional_resources = false
}`, version)
}

Expand Down Expand Up @@ -908,7 +908,7 @@ resource "scaleway_k8s_cluster" "upgrade_policy" {
cni = "cilium"
version = "%s"
tags = [ "terraform-test", "scaleway_k8s_cluster", "upgrade_policy" ]
delete_additional_resources = true
delete_additional_resources = false
private_network_id = scaleway_vpc_private_network.upgrade_policy.id
}`, maxSurge, maxUnavailable, version)
}
Expand Down Expand Up @@ -937,7 +937,7 @@ resource "scaleway_k8s_cluster" "kubelet_args" {
cni = "cilium"
version = "%s"
tags = [ "terraform-test", "scaleway_k8s_cluster", "kubelet_args" ]
delete_additional_resources = true
delete_additional_resources = false
private_network_id = scaleway_vpc_private_network.kubelet_args.id
}`, maxPods, version)
}
Expand All @@ -964,7 +964,7 @@ resource "scaleway_k8s_cluster" "zone" {
cni = "cilium"
version = "%s"
tags = [ "terraform-test", "scaleway_k8s_cluster", "zone" ]
delete_additional_resources = true
delete_additional_resources = false
private_network_id = scaleway_vpc_private_network.zone.id
}`, zone, version)
}
Expand Down
Loading

0 comments on commit b565b53

Please sign in to comment.