azurerm_kubernetes_cluster - Support in-place update of `network_pr…

…ofile.network_policy`
hashicorp · Jun 1, 2024 · 401111b · 401111b
1 parent 7bd124f
commit 401111b
Show file tree

Hide file tree

Showing 13 changed files with 380 additions and 214 deletions.
diff --git a/internal/services/containers/kubernetes_cluster_addons_resource_test.go b/internal/services/containers/kubernetes_cluster_addons_resource_test.go
@@ -338,6 +338,7 @@ resource "azurerm_kubernetes_cluster" "test" {
   location            = azurerm_resource_group.test.location
   resource_group_name = azurerm_resource_group.test.name
   dns_prefix          = "acctestaks%d"
+  node_resource_group = "${azurerm_resource_group.test.name}-nodes"
 
   linux_profile {
     admin_username = "acctestuser%d"
@@ -350,7 +351,7 @@ resource "azurerm_kubernetes_cluster" "test" {
   default_node_pool {
     name           = "default"
     node_count     = 1
-    vm_size        = "Standard_DS2_v2"
+    vm_size        = "Standard_D2s_v5"
     vnet_subnet_id = azurerm_subnet.test.id
     upgrade_settings {
       max_surge = "10%%"
@@ -402,6 +403,7 @@ resource "azurerm_kubernetes_cluster" "test" {
   location            = azurerm_resource_group.test.location
   resource_group_name = azurerm_resource_group.test.name
   dns_prefix          = "acctestaks%d"
+  node_resource_group = "${azurerm_resource_group.test.name}-nodes"
 
   linux_profile {
     admin_username = "acctestuser%d"
@@ -413,7 +415,7 @@ resource "azurerm_kubernetes_cluster" "test" {
   default_node_pool {
     name           = "default"
     node_count     = 1
-    vm_size        = "Standard_DS2_v2"
+    vm_size        = "Standard_D2s_v5"
     vnet_subnet_id = azurerm_subnet.test.id
     upgrade_settings {
       max_surge = "10%%"
@@ -447,6 +449,7 @@ resource "azurerm_kubernetes_cluster" "test" {
   location            = azurerm_resource_group.test.location
   resource_group_name = azurerm_resource_group.test.name
   dns_prefix          = "acctestaks%d"
+  node_resource_group = "${azurerm_resource_group.test.name}-nodes"
 
   linux_profile {
     admin_username = "acctestuser%d"
@@ -459,7 +462,7 @@ resource "azurerm_kubernetes_cluster" "test" {
   default_node_pool {
     name       = "default"
     node_count = 1
-    vm_size    = "Standard_DS2_v2"
+    vm_size    = "Standard_D2s_v5"
     upgrade_settings {
       max_surge = "10%%"
     }
@@ -510,6 +513,7 @@ resource "azurerm_kubernetes_cluster" "test" {
   location            = azurerm_resource_group.test.location
   resource_group_name = azurerm_resource_group.test.name
   dns_prefix          = "acctestaks%d"
+  node_resource_group = "${azurerm_resource_group.test.name}-nodes"
 
   linux_profile {
     admin_username = "acctestuser%d"
@@ -522,7 +526,7 @@ resource "azurerm_kubernetes_cluster" "test" {
   default_node_pool {
     name       = "default"
     node_count = 1
-    vm_size    = "Standard_DS2_v2"
+    vm_size    = "Standard_D2s_v5"
     upgrade_settings {
       max_surge = "10%%"
     }
@@ -575,6 +579,7 @@ resource "azurerm_kubernetes_cluster" "test" {
   location            = azurerm_resource_group.test.location
   resource_group_name = azurerm_resource_group.test.name
   dns_prefix          = "acctestaks%d"
+  node_resource_group = "${azurerm_resource_group.test.name}-nodes"
 
   linux_profile {
     admin_username = "acctestuser%d"
@@ -587,7 +592,7 @@ resource "azurerm_kubernetes_cluster" "test" {
   default_node_pool {
     name       = "default"
     node_count = 1
-    vm_size    = "Standard_DS2_v2"
+    vm_size    = "Standard_D2s_v5"
     upgrade_settings {
       max_surge = "10%%"
     }
@@ -621,6 +626,7 @@ resource "azurerm_kubernetes_cluster" "test" {
   location            = azurerm_resource_group.test.location
   resource_group_name = azurerm_resource_group.test.name
   dns_prefix          = "acctestaks%d"
+  node_resource_group = "${azurerm_resource_group.test.name}-nodes"
 
   linux_profile {
     admin_username = "acctestuser%d"
@@ -633,7 +639,7 @@ resource "azurerm_kubernetes_cluster" "test" {
   default_node_pool {
     name       = "default"
     node_count = 1
-    vm_size    = "Standard_DS2_v2"
+    vm_size    = "Standard_D2s_v5"
     upgrade_settings {
       max_surge = "10%%"
     }
@@ -662,6 +668,7 @@ resource "azurerm_kubernetes_cluster" "test" {
   location            = azurerm_resource_group.test.location
   resource_group_name = azurerm_resource_group.test.name
   dns_prefix          = "acctestaks%d"
+  node_resource_group = "${azurerm_resource_group.test.name}-nodes"
 
   linux_profile {
     admin_username = "acctestuser%d"
@@ -674,7 +681,7 @@ resource "azurerm_kubernetes_cluster" "test" {
   default_node_pool {
     name       = "default"
     node_count = 1
-    vm_size    = "Standard_DS2_v2"
+    vm_size    = "Standard_D2s_v5"
     upgrade_settings {
       max_surge = "10%%"
     }
@@ -786,6 +793,7 @@ resource "azurerm_kubernetes_cluster" "test" {
   location            = azurerm_resource_group.test.location
   resource_group_name = azurerm_resource_group.test.name
   dns_prefix          = "acctestaks%d"
+  node_resource_group = "${azurerm_resource_group.test.name}-nodes"
 
   linux_profile {
     admin_username = "acctestuser%d"
@@ -798,7 +806,7 @@ resource "azurerm_kubernetes_cluster" "test" {
   default_node_pool {
     name       = "default"
     node_count = 1
-    vm_size    = "Standard_DS2_v2"
+    vm_size    = "Standard_D2s_v5"
     upgrade_settings {
       max_surge = "10%%"
     }
@@ -835,6 +843,7 @@ resource "azurerm_kubernetes_cluster" "test" {
   location            = azurerm_resource_group.test.location
   resource_group_name = azurerm_resource_group.test.name
   dns_prefix          = "acctestaks%d"
+  node_resource_group = "${azurerm_resource_group.test.name}-nodes"
 
   linux_profile {
     admin_username = "acctestuser%d"
@@ -847,7 +856,7 @@ resource "azurerm_kubernetes_cluster" "test" {
   default_node_pool {
     name       = "default"
     node_count = 1
-    vm_size    = "Standard_DS2_v2"
+    vm_size    = "Standard_D2s_v5"
     upgrade_settings {
       max_surge = "10%%"
     }
@@ -881,6 +890,7 @@ resource "azurerm_kubernetes_cluster" "test" {
   location            = azurerm_resource_group.test.location
   resource_group_name = azurerm_resource_group.test.name
   dns_prefix          = "acctestaks%d"
+  node_resource_group = "${azurerm_resource_group.test.name}-nodes"
 
   linux_profile {
     admin_username = "acctestuser%d"
@@ -893,7 +903,7 @@ resource "azurerm_kubernetes_cluster" "test" {
   default_node_pool {
     name       = "default"
     node_count = 1
-    vm_size    = "Standard_DS2_v2"
+    vm_size    = "Standard_D2s_v5"
     upgrade_settings {
       max_surge = "10%%"
     }
@@ -936,6 +946,7 @@ resource "azurerm_kubernetes_cluster" "test" {
   location            = azurerm_resource_group.test.location
   resource_group_name = azurerm_resource_group.test.name
   dns_prefix          = "acctestaks%d"
+  node_resource_group = "${azurerm_resource_group.test.name}-nodes"
 
   linux_profile {
     admin_username = "acctestuser%d"
@@ -948,7 +959,7 @@ resource "azurerm_kubernetes_cluster" "test" {
   default_node_pool {
     name       = "default"
     node_count = 1
-    vm_size    = "Standard_DS2_v2"
+    vm_size    = "Standard_D2s_v5"
     upgrade_settings {
       max_surge = "10%%"
     }
@@ -986,6 +997,7 @@ resource "azurerm_kubernetes_cluster" "test" {
   location            = azurerm_resource_group.test.location
   resource_group_name = azurerm_resource_group.test.name
   dns_prefix          = "acctestaks%d"
+  node_resource_group = "${azurerm_resource_group.test.name}-nodes"
 
   linux_profile {
     admin_username = "acctestuser%d"
@@ -998,7 +1010,7 @@ resource "azurerm_kubernetes_cluster" "test" {
   default_node_pool {
     name       = "default"
     node_count = 1
-    vm_size    = "Standard_DS2_v2"
+    vm_size    = "Standard_D2s_v5"
     upgrade_settings {
       max_surge = "10%%"
     }
@@ -1029,6 +1041,7 @@ resource "azurerm_kubernetes_cluster" "test" {
   location            = azurerm_resource_group.test.location
   resource_group_name = azurerm_resource_group.test.name
   dns_prefix          = "acctestaks%d"
+  node_resource_group = "${azurerm_resource_group.test.name}-nodes"
 
   linux_profile {
     admin_username = "acctestuser%d"
@@ -1041,7 +1054,7 @@ resource "azurerm_kubernetes_cluster" "test" {
   default_node_pool {
     name       = "default"
     node_count = 1
-    vm_size    = "Standard_DS2_v2"
+    vm_size    = "Standard_D2s_v5"
     upgrade_settings {
       max_surge = "10%%"
     }
@@ -1075,6 +1088,7 @@ resource "azurerm_kubernetes_cluster" "test" {
   location            = azurerm_resource_group.test.location
   resource_group_name = azurerm_resource_group.test.name
   dns_prefix          = "acctestaks%d"
+  node_resource_group = "${azurerm_resource_group.test.name}-nodes"
 
   linux_profile {
     admin_username = "acctestuser%d"
@@ -1087,7 +1101,7 @@ resource "azurerm_kubernetes_cluster" "test" {
   default_node_pool {
     name       = "default"
     node_count = 1
-    vm_size    = "Standard_DS2_v2"
+    vm_size    = "Standard_D2s_v5"
     upgrade_settings {
       max_surge = "10%%"
     }
@@ -1120,6 +1134,7 @@ resource "azurerm_kubernetes_cluster" "test" {
   location            = azurerm_resource_group.test.location
   resource_group_name = azurerm_resource_group.test.name
   dns_prefix          = "acctestaks%d"
+  node_resource_group = "${azurerm_resource_group.test.name}-nodes"
 
   linux_profile {
     admin_username = "acctestuser%d"
@@ -1132,7 +1147,7 @@ resource "azurerm_kubernetes_cluster" "test" {
   default_node_pool {
     name       = "default"
     node_count = 1
-    vm_size    = "Standard_DS2_v2"
+    vm_size    = "Standard_D2s_v5"
     upgrade_settings {
       max_surge = "10%%"
     }

diff --git a/internal/services/containers/kubernetes_cluster_auth_resource_test.go b/internal/services/containers/kubernetes_cluster_auth_resource_test.go
@@ -459,7 +459,7 @@ resource "azurerm_kubernetes_cluster" "test" {
   default_node_pool {
     name           = "default"
     node_count     = 1
-    vm_size        = "Standard_DS2_v2"
+    vm_size        = "Standard_D2s_v5"
     vnet_subnet_id = azurerm_subnet.test.id
     upgrade_settings {
       max_surge = "10%%"
@@ -506,7 +506,7 @@ resource "azurerm_kubernetes_cluster" "test" {
   default_node_pool {
     name       = "default"
     node_count = 1
-    vm_size    = "Standard_DS2_v2"
+    vm_size    = "Standard_D2s_v5"
     upgrade_settings {
       max_surge = "10%%"
     }
@@ -545,7 +545,7 @@ resource "azurerm_kubernetes_cluster" "test" {
   default_node_pool {
     name       = "default"
     node_count = 1
-    vm_size    = "Standard_DS2_v2"
+    vm_size    = "Standard_D2s_v5"
     upgrade_settings {
       max_surge = "10%%"
     }
@@ -586,7 +586,7 @@ resource "azurerm_kubernetes_cluster" "test" {
   default_node_pool {
     name       = "default"
     node_count = 1
-    vm_size    = "Standard_DS2_v2"
+    vm_size    = "Standard_D2s_v5"
     upgrade_settings {
       max_surge = "10%%"
     }
@@ -644,7 +644,7 @@ resource "azurerm_kubernetes_cluster" "test" {
   default_node_pool {
     name       = "default"
     node_count = 1
-    vm_size    = "Standard_DS2_v2"
+    vm_size    = "Standard_D2s_v5"
     upgrade_settings {
       max_surge = "10%%"
     }
@@ -692,7 +692,7 @@ resource "azurerm_kubernetes_cluster" "test" {
   default_node_pool {
     name       = "default"
     node_count = 1
-    vm_size    = "Standard_DS2_v2"
+    vm_size    = "Standard_D2s_v5"
     upgrade_settings {
       max_surge = "10%%"
     }
@@ -735,7 +735,7 @@ resource "azurerm_kubernetes_cluster" "test" {
   default_node_pool {
     name       = "default"
     node_count = 1
-    vm_size    = "Standard_DS2_v2"
+    vm_size    = "Standard_D2s_v5"
     upgrade_settings {
       max_surge = "10%%"
     }
@@ -778,7 +778,7 @@ resource "azurerm_kubernetes_cluster" "test" {
   default_node_pool {
     name       = "default"
     node_count = 1
-    vm_size    = "Standard_DS2_v2"
+    vm_size    = "Standard_D2s_v5"
     upgrade_settings {
       max_surge = "10%%"
     }
@@ -826,7 +826,7 @@ resource "azurerm_kubernetes_cluster" "test" {
   default_node_pool {
     name       = "default"
     node_count = 1
-    vm_size    = "Standard_DS2_v2"
+    vm_size    = "Standard_D2s_v5"
     upgrade_settings {
       max_surge = "10%%"
     }
@@ -874,7 +874,7 @@ resource "azurerm_kubernetes_cluster" "test" {
   default_node_pool {
     name       = "default"
     node_count = 1
-    vm_size    = "Standard_DS2_v2"
+    vm_size    = "Standard_D2s_v5"
     upgrade_settings {
       max_surge = "10%%"
     }
@@ -922,7 +922,7 @@ resource "azurerm_kubernetes_cluster" "test" {
   default_node_pool {
     name       = "default"
     node_count = 1
-    vm_size    = "Standard_DS2_v2"
+    vm_size    = "Standard_D2s_v5"
     upgrade_settings {
       max_surge = "10%%"
     }
@@ -969,7 +969,7 @@ resource "azurerm_kubernetes_cluster" "test" {
   default_node_pool {
     name       = "default"
     node_count = 2
-    vm_size    = "Standard_DS2_v2"
+    vm_size    = "Standard_D2s_v5"
     upgrade_settings {
       max_surge = "10%%"
     }
@@ -1015,7 +1015,7 @@ resource "azurerm_kubernetes_cluster" "test" {
   default_node_pool {
     name       = "default"
     node_count = 1
-    vm_size    = "Standard_DS2_v2"
+    vm_size    = "Standard_D2s_v5"
     upgrade_settings {
       max_surge = "10%%"
     }
@@ -1063,7 +1063,7 @@ resource "azurerm_kubernetes_cluster" "test" {
   default_node_pool {
     name       = "default"
     node_count = 1
-    vm_size    = "Standard_DS2_v2"
+    vm_size    = "Standard_D2s_v5"
     upgrade_settings {
       max_surge = "10%%"
     }
@@ -1126,7 +1126,7 @@ resource "azurerm_kubernetes_cluster" "test" {
   default_node_pool {
     name       = "default"
     node_count = 1
-    vm_size    = "Standard_DS2_v2"
+    vm_size    = "Standard_D2s_v5"
     upgrade_settings {
       max_surge = "10%%"
     }

diff --git a/internal/services/containers/kubernetes_cluster_extension_resource_test.go b/internal/services/containers/kubernetes_cluster_extension_resource_test.go
@@ -133,7 +133,7 @@ resource "azurerm_kubernetes_cluster" "test" {
   default_node_pool {
     name       = "default"
     node_count = 1
-    vm_size    = "Standard_DS2_v2"
+    vm_size    = "Standard_D2s_v5"
     upgrade_settings {
       max_surge = "10%%"
     }