Update azurerm to latest version 2.39

modules/azure/blob/blob.tf

@@ -1,16 +1,15 @@
 resource "azurerm_storage_account" "storage_acc" {
   name                      = "${var.cluster_name}config"
-  resource_group_name       = var.resource_group_name
   location                  = var.azure_location
   account_kind              = "BlobStorage"
   account_tier              = "Standard"
   account_replication_type  = "LRS"
   enable_https_traffic_only = true
+  resource_group_name       = var.resource_group_name
 }
 
 resource "azurerm_storage_container" "ignition" {
   name                  = "ignition"
-  resource_group_name   = var.resource_group_name
   storage_account_name  = azurerm_storage_account.storage_acc.name
   container_access_type = "private"
 }

modules/azure/master-as/master-ignition.tf

@@ -15,11 +15,10 @@ resource "azurerm_storage_blob" "ignition_blob" {
 
   name = "master-ignition${count.index}-${md5(var.user_data[count.index])}.yaml"
 
-  resource_group_name    = var.resource_group_name
   storage_account_name   = var.storage_acc
   storage_container_name = var.storage_container
 
-  type   = "block"
+  type   = "Block"
   source = "${path.cwd}/generated/master-ignition${count.index}.yaml"
 }
 

modules/azure/vnet/vnet-subnets.tf

@@ -22,7 +22,7 @@ resource "azurerm_subnet" "vpn_subnet" {
   virtual_network_name = azurerm_virtual_network.cluster_vnet.name
 
   # Use first /28 for /16 (e.g. for 10.0.0.0/16 10.0.0.0/28 will be used).
-  address_prefix = cidrsubnet(var.vnet_cidr, 12, 0)
+  address_prefixes = [cidrsubnet(var.vnet_cidr, 12, 0)]
 }
 
 resource "azurerm_subnet" "bastion_subnet" {
@@ -31,37 +31,22 @@ resource "azurerm_subnet" "bastion_subnet" {
   virtual_network_name = azurerm_virtual_network.cluster_vnet.name
 
   # NOTE: bastion_cidr should be unique across clusters, when VPN enabled.
-  address_prefix = var.bastion_cidr
+  address_prefixes = [var.bastion_cidr]
 
-  # We stil need to hold the old deprecated way of defining network security group
-  # https://github.com/hashicorp/terraform/issues/19722
-  network_security_group_id = azurerm_network_security_group.bastion.id
 }
 
 resource "azurerm_subnet" "vault_subnet" {
   name                 = "${var.cluster_name}_vault_subnet"
   resource_group_name  = var.resource_group_name
   virtual_network_name = azurerm_virtual_network.cluster_vnet.name
-  address_prefix       = cidrsubnet(var.vnet_cidr, 8, 1)
-
-  # We stil need to hold the old deprecated way of defining network security group
-  # https://github.com/hashicorp/terraform/issues/19722
-  network_security_group_id = azurerm_network_security_group.vault.id
+  address_prefixes       = [cidrsubnet(var.vnet_cidr, 8, 1)]
 }
 
 resource "azurerm_subnet" "worker_subnet" {
   name                 = "${var.cluster_name}_worker_subnet"
   resource_group_name  = var.resource_group_name
   virtual_network_name = azurerm_virtual_network.cluster_vnet.name
-  address_prefix       = cidrsubnet(var.vnet_cidr, 8, 2)
-
-  # We stil need to hold the old deprecated way of defining network security group
-  # https://github.com/hashicorp/terraform/issues/19722
-  network_security_group_id = azurerm_network_security_group.worker.id
-
-  # Same for rt association 
-  # https://www.terraform.io/docs/providers/azurerm/r/subnet_route_table_association.html
-  route_table_id = azurerm_route_table.worker_rt.id
+  address_prefixes       = [cidrsubnet(var.vnet_cidr, 8, 2)]
 
   # We need the storage service endpoint to grant the control plane VNET access to the TC's storage accounts
   service_endpoints = ["Microsoft.Storage"]

platforms/azure/giantnetes/main.tf

@@ -1,8 +1,9 @@
 provider "azurerm" {
-  # versions 1.34.0 and 1.35.0 break e2e tests, please don't use them.
-  version = "~> 1.33.0"
+  version = "~> 2.39.0"
 
-  environment = var.azure_cloud
+  features {}
+  metadata_host = var.metadata_host
+  environment   = var.azure_cloud
 }
 
 data "azurerm_client_config" "current" {}

platforms/azure/giantnetes/variables.tf

@@ -21,7 +21,12 @@ variable "azure_location" {
 
 variable "azure_cloud" {
   description = "Azure cloud to use. Possible values can be found here: https://github.com/Azure/go-autorest/blob/ec5f4903f77ed9927ac95b19ab8e44ada64c1356/autorest/azure/environments.go#L13"
-  default     = "AZUREPUBLICCLOUD"
+  default     = "public"
+}
+
+variable "metadata_host" {
+  description = "The Hostname of the Azure Metadata Service, used to obtain the Cloud Environment when using a Custom Azure Environment."
+  default     = "management.azure.com"
 }
 
 # Azure has different number of failure domains depending on location.
@@ -125,12 +130,12 @@ variable "flatcar_linux_version" {
 }
 
 variable "vault_image_publisher" {
-  type = string
+  type    = string
   default = "kinvolk"
 }
 
 variable "vault_image_offer" {
-  type = string
+  type    = string
   default = "flatcar-container-linux-free"
 }