Skip to content

Commit f559b86

Browse files
riraghriragh
authored
feat: (IAC-403): Update AzureRM Terraform provider version (#257)
* feat: (IAC-403): Update AzureRM Terraform provider version
1 parent e257fd8 commit f559b86

File tree

15 files changed

+65
-71
lines changed

15 files changed

+65
-71
lines changed

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,4 +118,4 @@ See the [Troubleshooting](./docs/Troubleshooting.md) page for information about
118118
### Terraform Resources
119119

120120
- [Azure Provider](https://www.terraform.io/docs/providers/azurerm/index.html)
121-
- [Azure AKS](https://www.terraform.io/docs/providers/azurerm/r/kubernetes_cluster.html)
121+
- [Azure AKS](https://www.terraform.io/docs/providers/azurerm/r/kubernetes_cluster)

‎docs/CONFIG-VARS.md‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -93,23 +93,23 @@ The default values for the `subnets` variable are as follows:
9393
aks = {
9494
"prefixes": ["192.168.0.0/23"],
9595
"service_endpoints": ["Microsoft.Sql"],
96-
"enforce_private_link_endpoint_network_policies": false,
97-
"enforce_private_link_service_network_policies": false,
96+
"private_endpoint_network_policies_enabled": false,
97+
"private_link_service_network_policies_enabled": false,
9898
"service_delegations": {},
9999
}
100100
misc = {
101101
"prefixes": ["192.168.2.0/24"],
102102
"service_endpoints": ["Microsoft.Sql"],
103-
"enforce_private_link_endpoint_network_policies": false,
104-
"enforce_private_link_service_network_policies": false,
103+
"private_endpoint_network_policies_enabled": false,
104+
"private_link_service_network_policies_enabled": false,
105105
"service_delegations": {},
106106
}
107107
## If using ha storage then the following is also added
108108
netapp = {
109109
"prefixes": ["192.168.3.0/24"],
110110
"service_endpoints": [],
111-
"enforce_private_link_endpoint_network_policies": false,
112-
"enforce_private_link_service_network_policies": false,
111+
"private_endpoint_network_policies_enabled": false,
112+
"private_link_service_network_policies_enabled": false,
113113
"service_delegations": {
114114
netapp = {
115115
"name" : "Microsoft.Netapp/volumes"
@@ -283,7 +283,7 @@ When `storage_type=standard`, a NFS Server VM is created, only when these variab
283283
| nfs_vm_zone | Zone in which NFS server VM should be created | string | null | |
284284
| nfs_raid_disk_type | Managed disk types | string | "Standard_LRS" | Supported values: Standard_LRS, Premium_LRS, StandardSSD_LRS or UltraSSD_LRS. When using `UltraSSD_LRS`, `nfs_vm_zone` and `nfs_raid_disk_zones` must be specified. See the [Azure documentation](https://docs.microsoft.com/en-us/azure/virtual-machines/disks-enable-ultra-ssd) for limitations on Availability Zones and VM types. |
285285
| nfs_raid_disk_size | Size in Gb for each disk of the RAID5 cluster on the NFS server VM | number | 128 | |
286-
| nfs_raid_disk_zones | A collection containing the availability zones to allocate the Managed Disks for NFS | list of strings | [] | |
286+
| nfs_raid_disk_zone | The Availability Zone in which the Managed Disk should be located. Changing this property forces a new resource to be created. | string | null | |
287287

288288
### Azure NetApp Files (only when `storage_type=ha`)
289289

‎examples/sample-input-singlestore.tfvars‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -124,23 +124,23 @@ subnets = {
124124
aks = {
125125
"prefixes": ["192.168.0.0/21"],
126126
"service_endpoints": ["Microsoft.Sql"],
127-
"enforce_private_link_endpoint_network_policies": false,
128-
"enforce_private_link_service_network_policies": false,
127+
"private_endpoint_network_policies_enabled": false,
128+
"private_link_service_network_policies_enabled": false,
129129
"service_delegations": {},
130130
}
131131
misc = {
132132
"prefixes": ["192.168.8.0/24"],
133133
"service_endpoints": ["Microsoft.Sql"],
134-
"enforce_private_link_endpoint_network_policies": false,
135-
"enforce_private_link_service_network_policies": false,
134+
"private_endpoint_network_policies_enabled": false,
135+
"private_link_service_network_policies_enabled": false,
136136
"service_delegations": {},
137137
}
138138
## If using ha storage then the following is also added
139139
netapp = {
140140
"prefixes": ["192.168.9.0/24"],
141141
"service_endpoints": [],
142-
"enforce_private_link_endpoint_network_policies": false,
143-
"enforce_private_link_service_network_policies": false,
142+
"private_endpoint_network_policies_enabled": false,
143+
"private_link_service_network_policies_enabled": false,
144144
"service_delegations": {
145145
netapp = {
146146
"name" : "Microsoft.Netapp/volumes"

‎main.tf‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -100,14 +100,14 @@ resource "azurerm_container_registry" "acr" {
100100
# Moving from deprecated argument, georeplication_locations, but keeping container_registry_geo_replica_locs
101101
# for backwards compatability.
102102
#
103-
georeplications = (local.container_registry_sku == "Premium" && var.container_registry_geo_replica_locs != null) ? [
104-
for location_item in var.container_registry_geo_replica_locs:
105-
{
106-
location = location_item
107-
tags = var.tags
108-
}
109-
] : local.container_registry_sku == "Premium" ? [] : null
110-
103+
dynamic "georeplications" {
104+
for_each = (local.container_registry_sku == "Premium" && var.container_registry_geo_replica_locs != null) ? toset(
105+
var.container_registry_geo_replica_locs) : []
106+
content {
107+
location = georeplications.key
108+
tags = var.tags
109+
}
110+
}
111111
tags = var.tags
112112
}
113113

@@ -200,7 +200,7 @@ module "node_pools" {
200200
max_pods = each.value.max_pods == null ? 110 : each.value.max_pods
201201
node_taints = each.value.node_taints
202202
node_labels = each.value.node_labels
203-
availability_zones = (var.node_pools_availability_zone == "" || var.node_pools_proximity_placement == true) ? [] : [var.node_pools_availability_zone]
203+
zones = (var.node_pools_availability_zone == "" || var.node_pools_proximity_placement == true) ? [] : [var.node_pools_availability_zone]
204204
proximity_placement_group_id = element(coalescelist(azurerm_proximity_placement_group.proximity.*.id, [""]), 0)
205205
orchestrator_version = var.kubernetes_version
206206
tags = var.tags

‎modules/aks_node_pool/main.tf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ resource "azurerm_kubernetes_cluster_node_pool" "autoscale_node_pool" {
55
name = var.node_pool_name
66
kubernetes_cluster_id = var.aks_cluster_id
77
vnet_subnet_id = var.vnet_subnet_id
8-
availability_zones = var.availability_zones
8+
zones = var.zones
99
proximity_placement_group_id = var.proximity_placement_group_id == "" ? null : var.proximity_placement_group_id
1010
vm_size = var.machine_type
1111
os_disk_size_gb = var.os_disk_size
@@ -34,7 +34,7 @@ resource "azurerm_kubernetes_cluster_node_pool" "static_node_pool" {
3434
name = var.node_pool_name
3535
kubernetes_cluster_id = var.aks_cluster_id
3636
vnet_subnet_id = var.vnet_subnet_id
37-
availability_zones = var.availability_zones
37+
zones = var.zones
3838
proximity_placement_group_id = var.proximity_placement_group_id == "" ? null : var.proximity_placement_group_id
3939
vm_size = var.machine_type
4040
os_disk_size_gb = var.os_disk_size

‎modules/aks_node_pool/variables.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ variable "aks_cluster_id" {
88
type = string
99
}
1010

11-
variable "availability_zones" {
11+
variable "zones" {
1212
type = list(string)
1313
default = []
1414
}

‎modules/azure_aks/main.tf‎

Lines changed: 16 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
11
# Reference: https://registry.terraform.io/providers/hashicorp/azurerm/latest/docs/resources/kubernetes_cluster
22
resource "azurerm_kubernetes_cluster" "aks" {
3-
name = var.aks_cluster_name
4-
location = var.aks_cluster_location
5-
resource_group_name = var.aks_cluster_rg
6-
dns_prefix = var.aks_cluster_dns_prefix
3+
name = var.aks_cluster_name
4+
location = var.aks_cluster_location
5+
resource_group_name = var.aks_cluster_rg
6+
dns_prefix = var.aks_cluster_dns_prefix
7+
role_based_access_control_enabled = true
8+
http_application_routing_enabled = false
79

810
# https://docs.microsoft.com/en-us/azure/aks/supported-kubernetes-versions
911
# az aks get-versions --location eastus -o table
10-
kubernetes_version = var.kubernetes_version
11-
api_server_authorized_ip_ranges = var.aks_cluster_endpoint_public_access_cidrs
12-
private_cluster_enabled = var.aks_private_cluster
13-
private_dns_zone_id = var.aks_private_cluster ? "System" : null
12+
kubernetes_version = var.kubernetes_version
13+
api_server_authorized_ip_ranges = var.aks_cluster_endpoint_public_access_cidrs
14+
private_cluster_enabled = var.aks_private_cluster
15+
private_dns_zone_id = var.aks_private_cluster ? "System" : null
1416

1517
network_profile {
1618
network_plugin = var.aks_network_plugin
@@ -28,11 +30,7 @@ resource "azurerm_kubernetes_cluster" "aks" {
2830
pod_cidr = var.aks_network_plugin == "kubenet" ? "10.244.0.0/16" : null
2931
docker_bridge_cidr = var.aks_network_plugin == "kubenet" ? "172.17.0.1/16" : var.aks_docker_bridge_cidr
3032
outbound_type = var.cluster_egress_type
31-
load_balancer_sku = "Standard"
32-
}
33-
34-
role_based_access_control {
35-
enabled = true
33+
load_balancer_sku = "standard"
3634
}
3735

3836
dynamic "linux_profile" {
@@ -48,7 +46,7 @@ resource "azurerm_kubernetes_cluster" "aks" {
4846
default_node_pool {
4947
name = "system"
5048
vm_size = var.aks_cluster_node_vm_size
51-
availability_zones = var.aks_availability_zones
49+
zones = var.aks_availability_zones
5250
enable_auto_scaling = var.aks_cluster_node_auto_scaling
5351
enable_node_public_ip = false
5452
node_labels = {}
@@ -75,19 +73,13 @@ resource "azurerm_kubernetes_cluster" "aks" {
7573
for_each = var.aks_uai_id == null ? [] : [1]
7674
content {
7775
type = "UserAssigned"
78-
user_assigned_identity_id = var.aks_uai_id
76+
identity_ids = [var.aks_uai_id]
7977
}
8078
}
8179

82-
addon_profile {
83-
http_application_routing {
84-
enabled = false
85-
}
86-
kube_dashboard {
87-
enabled = false
88-
}
89-
oms_agent {
90-
enabled = var.aks_oms_enabled
80+
dynamic "oms_agent" {
81+
for_each = var.aks_oms_enabled ? ["oms_agent"] : []
82+
content {
9183
log_analytics_workspace_id = var.aks_log_analytics_workspace_id
9284
}
9385
}

‎modules/azurerm_vm/main.tf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ resource "azurerm_managed_disk" "vm_data_disk" {
4141
storage_account_type = var.data_disk_storage_account_type
4242
create_option = "Empty"
4343
disk_size_gb = var.data_disk_size
44-
zones = var.data_disk_zones
44+
zone = var.data_disk_zone
4545
tags = var.tags
4646
}
4747

‎modules/azurerm_vm/variables.tf‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,9 @@ variable data_disk_storage_account_type {
7575
description = "The type of storage to use for the managed disk. Possible values are Standard_LRS, Premium_LRS, StandardSSD_LRS or UltraSSD_LRS."
7676
}
7777

78-
variable "data_disk_zones" {
79-
description = "A collection containing the availability zone to allocate the Managed Disk in."
80-
default = []
78+
variable "data_disk_zone" {
79+
description = "Specifies the Availability Zone in which this Managed Disk should be located. Changing this property forces a new resource to be created."
80+
default = null
8181
}
8282

8383
variable os_disk_size {

‎modules/azurerm_vnet/main.tf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ resource "azurerm_subnet" "subnet" {
3838
virtual_network_name = local.vnet_name
3939
address_prefixes = each.value.prefixes
4040
service_endpoints = each.value.service_endpoints
41-
enforce_private_link_endpoint_network_policies = each.value.enforce_private_link_endpoint_network_policies
42-
enforce_private_link_service_network_policies = each.value.enforce_private_link_service_network_policies
41+
private_endpoint_network_policies_enabled = each.value.private_endpoint_network_policies_enabled
42+
private_link_service_network_policies_enabled = each.value.private_link_service_network_policies_enabled
4343
dynamic "delegation" {
4444
for_each = each.value.service_delegations
4545
content {

0 commit comments

Comments
 (0)