Skip to content

Commit 500f4bd

Browse files
primoz-hrovatprimoz-hrovat
authored
Merge branch 'master' into feat/autoscaler-import
2 parents 7985465 + 49f5548 commit 500f4bd

File tree

3 files changed

+70
-76
lines changed

3 files changed

+70
-76
lines changed

‎castai/resource_aks_cluster_test.go‎

Lines changed: 42 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -416,7 +416,8 @@ func TestAKSClusterResourceUpdateContext(t *testing.T) {
416416

417417
func TestAccAKS_ResourceAKSCluster(t *testing.T) {
418418
rName := fmt.Sprintf("%v-aks-%v", ResourcePrefix, acctest.RandString(8))
419-
resourceName := "castai_aks_cluster.test"
419+
clusterResourceName := "castai_aks_cluster.test"
420+
resourceName := "castai_node_configuration.test"
420421
clusterName := "core-tf-acc"
421422
resourceGroupName := "core-tf-acc"
422423
nodeResourceGroupName := "core-tf-acc-ng"
@@ -431,10 +432,46 @@ func TestAccAKS_ResourceAKSCluster(t *testing.T) {
431432
{
432433
Config: testAccAKSClusterConfig(rName, clusterName, resourceGroupName, nodeResourceGroupName),
433434
Check: resource.ComposeTestCheckFunc(
434-
resource.TestCheckResourceAttr(resourceName, "name", clusterName),
435-
resource.TestCheckResourceAttrSet(resourceName, "credentials_id"),
436-
resource.TestCheckResourceAttr(resourceName, "region", "westeurope"),
437-
resource.TestCheckResourceAttrSet(resourceName, "cluster_token"),
435+
resource.TestCheckResourceAttr(clusterResourceName, "name", clusterName),
436+
resource.TestCheckResourceAttrSet(clusterResourceName, "credentials_id"),
437+
resource.TestCheckResourceAttr(clusterResourceName, "region", "westeurope"),
438+
resource.TestCheckResourceAttrSet(clusterResourceName, "cluster_token"),
439+
),
440+
},
441+
{
442+
Config: testAccAKSNodeConfigurationConfig(rName, clusterName, resourceGroupName, nodeResourceGroupName),
443+
Check: resource.ComposeTestCheckFunc(
444+
resource.TestCheckResourceAttr(resourceName, "name", rName),
445+
resource.TestCheckResourceAttr(resourceName, "disk_cpu_ratio", "35"),
446+
resource.TestCheckResourceAttr(resourceName, "min_disk_size", "122"),
447+
resource.TestCheckResourceAttr(resourceName, "aks.0.max_pods_per_node", "31"),
448+
resource.TestCheckResourceAttr(resourceName, "aks.0.aks_image_family", "ubuntu"),
449+
resource.TestCheckResourceAttr(resourceName, "eks.#", "0"),
450+
resource.TestCheckResourceAttr(resourceName, "kops.#", "0"),
451+
resource.TestCheckResourceAttr(resourceName, "gke.#", "0"),
452+
),
453+
},
454+
{
455+
Config: testAccAKSNodeConfigurationUpdated(rName, clusterName, resourceGroupName, nodeResourceGroupName),
456+
Check: resource.ComposeTestCheckFunc(
457+
resource.TestCheckResourceAttr(resourceName, "name", rName),
458+
resource.TestCheckResourceAttr(resourceName, "disk_cpu_ratio", "0"),
459+
resource.TestCheckResourceAttr(resourceName, "min_disk_size", "121"),
460+
resource.TestCheckResourceAttr(resourceName, "aks.0.max_pods_per_node", "32"),
461+
resource.TestCheckResourceAttr(resourceName, "aks.0.aks_image_family", "azure-linux"),
462+
resource.TestCheckResourceAttr(resourceName, "aks.0.ephemeral_os_disk.0.placement", "cacheDisk"),
463+
resource.TestCheckResourceAttr(resourceName, "aks.0.ephemeral_os_disk.0.cache", "ReadOnly"),
464+
resource.TestCheckResourceAttr(resourceName, "aks.0.loadbalancers.0.name", "test-lb"),
465+
resource.TestCheckResourceAttr(resourceName, "aks.0.loadbalancers.0.ip_based_backend_pools.0.name", "test"),
466+
resource.TestCheckResourceAttr(resourceName, "aks.0.network_security_group", "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg/providers/Microsoft.Network/networkSecurityGroups/test-nsg"),
467+
resource.TestCheckResourceAttr(resourceName, "aks.0.application_security_groups.0", "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg/providers/Microsoft.Network/applicationSecurityGroups/test-asg"),
468+
resource.TestCheckResourceAttr(resourceName, "aks.0.public_ip.0.public_ip_prefix", "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg/providers/Microsoft.Network/publicIPAddresses/test-ip"),
469+
resource.TestCheckResourceAttr(resourceName, "aks.0.public_ip.0.tags.FirstPartyUsage", "something"),
470+
resource.TestCheckResourceAttr(resourceName, "aks.0.public_ip.0.idle_timeout_in_minutes", "10"),
471+
resource.TestCheckResourceAttrSet(resourceName, "aks.0.pod_subnet_id"),
472+
resource.TestCheckResourceAttr(resourceName, "eks.#", "0"),
473+
resource.TestCheckResourceAttr(resourceName, "kops.#", "0"),
474+
resource.TestCheckResourceAttr(resourceName, "gke.#", "0"),
438475
),
439476
},
440477
},

‎castai/resource_node_configuration_aks_test.go‎

Lines changed: 0 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -2,76 +2,8 @@ package castai
22

33
import (
44
"fmt"
5-
"testing"
6-
7-
"github.com/hashicorp/terraform-plugin-sdk/v2/helper/acctest"
8-
"github.com/hashicorp/terraform-plugin-testing/helper/resource"
95
)
106

11-
func TestAccAKS_ResourceNodeConfiguration(t *testing.T) {
12-
rName := fmt.Sprintf("%v-node-cfg-aks-%v", ResourcePrefix, acctest.RandString(8))
13-
resourceName := "castai_node_configuration.test"
14-
clusterName := "core-tf-acc"
15-
resourceGroupName := "core-tf-acc"
16-
nodeResourceGroupName := "core-tf-acc-ng"
17-
18-
resource.Test(t, resource.TestCase{
19-
PreCheck: func() { testAccPreCheck(t) },
20-
ProviderFactories: providerFactories,
21-
// Destroy of the cluster is not working properly. Cluster wasn't full onboarded and it's getting destroyed.
22-
// https://castai.atlassian.net/browse/CORE-2868 should solve the issue
23-
//CheckDestroy: testAccCheckAKSClusterDestroy,
24-
Steps: []resource.TestStep{
25-
{
26-
Config: testAccAKSNodeConfigurationConfig(rName, clusterName, resourceGroupName, nodeResourceGroupName),
27-
Check: resource.ComposeTestCheckFunc(
28-
resource.TestCheckResourceAttr(resourceName, "name", rName),
29-
resource.TestCheckResourceAttr(resourceName, "disk_cpu_ratio", "35"),
30-
resource.TestCheckResourceAttr(resourceName, "min_disk_size", "122"),
31-
resource.TestCheckResourceAttr(resourceName, "aks.0.max_pods_per_node", "31"),
32-
resource.TestCheckResourceAttr(resourceName, "aks.0.aks_image_family", "ubuntu"),
33-
resource.TestCheckResourceAttr(resourceName, "eks.#", "0"),
34-
resource.TestCheckResourceAttr(resourceName, "kops.#", "0"),
35-
resource.TestCheckResourceAttr(resourceName, "gke.#", "0"),
36-
),
37-
},
38-
{
39-
Config: testAccAKSNodeConfigurationUpdated(rName, clusterName, resourceGroupName, nodeResourceGroupName),
40-
Check: resource.ComposeTestCheckFunc(
41-
resource.TestCheckResourceAttr(resourceName, "name", rName),
42-
resource.TestCheckResourceAttr(resourceName, "disk_cpu_ratio", "0"),
43-
resource.TestCheckResourceAttr(resourceName, "min_disk_size", "121"),
44-
resource.TestCheckResourceAttr(resourceName, "aks.0.max_pods_per_node", "32"),
45-
resource.TestCheckResourceAttr(resourceName, "aks.0.aks_image_family", "azure-linux"),
46-
resource.TestCheckResourceAttr(resourceName, "aks.0.ephemeral_os_disk.0.placement", "cacheDisk"),
47-
resource.TestCheckResourceAttr(resourceName, "aks.0.ephemeral_os_disk.0.cache", "ReadOnly"),
48-
resource.TestCheckResourceAttr(resourceName, "aks.0.loadbalancers.0.name", "test-lb"),
49-
resource.TestCheckResourceAttr(resourceName, "aks.0.loadbalancers.0.ip_based_backend_pools.0.name", "test"),
50-
resource.TestCheckResourceAttr(resourceName, "aks.0.network_security_group", "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg/providers/Microsoft.Network/networkSecurityGroups/test-nsg"),
51-
resource.TestCheckResourceAttr(resourceName, "aks.0.application_security_groups.0", "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg/providers/Microsoft.Network/applicationSecurityGroups/test-asg"),
52-
resource.TestCheckResourceAttr(resourceName, "aks.0.public_ip.0.public_ip_prefix", "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/rg/providers/Microsoft.Network/publicIPAddresses/test-ip"),
53-
resource.TestCheckResourceAttr(resourceName, "aks.0.public_ip.0.tags.FirstPartyUsage", "something"),
54-
resource.TestCheckResourceAttr(resourceName, "aks.0.public_ip.0.idle_timeout_in_minutes", "10"),
55-
resource.TestCheckResourceAttrSet(resourceName, "aks.0.pod_subnet_id"),
56-
resource.TestCheckResourceAttr(resourceName, "eks.#", "0"),
57-
resource.TestCheckResourceAttr(resourceName, "kops.#", "0"),
58-
resource.TestCheckResourceAttr(resourceName, "gke.#", "0"),
59-
),
60-
},
61-
},
62-
ExternalProviders: map[string]resource.ExternalProvider{
63-
"azurerm": {
64-
Source: "hashicorp/azurerm",
65-
VersionConstraint: "~> 3.7.0",
66-
},
67-
"azuread": {
68-
Source: "hashicorp/azuread",
69-
VersionConstraint: "~> 2.22.0",
70-
},
71-
},
72-
})
73-
}
74-
757
func testAccAKSNodeConfigurationConfig(rName, clusterName, rgName, ngName string) string {
768
return ConfigCompose(testAccAKSClusterConfig(rName, clusterName, rgName, ngName), fmt.Sprintf(`
779
resource "castai_node_configuration" "test" {

‎castai/sdk/api.gen.go‎

Lines changed: 28 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)