upgrade azurerm to latest version (#2812)

nebari-dev · Feb 11, 2025 · 3c22840 · 3c22840
2 parents ac88391 + 48e628d
commit 3c22840
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 25 deletions.
diff --git a/src/_nebari/stages/infrastructure/template/azure/modules/kubernetes/main.tf b/src/_nebari/stages/infrastructure/template/azure/modules/kubernetes/main.tf
@@ -25,23 +25,22 @@ resource "azurerm_kubernetes_cluster" "main" {
   dynamic "network_profile" {
     for_each = var.network_profile != null ? [var.network_profile] : []
     content {
-      network_plugin     = network_profile.value.network_plugin != null ? network_profile.value.network_plugin : null
-      network_policy     = network_profile.value.network_policy != null ? network_profile.value.network_policy : null
-      service_cidr       = network_profile.value.service_cidr != null ? network_profile.value.service_cidr : null
-      dns_service_ip     = network_profile.value.dns_service_ip != null ? network_profile.value.dns_service_ip : null
-      docker_bridge_cidr = network_profile.value.docker_bridge_cidr != null ? network_profile.value.docker_bridge_cidr : null
+      network_plugin = network_profile.value.network_plugin != null ? network_profile.value.network_plugin : null
+      network_policy = network_profile.value.network_policy != null ? network_profile.value.network_policy : null
+      service_cidr   = network_profile.value.service_cidr != null ? network_profile.value.service_cidr : null
+      dns_service_ip = network_profile.value.dns_service_ip != null ? network_profile.value.dns_service_ip : null
     }
   }
 
   kubernetes_version = var.kubernetes_version
   default_node_pool {
-    vnet_subnet_id      = var.vnet_subnet_id
-    name                = var.node_groups[0].name
-    vm_size             = var.node_groups[0].instance_type
-    enable_auto_scaling = "true"
-    min_count           = var.node_groups[0].min_size
-    max_count           = var.node_groups[0].max_size
-    max_pods            = var.max_pods
+    vnet_subnet_id       = var.vnet_subnet_id
+    name                 = var.node_groups[0].name
+    vm_size              = var.node_groups[0].instance_type
+    auto_scaling_enabled = "true"
+    min_count            = var.node_groups[0].min_size
+    max_count            = var.node_groups[0].max_size
+    max_pods             = var.max_pods
 
     orchestrator_version = var.kubernetes_version
     node_labels = {
@@ -76,7 +75,7 @@ resource "azurerm_kubernetes_cluster_node_pool" "node_group" {
   name                  = each.value.name
   kubernetes_cluster_id = azurerm_kubernetes_cluster.main.id
   vm_size               = each.value.instance_type
-  enable_auto_scaling   = "true"
+  auto_scaling_enabled  = "true"
   mode                  = "User" # "System" or "User", only "User" nodes can scale down to 0
   min_count             = each.value.min_size
   max_count             = each.value.max_size

diff --git a/src/_nebari/stages/infrastructure/template/azure/modules/kubernetes/variables.tf b/src/_nebari/stages/infrastructure/template/azure/modules/kubernetes/variables.tf
@@ -56,11 +56,10 @@ variable "tags" {
 variable "network_profile" {
   description = "Network profile"
   type = object({
-    network_plugin     = string
-    network_policy     = string
-    service_cidr       = string
-    dns_service_ip     = string
-    docker_bridge_cidr = string
+    network_plugin = string
+    network_policy = string
+    service_cidr   = string
+    dns_service_ip = string
   })
   default = null
 }

diff --git a/src/_nebari/stages/infrastructure/template/azure/variables.tf b/src/_nebari/stages/infrastructure/template/azure/variables.tf
@@ -62,11 +62,10 @@ variable "tags" {
 variable "network_profile" {
   description = "Network profile"
   type = object({
-    network_plugin     = string
-    network_policy     = string
-    service_cidr       = string
-    dns_service_ip     = string
-    docker_bridge_cidr = string
+    network_plugin = string
+    network_policy = string
+    service_cidr   = string
+    dns_service_ip = string
   })
   default = null
 }

diff --git a/src/_nebari/stages/infrastructure/template/azure/versions.tf b/src/_nebari/stages/infrastructure/template/azure/versions.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "=3.97.1"
+      version = "=4.7.0"
     }
   }
   required_version = ">= 1.0"

diff --git a/src/_nebari/stages/terraform_state/template/azure/main.tf b/src/_nebari/stages/terraform_state/template/azure/main.tf
@@ -47,7 +47,7 @@ terraform {
   required_providers {
     azurerm = {
       source  = "hashicorp/azurerm"
-      version = "=3.97.1"
+      version = "=4.7.0"
     }
   }
   required_version = ">= 1.0"