Merge pull request #587 from lonegunmanb/v4

lonegunmanb · web-flow · commit 978698b48227 · 2024-09-25T11:18:12.000+08:00
Add `v4` sub-folder so this module could run with AzureRM provider both `v3` and `v4`.
diff --git a/.github/workflows/acc-test.yaml b/.github/workflows/acc-test.yaml
@@ -12,6 +12,7 @@ on:
 
 jobs:
   check:
+    timeout-minutes: 720
     runs-on: ubuntu-latest
     steps:
       - name: Checking for Fork
diff --git a/README.md b/README.md
@@ -6,6 +6,8 @@ This Terraform module deploys a Kubernetes cluster on Azure using AKS (Azure Kub
 
 -> **NOTE:** If you have not assigned `client_id` or `client_secret`, A `SystemAssigned` identity will be created.
 
+-> **NOTE:** If you're using AuzreRM `v4`, you can use this module by setting `source` to `Azure/aks/azurerm//v4`.
+
 ## Notice on breaking changes
 
 Please be aware that major version(e.g., from 6.8.0 to 7.0.0) update contains breaking changes that may impact your infrastructure. It is crucial to review these changes with caution before proceeding with the upgrade.
diff --git a/examples/application_gateway_ingress_v4/data.tf b/examples/application_gateway_ingress_v4/data.tf
@@ -0,0 +1 @@
+data "azurerm_client_config" "this" {}
diff --git a/examples/application_gateway_ingress_v4/k8s_workload.tf b/examples/application_gateway_ingress_v4/k8s_workload.tf
@@ -0,0 +1 @@
+../application_gateway_ingress/k8s_workload.tf
diff --git a/examples/application_gateway_ingress_v4/main.tf b/examples/application_gateway_ingress_v4/main.tf
@@ -0,0 +1 @@
+../application_gateway_ingress/main.tf
diff --git a/examples/application_gateway_ingress_v4/main_override.tf b/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
+}
diff --git a/examples/application_gateway_ingress_v4/outputs.tf b/examples/application_gateway_ingress_v4/outputs.tf
@@ -0,0 +1 @@
+../application_gateway_ingress/outputs.tf
diff --git a/examples/application_gateway_ingress_v4/providers.tf b/examples/application_gateway_ingress_v4/providers.tf
@@ -0,0 +1 @@
+../application_gateway_ingress/providers.tf
diff --git a/examples/application_gateway_ingress_v4/providers_override.tf b/examples/application_gateway_ingress_v4/providers_override.tf
@@ -0,0 +1,22 @@
+# tflint-ignore-file: terraform_required_version_declaration
+
+terraform {
+  required_providers {
+    azurerm = {
+      source  = "hashicorp/azurerm"
+      version = "~> 4.0"
+    }
+    kubernetes = {
+      source  = "hashicorp/kubernetes"
+      version = "2.22.0"
+    }
+    random = {
+      source  = "hashicorp/random"
+      version = "3.3.2"
+    }
+    time = {
+      source  = "hashicorp/time"
+      version = "0.9.1"
+    }
+  }
+}
diff --git a/examples/application_gateway_ingress_v4/variables.tf b/examples/application_gateway_ingress_v4/variables.tf
@@ -0,0 +1 @@
+../application_gateway_ingress/variables.tf
diff --git a/examples/multiple_node_pools/main.tf b/examples/multiple_node_pools/main.tf
@@ -24,11 +24,10 @@ resource "azurerm_virtual_network" "test" {
 }
 
 resource "azurerm_subnet" "test" {
-  address_prefixes                               = ["10.52.0.0/24"]
-  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
+  address_prefixes     = ["10.52.0.0/24"]
+  name                 = "${random_id.prefix.hex}-sn"
+  resource_group_name  = local.resource_group.name
+  virtual_network_name = azurerm_virtual_network.test.name
 }
 
 locals {
diff --git a/examples/multiple_node_pools/main_override.tf b/examples/multiple_node_pools/main_override.tf
@@ -0,0 +1,3 @@
+resource "azurerm_subnet" "test" {
+  enforce_private_link_endpoint_network_policies = true
+}
diff --git a/examples/multiple_node_pools_v4/main.tf b/examples/multiple_node_pools_v4/main.tf
@@ -0,0 +1 @@
+../multiple_node_pools/main.tf
diff --git a/examples/multiple_node_pools_v4/main_override.tf b/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"
+}
diff --git a/examples/multiple_node_pools_v4/outputs.tf b/examples/multiple_node_pools_v4/outputs.tf
@@ -0,0 +1 @@
+../multiple_node_pools/outputs.tf
diff --git a/examples/multiple_node_pools_v4/providers.tf b/examples/multiple_node_pools_v4/providers.tf
@@ -0,0 +1 @@
+../multiple_node_pools/providers.tf
diff --git a/examples/multiple_node_pools_v4/providers_override.tf b/examples/multiple_node_pools_v4/providers_override.tf
@@ -0,0 +1,14 @@
+# tflint-ignore-file: terraform_required_version_declaration
+
+terraform {
+  required_providers {
+    azurerm = {
+      source  = "hashicorp/azurerm"
+      version = "~> 4.0"
+    }
+    random = {
+      source  = "hashicorp/random"
+      version = "3.3.2"
+    }
+  }
+}
diff --git a/examples/multiple_node_pools_v4/variables.tf b/examples/multiple_node_pools_v4/variables.tf
@@ -0,0 +1 @@
+../multiple_node_pools/variables.tf
diff --git a/examples/named_cluster/main.tf b/examples/named_cluster/main.tf
@@ -24,11 +24,10 @@ resource "azurerm_virtual_network" "test" {
 }
 
 resource "azurerm_subnet" "test" {
-  address_prefixes                               = ["10.52.0.0/24"]
-  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
+  address_prefixes     = ["10.52.0.0/24"]
+  name                 = "${random_id.prefix.hex}-sn"
+  resource_group_name  = local.resource_group.name
+  virtual_network_name = azurerm_virtual_network.test.name
 }
 
 resource "azurerm_user_assigned_identity" "test" {
diff --git a/examples/named_cluster/main_override.tf b/examples/named_cluster/main_override.tf
@@ -0,0 +1,3 @@
+resource "azurerm_subnet" "test" {
+  enforce_private_link_endpoint_network_policies = true
+}
diff --git a/examples/named_cluster_v4/disk_encryption_set.tf b/examples/named_cluster_v4/disk_encryption_set.tf
@@ -0,0 +1 @@
+../named_cluster/disk_encryption_set.tf
diff --git a/examples/named_cluster_v4/key_vault.tf b/examples/named_cluster_v4/key_vault.tf
@@ -0,0 +1 @@
+../named_cluster/key_vault.tf
diff --git a/examples/named_cluster_v4/kms.tf b/examples/named_cluster_v4/kms.tf
@@ -0,0 +1 @@
+../named_cluster/kms.tf
diff --git a/examples/named_cluster_v4/main.tf b/examples/named_cluster_v4/main.tf
@@ -0,0 +1 @@
+../named_cluster/main.tf
diff --git a/examples/named_cluster_v4/main_override.tf b/examples/named_cluster_v4/main_override.tf
@@ -0,0 +1,5 @@
+
+module "aks_cluster_name" {
+  source             = "../../v4"
+  rbac_aad_tenant_id = data.azurerm_client_config.current.tenant_id
+}
diff --git a/examples/named_cluster_v4/outputs.tf b/examples/named_cluster_v4/outputs.tf
@@ -0,0 +1 @@
+../named_cluster/outputs.tf
diff --git a/examples/named_cluster_v4/providers.tf b/examples/named_cluster_v4/providers.tf
@@ -0,0 +1 @@
+../named_cluster/providers.tf
diff --git a/examples/named_cluster_v4/providers_override.tf b/examples/named_cluster_v4/providers_override.tf
@@ -0,0 +1,18 @@
+# tflint-ignore-file: terraform_required_version_declaration
+
+terraform {
+  required_providers {
+    azurerm = {
+      source  = "hashicorp/azurerm"
+      version = "~> 4.0"
+    }
+    curl = {
+      source  = "anschoewe/curl"
+      version = "1.0.2"
+    }
+    random = {
+      source  = "hashicorp/random"
+      version = "3.3.2"
+    }
+  }
+}
diff --git a/examples/named_cluster_v4/variables.tf b/examples/named_cluster_v4/variables.tf
@@ -0,0 +1 @@
+../named_cluster/variables.tf
diff --git a/examples/startup/main.tf b/examples/startup/main.tf
@@ -28,11 +28,10 @@ resource "azurerm_virtual_network" "test" {
 }
 
 resource "azurerm_subnet" "test" {
-  address_prefixes                               = ["10.52.0.0/24"]
-  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
+  address_prefixes     = ["10.52.0.0/24"]
+  name                 = "${random_id.prefix.hex}-sn"
+  resource_group_name  = local.resource_group.name
+  virtual_network_name = azurerm_virtual_network.test.name
 }
 
 module "aks" {
diff --git a/examples/startup/main_override.tf b/examples/startup/main_override.tf
@@ -0,0 +1,3 @@
+resource "azurerm_subnet" "test" {
+  enforce_private_link_endpoint_network_policies = true
+}
diff --git a/examples/startup_v4/disk_encryption_set.tf b/examples/startup_v4/disk_encryption_set.tf
@@ -0,0 +1 @@
+../startup/disk_encryption_set.tf
diff --git a/examples/startup_v4/main.tf b/examples/startup_v4/main.tf
@@ -0,0 +1 @@
+../startup/main.tf
diff --git a/examples/startup_v4/main_override.tf b/examples/startup_v4/main_override.tf
@@ -0,0 +1,4 @@
+module "aks" {
+  source             = "../../v4"
+  rbac_aad_tenant_id = data.azurerm_client_config.current.tenant_id
+}
diff --git a/examples/startup_v4/outputs.tf b/examples/startup_v4/outputs.tf
@@ -0,0 +1 @@
+../startup/outputs.tf
diff --git a/examples/startup_v4/providers.tf b/examples/startup_v4/providers.tf
@@ -0,0 +1 @@
+../startup/providers.tf
diff --git a/examples/startup_v4/providers_override.tf b/examples/startup_v4/providers_override.tf
@@ -0,0 +1,18 @@
+# tflint-ignore-file: terraform_required_version_declaration
+
+terraform {
+  required_providers {
+    azurerm = {
+      source  = "hashicorp/azurerm"
+      version = "~> 4.0"
+    }
+    curl = {
+      source  = "anschoewe/curl"
+      version = "1.0.2"
+    }
+    random = {
+      source  = "hashicorp/random"
+      version = "3.3.2"
+    }
+  }
+}
diff --git a/examples/startup_v4/variables.tf b/examples/startup_v4/variables.tf
@@ -0,0 +1 @@
+../startup/variables.tf
diff --git a/examples/uai_and_assign_role_on_subnet_v4/data.tf b/examples/uai_and_assign_role_on_subnet_v4/data.tf
@@ -0,0 +1 @@
+data "azurerm_client_config" "this" {}
diff --git a/examples/uai_and_assign_role_on_subnet_v4/main.tf b/examples/uai_and_assign_role_on_subnet_v4/main.tf
@@ -0,0 +1 @@
+../uai_and_assign_role_on_subnet/main.tf
diff --git a/examples/uai_and_assign_role_on_subnet_v4/main_override.tf b/examples/uai_and_assign_role_on_subnet_v4/main_override.tf
@@ -0,0 +1,4 @@
+module "aks" {
+  source             = "../../v4"
+  rbac_aad_tenant_id = data.azurerm_client_config.this.tenant_id
+}
diff --git a/examples/uai_and_assign_role_on_subnet_v4/providers.tf b/examples/uai_and_assign_role_on_subnet_v4/providers.tf
@@ -0,0 +1 @@
+../uai_and_assign_role_on_subnet/providers.tf
diff --git a/examples/uai_and_assign_role_on_subnet_v4/providers_override.tf b/examples/uai_and_assign_role_on_subnet_v4/providers_override.tf
@@ -0,0 +1,14 @@
+# tflint-ignore-file: terraform_required_version_declaration
+
+terraform {
+  required_providers {
+    azurerm = {
+      source  = "hashicorp/azurerm"
+      version = "~> 4.0"
+    }
+    random = {
+      source  = "hashicorp/random"
+      version = "3.3.2"
+    }
+  }
+}
diff --git a/examples/uai_and_assign_role_on_subnet_v4/variables.tf b/examples/uai_and_assign_role_on_subnet_v4/variables.tf
@@ -0,0 +1 @@
+../uai_and_assign_role_on_subnet/variables.tf
diff --git a/examples/with_acr/main.tf b/examples/with_acr/main.tf
@@ -24,11 +24,10 @@ resource "azurerm_virtual_network" "test" {
 }
 
 resource "azurerm_subnet" "test" {
-  address_prefixes                               = ["10.52.0.0/24"]
-  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
+  address_prefixes     = ["10.52.0.0/24"]
+  name                 = "${random_id.prefix.hex}-sn"
+  resource_group_name  = local.resource_group.name
+  virtual_network_name = azurerm_virtual_network.test.name
 }
 
 resource "random_string" "acr_suffix" {
@@ -43,11 +42,6 @@ resource "azurerm_container_registry" "example" {
   name                = "aksacrtest${random_string.acr_suffix.result}"
   resource_group_name = local.resource_group.name
   sku                 = "Premium"
-
-  retention_policy {
-    days    = 7
-    enabled = true
-  }
 }
 
 module "aks" {
diff --git a/examples/with_acr/main_override.tf b/examples/with_acr/main_override.tf
@@ -0,0 +1,10 @@
+resource "azurerm_subnet" "test" {
+  enforce_private_link_endpoint_network_policies = true
+}
+
+resource "azurerm_container_registry" "example" {
+  retention_policy {
+    days    = 7
+    enabled = true
+  }
+}
diff --git a/examples/with_acr_v4/data.tf b/examples/with_acr_v4/data.tf
@@ -0,0 +1 @@
+data "azurerm_client_config" "this" {}
diff --git a/examples/with_acr_v4/main.tf b/examples/with_acr_v4/main.tf
@@ -0,0 +1 @@
+../with_acr/main.tf
diff --git a/examples/with_acr_v4/main_override.tf b/examples/with_acr_v4/main_override.tf
@@ -0,0 +1,8 @@
+resource "azurerm_container_registry" "example" {
+  retention_policy_in_days = 7
+}
+
+module "aks" {
+  source             = "../../v4"
+  rbac_aad_tenant_id = data.azurerm_client_config.this.tenant_id
+}
diff --git a/examples/with_acr_v4/outputs.tf b/examples/with_acr_v4/outputs.tf
@@ -0,0 +1 @@
+../with_acr/outputs.tf
diff --git a/examples/with_acr_v4/providers.tf b/examples/with_acr_v4/providers.tf
@@ -0,0 +1 @@
+../with_acr/providers.tf
diff --git a/examples/with_acr_v4/providers_override.tf b/examples/with_acr_v4/providers_override.tf
@@ -0,0 +1,14 @@
+# tflint-ignore-file: terraform_required_version_declaration
+
+terraform {
+  required_providers {
+    azurerm = {
+      source  = "hashicorp/azurerm"
+      version = "~> 4.0"
+    }
+    random = {
+      source  = "hashicorp/random"
+      version = "3.3.2"
+    }
+  }
+}
diff --git a/examples/with_acr_v4/variables.tf b/examples/with_acr_v4/variables.tf
@@ -0,0 +1 @@
+../with_acr/variables.tf
diff --git a/examples/without_monitor/main.tf b/examples/without_monitor/main.tf
@@ -24,11 +24,10 @@ resource "azurerm_virtual_network" "test" {
 }
 
 resource "azurerm_subnet" "test" {
-  address_prefixes                               = ["10.52.0.0/24"]
-  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
+  address_prefixes     = ["10.52.0.0/24"]
+  name                 = "${random_id.prefix.hex}-sn"
+  resource_group_name  = local.resource_group.name
+  virtual_network_name = azurerm_virtual_network.test.name
 }
 
 resource "azurerm_dns_zone" "aks_web_app_routing" {
diff --git a/examples/without_monitor/main_override.tf b/examples/without_monitor/main_override.tf
@@ -0,0 +1,3 @@
+resource "azurerm_subnet" "test" {
+  enforce_private_link_endpoint_network_policies = true
+}
diff --git a/examples/without_monitor_v4/disk_encryption_set.tf b/examples/without_monitor_v4/disk_encryption_set.tf
@@ -0,0 +1 @@
+../without_monitor/disk_encryption_set.tf
diff --git a/examples/without_monitor_v4/main.tf b/examples/without_monitor_v4/main.tf
@@ -0,0 +1 @@
+../without_monitor/main.tf
diff --git a/examples/without_monitor_v4/main_override.tf b/examples/without_monitor_v4/main_override.tf
diff --git a/examples/without_monitor_v4/outputs.tf b/examples/without_monitor_v4/outputs.tf
diff --git a/examples/without_monitor_v4/providers.tf b/examples/without_monitor_v4/providers.tf
diff --git a/examples/without_monitor_v4/providers_override.tf b/examples/without_monitor_v4/providers_override.tf
diff --git a/examples/without_monitor_v4/variables.tf b/examples/without_monitor_v4/variables.tf
diff --git a/extra_node_pool.tf b/extra_node_pool.tf
diff --git a/extra_node_pool_override.tf b/extra_node_pool_override.tf
diff --git a/main.tf b/main.tf
diff --git a/main_override.tf b/main_override.tf
diff --git a/test/e2e/terraform_aks_test.go b/test/e2e/terraform_aks_test.go
diff --git a/test/upgrade/upgrade_test.go b/test/upgrade/upgrade_test.go
diff --git a/v4/extra_node_pool.tf b/v4/extra_node_pool.tf
diff --git a/v4/extra_node_pool_override.tf b/v4/extra_node_pool_override.tf
diff --git a/v4/locals.tf b/v4/locals.tf
diff --git a/v4/log_analytics.tf b/v4/log_analytics.tf
diff --git a/v4/main.tf b/v4/main.tf
diff --git a/v4/main_override.tf b/v4/main_override.tf
diff --git a/v4/outputs.tf b/v4/outputs.tf
diff --git a/v4/role_assignments.tf b/v4/role_assignments.tf
diff --git a/v4/variables.tf b/v4/variables.tf
diff --git a/v4/variables_override.tf b/v4/variables_override.tf
diff --git a/v4/versions.tf b/v4/versions.tf
diff --git a/v4/versions_override.tf b/v4/versions_override.tf

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+../application_gateway_ingress/k8s_workload.tf`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+../application_gateway_ingress/outputs.tf`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+../application_gateway_ingress/providers.tf`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+../application_gateway_ingress/variables.tf`