diff --git a/README.md b/README.md index b235372..5b2d408 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ The following requirements are needed by this module: - [azapi](#requirement\_azapi) (>= 1.4.0, < 2.0) -- [azurerm](#requirement\_azurerm) (>= 3.86.0, <4.0) +- [azurerm](#requirement\_azurerm) (>= 3.86.0, <5.0) - [local](#requirement\_local) (>=2.4.1, < 3.0) @@ -339,9 +339,9 @@ The following Modules are called: ### [avm\_res\_containerregistry\_registry](#module\_avm\_res\_containerregistry\_registry) -Source: Azure/avm-res-containerregistry-registry/azurerm +Source: github.com/zioproto/terraform-azurerm-avm-res-containerregistry-registry -Version: 0.3.1 +Version: provider-v4 ## Data Collection diff --git a/examples/default/README.md b/examples/default/README.md index bbcb961..6e3f43a 100644 --- a/examples/default/README.md +++ b/examples/default/README.md @@ -9,7 +9,7 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = ">= 3.7.0, < 4.0.0" + version = ">= 3.7.0, < 5.0.0" } random = { source = "hashicorp/random" @@ -84,7 +84,7 @@ resource "azurerm_private_dns_zone" "this" { module "avm_res_network_virtualnetwork" { source = "Azure/avm-res-network-virtualnetwork/azurerm" - version = "0.2.3" + version = "0.5.0" address_space = ["10.31.0.0/16"] location = azurerm_resource_group.this.location @@ -110,7 +110,7 @@ The following requirements are needed by this module: - [terraform](#requirement\_terraform) (>= 1.3.0) -- [azurerm](#requirement\_azurerm) (>= 3.7.0, < 4.0.0) +- [azurerm](#requirement\_azurerm) (>= 3.7.0, < 5.0.0) - [random](#requirement\_random) (>= 3.5.0, < 4.0.0) @@ -153,7 +153,7 @@ The following Modules are called: Source: Azure/avm-res-network-virtualnetwork/azurerm -Version: 0.2.3 +Version: 0.5.0 ### [naming](#module\_naming) diff --git a/examples/default/main.tf b/examples/default/main.tf index dcb123c..a577065 100644 --- a/examples/default/main.tf +++ b/examples/default/main.tf @@ -3,7 +3,7 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = ">= 3.7.0, < 4.0.0" + version = ">= 4, <5" } random = { source = "hashicorp/random" @@ -78,7 +78,7 @@ resource "azurerm_private_dns_zone" "this" { module "avm_res_network_virtualnetwork" { source = "Azure/avm-res-network-virtualnetwork/azurerm" - version = "0.2.3" + version = "0.5.0" address_space = ["10.31.0.0/16"] location = azurerm_resource_group.this.location diff --git a/examples/with_availability_zone/README.md b/examples/with_availability_zone/README.md index 036d885..fa462f8 100644 --- a/examples/with_availability_zone/README.md +++ b/examples/with_availability_zone/README.md @@ -9,7 +9,7 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = ">= 3.7.0, < 4.0.0" + version = ">= 3.7.0, < 5.0.0" } } } @@ -101,7 +101,7 @@ resource "azurerm_private_dns_zone" "this" { module "avm_res_network_virtualnetwork" { source = "Azure/avm-res-network-virtualnetwork/azurerm" - version = "0.2.3" + version = "0.5.0" address_space = ["10.31.0.0/16"] location = azurerm_resource_group.this.location @@ -127,7 +127,7 @@ The following requirements are needed by this module: - [terraform](#requirement\_terraform) (>= 1.3.0) -- [azurerm](#requirement\_azurerm) (>= 3.7.0, < 4.0.0) +- [azurerm](#requirement\_azurerm) (>= 3.7.0, < 5.0.0) ## Resources @@ -176,7 +176,7 @@ The following Modules are called: Source: Azure/avm-res-network-virtualnetwork/azurerm -Version: 0.2.3 +Version: 0.5.0 ### [naming](#module\_naming) diff --git a/examples/with_availability_zone/main.tf b/examples/with_availability_zone/main.tf index 5b317c4..3fe4137 100644 --- a/examples/with_availability_zone/main.tf +++ b/examples/with_availability_zone/main.tf @@ -3,7 +3,7 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = ">= 3.7.0, < 4.0.0" + version = ">= 4, <5" } } } @@ -95,7 +95,7 @@ resource "azurerm_private_dns_zone" "this" { module "avm_res_network_virtualnetwork" { source = "Azure/avm-res-network-virtualnetwork/azurerm" - version = "0.2.3" + version = "0.5.0" address_space = ["10.31.0.0/16"] location = azurerm_resource_group.this.location diff --git a/examples/without_availability_zone/README.md b/examples/without_availability_zone/README.md index 554e763..c8584a3 100644 --- a/examples/without_availability_zone/README.md +++ b/examples/without_availability_zone/README.md @@ -9,7 +9,7 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = ">= 3.7.0, < 4.0.0" + version = ">= 3.7.0, < 5.0.0" } } } @@ -97,7 +97,7 @@ resource "azurerm_private_dns_zone" "this" { module "avm_res_network_virtualnetwork" { source = "Azure/avm-res-network-virtualnetwork/azurerm" - version = "0.2.3" + version = "0.5.0" address_space = ["10.31.0.0/16"] location = azurerm_resource_group.this.location @@ -123,7 +123,7 @@ The following requirements are needed by this module: - [terraform](#requirement\_terraform) (>= 1.3.0) -- [azurerm](#requirement\_azurerm) (>= 3.7.0, < 4.0.0) +- [azurerm](#requirement\_azurerm) (>= 3.7.0, < 5.0.0) ## Resources @@ -172,7 +172,7 @@ The following Modules are called: Source: Azure/avm-res-network-virtualnetwork/azurerm -Version: 0.2.3 +Version: 0.5.0 ### [naming](#module\_naming) diff --git a/examples/without_availability_zone/main.tf b/examples/without_availability_zone/main.tf index f1b6832..37540a9 100644 --- a/examples/without_availability_zone/main.tf +++ b/examples/without_availability_zone/main.tf @@ -3,7 +3,7 @@ terraform { required_providers { azurerm = { source = "hashicorp/azurerm" - version = ">= 3.7.0, < 4.0.0" + version = ">= 4, <5" } } } @@ -91,7 +91,7 @@ resource "azurerm_private_dns_zone" "this" { module "avm_res_network_virtualnetwork" { source = "Azure/avm-res-network-virtualnetwork/azurerm" - version = "0.2.3" + version = "0.5.0" address_space = ["10.31.0.0/16"] location = azurerm_resource_group.this.location diff --git a/main.tf b/main.tf index 420e07a..e5297a7 100644 --- a/main.tf +++ b/main.tf @@ -1,7 +1,9 @@ module "avm_res_containerregistry_registry" { - for_each = toset(var.acr == null ? [] : ["acr"]) - source = "Azure/avm-res-containerregistry-registry/azurerm" - version = "0.3.1" + for_each = toset(var.acr == null ? [] : ["acr"]) + # point to https://github.com/zioproto/terraform-azurerm-avm-res-containerregistry-registry/tree/provider-v4 + source = "github.com/zioproto/terraform-azurerm-avm-res-containerregistry-registry?ref=provider-v4" + #source = "Azure/avm-res-containerregistry-registry/azurerm" + #version = "0.3.1" name = var.acr.name location = var.location resource_group_name = var.resource_group_name @@ -52,12 +54,12 @@ resource "azurerm_kubernetes_cluster" "this" { location = var.location name = "aks-${var.name}" resource_group_name = var.resource_group_name - automatic_channel_upgrade = "patch" + automatic_upgrade_channel = "patch" azure_policy_enabled = true dns_prefix = var.name kubernetes_version = var.kubernetes_version local_account_disabled = true - node_os_channel_upgrade = "NodeImage" + node_os_upgrade_channel = "NodeImage" oidc_issuer_enabled = true private_cluster_enabled = true role_based_access_control_enabled = true @@ -66,19 +68,19 @@ resource "azurerm_kubernetes_cluster" "this" { workload_identity_enabled = true default_node_pool { - name = "agentpool" - vm_size = "Standard_D4d_v5" - enable_auto_scaling = true - enable_host_encryption = true - max_count = 9 - max_pods = 110 - min_count = 3 - node_labels = var.node_labels - orchestrator_version = var.orchestrator_version - os_sku = var.os_sku - tags = merge(var.tags, var.agents_tags) - vnet_subnet_id = var.network.node_subnet_id - zones = try([for zone in local.regions_by_name_or_display_name[var.location].zones : zone], null) + name = "agentpool" + vm_size = "Standard_D4d_v5" + auto_scaling_enabled = true + host_encryption_enabled = true + max_count = 9 + max_pods = 110 + min_count = 3 + node_labels = var.node_labels + orchestrator_version = var.orchestrator_version + os_sku = var.os_sku + tags = merge(var.tags, var.agents_tags) + vnet_subnet_id = var.network.node_subnet_id + zones = try([for zone in local.regions_by_name_or_display_name[var.location].zones : zone], null) upgrade_settings { max_surge = "10%" @@ -90,7 +92,6 @@ resource "azurerm_kubernetes_cluster" "this" { azure_active_directory_role_based_access_control { admin_group_object_ids = var.rbac_aad_admin_group_object_ids azure_rbac_enabled = var.rbac_aad_azure_rbac_enabled - managed = true tenant_id = var.rbac_aad_tenant_id } ## Resources that only support UserAssigned @@ -254,7 +255,7 @@ resource "azurerm_kubernetes_cluster_node_pool" "this" { kubernetes_cluster_id = azurerm_kubernetes_cluster.this.id name = each.value.name vm_size = each.value.vm_size - enable_auto_scaling = true + auto_scaling_enabled = true max_count = each.value.max_count min_count = each.value.min_count node_labels = each.value.labels diff --git a/terraform.tf b/terraform.tf index 8ee0740..f512d58 100644 --- a/terraform.tf +++ b/terraform.tf @@ -7,7 +7,7 @@ terraform { } azurerm = { source = "hashicorp/azurerm" - version = ">= 3.86.0, <4.0" + version = ">= 4, <5" } local = { source = "hashicorp/local"