commit for now

examples/application_gateway_ingress/main.tf

@@ -183,6 +183,7 @@ module "aks" {
   private_cluster_enabled                         = false
   rbac_aad                                        = true
   rbac_aad_managed                                = true
+  rbac_aad_tenant_id                              = data.azurerm_client_config.this.tenant_id
   role_based_access_control_enabled               = true
   sku_tier                                        = "Standard"
   vnet_subnet_id                                  = var.bring_your_own_vnet ? azurerm_subnet.test[0].id : null

examples/application_gateway_ingress_v4/data.tf

@@ -0,0 +1 @@
+data "azurerm_client_config" "this" {}

examples/application_gateway_ingress_v4/k8s_workload.tf

@@ -0,0 +1 @@
+../application_gateway_ingress/k8s_workload.tf

examples/application_gateway_ingress_v4/main.tf

@@ -0,0 +1 @@
+../application_gateway_ingress/main.tf

examples/application_gateway_ingress_v4/main_override.tf

@@ -0,0 +1,5 @@
+module "aks" {
+  #checkov:skip=CKV_AZURE_141:We enable admin account here so we can provision K8s resources directly in this simple example
+  source             = "../../v4"
+  rbac_aad_tenant_id = data.azurerm_client_config.this.tenant_id
+}

examples/application_gateway_ingress_v4/outputs.tf

@@ -0,0 +1 @@
+../application_gateway_ingress/outputs.tf

examples/application_gateway_ingress_v4/providers.tf

@@ -0,0 +1 @@
+../application_gateway_ingress/providers.tf

examples/application_gateway_ingress_v4/providers_override.tf

@@ -0,0 +1,8 @@
+terraform {
+  required_providers {
+    azurerm = {
+      source  = "hashicorp/azurerm"
+      version = "~> 4.0"
+    }
+  }
+}

examples/application_gateway_ingress_v4/variables.tf

@@ -0,0 +1 @@
+../application_gateway_ingress/variables.tf

examples/multiple_node_pools/main.tf

@@ -28,7 +28,6 @@ resource "azurerm_subnet" "test" {
   name                                           = "${random_id.prefix.hex}-sn"
   resource_group_name                            = local.resource_group.name
   virtual_network_name                           = azurerm_virtual_network.test.name
-  enforce_private_link_endpoint_network_policies = true
 }
 
 locals {

examples/multiple_node_pools/main_override.tf

@@ -0,0 +1,3 @@
+resource "azurerm_subnet" "test" {
+  enforce_private_link_endpoint_network_policies = true
+}

examples/multiple_node_pools_v4/main.tf

@@ -0,0 +1 @@
+../multiple_node_pools/main.tf

examples/multiple_node_pools_v4/main_override.tf

@@ -0,0 +1,8 @@
+resource "azurerm_subnet" "test" {
+  private_endpoint_network_policies             = "Disabled"
+  private_link_service_network_policies_enabled = true
+}
+
+module "aks" {
+  source = "../../v4"
+}

examples/multiple_node_pools_v4/outputs.tf

@@ -0,0 +1 @@
+../multiple_node_pools/outputs.tf

examples/multiple_node_pools_v4/providers.tf

@@ -0,0 +1 @@
+../multiple_node_pools/providers.tf

examples/multiple_node_pools_v4/providers_override.tf

@@ -0,0 +1,12 @@
+terraform {
+  required_providers {
+    azurerm = {
+      source  = "hashicorp/azurerm"
+      version = "~> 4.0"
+    }
+    random = {
+      source  = "hashicorp/random"
+      version = "3.3.2"
+    }
+  }
+}

examples/multiple_node_pools_v4/variables.tf

@@ -0,0 +1 @@
+../multiple_node_pools/variables.tf

extra_node_pool.tf

@@ -10,18 +10,13 @@ resource "azurerm_kubernetes_cluster_node_pool" "node_pool_create_before_destroy
   name                          = "${each.value.name}${substr(md5(uuid()), 0, 4)}"
   vm_size                       = each.value.vm_size
   capacity_reservation_group_id = each.value.capacity_reservation_group_id
-  custom_ca_trust_enabled       = each.value.custom_ca_trust_enabled
-  enable_auto_scaling           = each.value.enable_auto_scaling
-  enable_host_encryption        = each.value.enable_host_encryption
-  enable_node_public_ip         = each.value.enable_node_public_ip
   eviction_policy               = each.value.eviction_policy
   fips_enabled                  = each.value.fips_enabled
   gpu_instance                  = each.value.gpu_instance
   host_group_id                 = each.value.host_group_id
   kubelet_disk_type             = each.value.kubelet_disk_type
   max_count                     = each.value.max_count
   max_pods                      = each.value.max_pods
-  message_of_the_day            = each.value.message_of_the_day
   min_count                     = each.value.min_count
   mode                          = each.value.mode
   node_count                    = each.value.node_count
@@ -171,17 +166,12 @@ resource "azurerm_kubernetes_cluster_node_pool" "node_pool_create_after_destroy"
   name                          = each.value.name
   vm_size                       = each.value.vm_size
   capacity_reservation_group_id = each.value.capacity_reservation_group_id
-  custom_ca_trust_enabled       = each.value.custom_ca_trust_enabled
-  enable_auto_scaling           = each.value.enable_auto_scaling
-  enable_host_encryption        = each.value.enable_host_encryption
-  enable_node_public_ip         = each.value.enable_node_public_ip
   eviction_policy               = each.value.eviction_policy
   fips_enabled                  = each.value.fips_enabled
   host_group_id                 = each.value.host_group_id
   kubelet_disk_type             = each.value.kubelet_disk_type
   max_count                     = each.value.max_count
   max_pods                      = each.value.max_pods
-  message_of_the_day            = each.value.message_of_the_day
   min_count                     = each.value.min_count
   mode                          = each.value.mode
   node_count                    = each.value.node_count

extra_node_pool_override.tf

@@ -0,0 +1,15 @@
+resource "azurerm_kubernetes_cluster_node_pool" "node_pool_create_before_destroy" {
+  custom_ca_trust_enabled = each.value.custom_ca_trust_enabled
+  enable_auto_scaling     = each.value.enable_auto_scaling
+  enable_host_encryption  = each.value.enable_host_encryption
+  enable_node_public_ip   = each.value.enable_node_public_ip
+  message_of_the_day      = each.value.message_of_the_day
+}
+
+resource "azurerm_kubernetes_cluster_node_pool" "node_pool_create_after_destroy" {
+  custom_ca_trust_enabled = each.value.custom_ca_trust_enabled
+  enable_auto_scaling     = each.value.enable_auto_scaling
+  enable_host_encryption  = each.value.enable_host_encryption
+  enable_node_public_ip   = each.value.enable_node_public_ip
+  message_of_the_day      = each.value.message_of_the_day
+}