Fix aks

Author: aamini7

scenarios/AksOpenAiTerraform/terraform/main.tf

@@ -139,22 +139,14 @@ module "aks_cluster" {
   kubernetes_version                      = var.kubernetes_version
   dns_prefix                              = lower(var.aks_cluster_name)
   private_cluster_enabled                 = var.private_cluster_enabled
-  automatic_channel_upgrade               = var.automatic_channel_upgrade
   sku_tier                                = var.sku_tier
   system_node_pool_name                   = var.system_node_pool_name
   system_node_pool_vm_size                = var.system_node_pool_vm_size
   vnet_subnet_id                          = module.virtual_network.subnet_ids[var.system_node_pool_subnet_name]
   pod_subnet_id                           = module.virtual_network.subnet_ids[var.pod_subnet_name]
   system_node_pool_availability_zones     = var.system_node_pool_availability_zones
   system_node_pool_node_labels            = var.system_node_pool_node_labels
-  system_node_pool_node_taints            = var.system_node_pool_node_taints
-  system_node_pool_enable_auto_scaling    = var.system_node_pool_enable_auto_scaling
-  system_node_pool_enable_host_encryption = var.system_node_pool_enable_host_encryption
-  system_node_pool_enable_node_public_ip  = var.system_node_pool_enable_node_public_ip
   system_node_pool_max_pods               = var.system_node_pool_max_pods
-  system_node_pool_max_count              = var.system_node_pool_max_count
-  system_node_pool_min_count              = var.system_node_pool_min_count
-  system_node_pool_node_count             = var.system_node_pool_node_count
   system_node_pool_os_disk_type           = var.system_node_pool_os_disk_type
   tags                                    = var.tags
   network_dns_service_ip                  = var.network_dns_service_ip
@@ -194,14 +186,10 @@ module "node_pool" {
   availability_zones           = var.user_node_pool_availability_zones
   vnet_subnet_id               = module.virtual_network.subnet_ids[var.user_node_pool_subnet_name]
   pod_subnet_id                = module.virtual_network.subnet_ids[var.pod_subnet_name]
-  enable_auto_scaling          = var.user_node_pool_enable_auto_scaling
   enable_host_encryption       = var.user_node_pool_enable_host_encryption
   enable_node_public_ip        = var.user_node_pool_enable_node_public_ip
   orchestrator_version         = var.kubernetes_version
   max_pods                     = var.user_node_pool_max_pods
-  max_count                    = var.user_node_pool_max_count
-  min_count                    = var.user_node_pool_min_count
-  node_count                   = var.user_node_pool_node_count
   os_type                      = var.user_node_pool_os_type
   priority                     = var.user_node_pool_priority
   tags                         = var.tags

scenarios/AksOpenAiTerraform/terraform/modules/aks/main.tf

@@ -28,30 +28,25 @@ resource "azurerm_kubernetes_cluster" "aks_cluster" {
   kubernetes_version               = var.kubernetes_version
   dns_prefix                       = var.dns_prefix
   private_cluster_enabled          = var.private_cluster_enabled
-  automatic_channel_upgrade        = var.automatic_channel_upgrade
+  automatic_upgrade_channel        = "stable"
   sku_tier                         = var.sku_tier
   workload_identity_enabled        = var.workload_identity_enabled
   oidc_issuer_enabled              = var.oidc_issuer_enabled
   open_service_mesh_enabled        = var.open_service_mesh_enabled
   image_cleaner_enabled            = var.image_cleaner_enabled
   azure_policy_enabled             = var.azure_policy_enabled
+  image_cleaner_interval_hours     = 72
   http_application_routing_enabled = var.http_application_routing_enabled
 
   default_node_pool {
     name                    = var.system_node_pool_name
+    node_count              = 1
     vm_size                 = var.system_node_pool_vm_size
     vnet_subnet_id          = var.vnet_subnet_id
     pod_subnet_id           = var.pod_subnet_id
     zones                   = var.system_node_pool_availability_zones
     node_labels             = var.system_node_pool_node_labels
-    node_taints             = var.system_node_pool_node_taints
-    enable_auto_scaling     = var.system_node_pool_enable_auto_scaling
-    enable_host_encryption  = var.system_node_pool_enable_host_encryption
-    enable_node_public_ip   = var.system_node_pool_enable_node_public_ip
     max_pods                = var.system_node_pool_max_pods
-    max_count               = var.system_node_pool_max_count
-    min_count               = var.system_node_pool_min_count
-    node_count              = var.system_node_pool_node_count
     os_disk_type            = var.system_node_pool_os_disk_type
     tags                    = var.tags
   }
@@ -91,7 +86,6 @@ resource "azurerm_kubernetes_cluster" "aks_cluster" {
   }
 
   azure_active_directory_role_based_access_control {
-    managed                    = true
     tenant_id                  = var.tenant_id
     admin_group_object_ids     = var.admin_group_object_ids
     azure_rbac_enabled         = var.azure_rbac_enabled

scenarios/AksOpenAiTerraform/terraform/modules/aks/variables.tf

@@ -47,17 +47,6 @@ variable "role_based_access_control_enabled" {
   type        = bool
 }
 
-variable "automatic_channel_upgrade" {
-  description = "(Optional) The upgrade channel for this Kubernetes Cluster. Possible values are patch, rapid, and stable."
-  default     = "stable"
-  type        = string
-
-  validation {
-    condition = contains( ["patch", "rapid", "stable"], var.automatic_channel_upgrade)
-    error_message = "The upgrade mode is invalid."
-  }
-}
-
 variable "sku_tier" {
   description = "(Optional) The SKU Tier that should be used for this Kubernetes Cluster. Possible values are Free and Paid (which includes the Uptime SLA). Defaults to Free."
   default     = "Free"
@@ -71,7 +60,6 @@ variable "sku_tier" {
 
 variable "kubernetes_version" {
   description = "Specifies the AKS Kubernetes version"
-  default     = "1.21.1"
   type        = string
 }
 
@@ -134,24 +122,6 @@ variable "system_node_pool_subnet_address_prefix" {
   type        = list(string)
 }
 
-variable "system_node_pool_enable_auto_scaling" {
-  description = "(Optional) Whether to enable auto-scaler. Defaults to false."
-  type          = bool
-  default       = true
-}
-
-variable "system_node_pool_enable_host_encryption" {
-  description = "(Optional) Should the nodes in this Node Pool have host encryption enabled? Defaults to false."
-  type          = bool
-  default       = false
-} 
-
-variable "system_node_pool_enable_node_public_ip" {
-  description = "(Optional) Should each node have a Public IP Address? Defaults to false. Changing this forces a new resource to be created."
-  type          = bool
-  default       = false
-} 
-
 variable "system_node_pool_max_pods" {
   description = "(Optional) The maximum number of pods that can run on each agent. Changing this forces a new resource to be created."
   type          = number
@@ -164,36 +134,12 @@ variable "system_node_pool_node_labels" {
   default       = {}
 } 
 
-variable "system_node_pool_node_taints" {
-  description = "(Optional) A map of Kubernetes labels which should be applied to nodes in this Node Pool. Changing this forces a new resource to be created."
-  type          = list(string)
-  default       = []
-} 
-
 variable "system_node_pool_os_disk_type" {
   description = "(Optional) The type of disk which should be used for the Operating System. Possible values are Ephemeral and Managed. Defaults to Managed. Changing this forces a new resource to be created."
   type          = string
   default       = "Ephemeral"
 } 
 
-variable "system_node_pool_max_count" {
-  description = "(Required) The maximum number of nodes which should exist within this Node Pool. Valid values are between 0 and 1000 and must be greater than or equal to min_count."
-  type          = number
-  default       = 10
-}
-
-variable "system_node_pool_min_count" {
-  description = "(Required) The minimum number of nodes which should exist within this Node Pool. Valid values are between 0 and 1000 and must be less than or equal to max_count."
-  type          = number
-  default       = 3
-}
-
-variable "system_node_pool_node_count" {
-  description = "(Optional) The initial number of nodes which should exist within this Node Pool. Valid values are between 0 and 1000 and must be a value in the range min_count - max_count."
-  type          = number
-  default       = 3
-}
-
 variable "log_analytics_workspace_id" {
   description = "(Optional) The ID of the Log Analytics Workspace which the OMS Agent should send data to. Must be present if enabled is true."
   type        = string

scenarios/AksOpenAiTerraform/terraform/modules/node_pool/main.tf

@@ -8,15 +8,9 @@ resource "azurerm_kubernetes_cluster_node_pool" "node_pool" {
   zones                        = var.availability_zones
   vnet_subnet_id               = var.vnet_subnet_id
   pod_subnet_id                = var.pod_subnet_id
-  enable_auto_scaling          = var.enable_auto_scaling
-  enable_host_encryption       = var.enable_host_encryption
-  enable_node_public_ip        = var.enable_node_public_ip
   proximity_placement_group_id = var.proximity_placement_group_id
   orchestrator_version         = var.orchestrator_version
   max_pods                     = var.max_pods
-  max_count                    = var.max_count
-  min_count                    = var.min_count
-  node_count                   = var.node_count
   os_disk_size_gb              = var.os_disk_size_gb
   os_disk_type                 = var.os_disk_type
   os_type                      = var.os_type

scenarios/AksOpenAiTerraform/terraform/modules/node_pool/variables.tf

@@ -19,12 +19,6 @@ variable "availability_zones" {
   default = ["1", "2", "3"]
 }
 
-variable "enable_auto_scaling" {
-  description = "(Optional) Whether to enable auto-scaler. Defaults to false."
-  type          = bool
-  default       = false
-}
-
 variable "enable_host_encryption" {
   description = "(Optional) Should the nodes in this Node Pool have host encryption enabled? Defaults to false."
   type          = bool
@@ -67,9 +61,8 @@ variable "tags" {
 }
 
 variable "orchestrator_version" {
-  description = "(Optional) Version of Kubernetes used for the Agents. If not specified, the latest recommended version will be used at provisioning time (but won't auto-upgrade)"
+  description = "(Required) Version of Kubernetes used for the Agents. If not specified, the latest recommended version will be used at provisioning time (but won't auto-upgrade)"
   type          = string
-  default       = null
 } 
 
 variable "os_disk_size_gb" {
@@ -114,24 +107,6 @@ variable "pod_subnet_id" {
   default       = null
 }
 
-variable "max_count" {
-  description = "(Required) The maximum number of nodes which should exist within this Node Pool. Valid values are between 0 and 1000 and must be greater than or equal to min_count."
-  type          = number
-  default       = 10
-}
-
-variable "min_count" {
-  description = "(Required) The minimum number of nodes which should exist within this Node Pool. Valid values are between 0 and 1000 and must be less than or equal to max_count."
-  type          = number
-  default       = 3
-}
-
-variable "node_count" {
-  description = "(Optional) The initial number of nodes which should exist within this Node Pool. Valid values are between 0 and 1000 and must be a value in the range min_count - max_count."
-  type          = number
-  default       = 3
-}
-
 variable resource_group_name {
   description = "Specifies the resource group name"
   type        = string

scenarios/AksOpenAiTerraform/terraform/variables.tf

@@ -124,17 +124,6 @@ variable "role_based_access_control_enabled" {
   type        = bool
 }
 
-variable "automatic_channel_upgrade" {
-  description = "(Optional) The upgrade channel for this Kubernetes Cluster. Possible values are patch, rapid, and stable."
-  default     = "stable"
-  type        = string
-
-  validation {
-    condition = contains( ["patch", "rapid", "stable"], var.automatic_channel_upgrade)
-    error_message = "The upgrade mode is invalid."
-  }
-}
-
 variable "admin_group_object_ids" {
   description = "(Optional) A list of Object IDs of Azure Active Directory Groups which should have Admin Role on the Cluster."
   default     = []
@@ -160,7 +149,7 @@ variable "sku_tier" {
 
 variable "kubernetes_version" {
   description = "Specifies the AKS Kubernetes version"
-  default     = "1.26.3"
+  default     = "1.31.1"
   type        = string
 }
 
@@ -200,24 +189,6 @@ variable "system_node_pool_name" {
   type        = string
 }
 
-variable "system_node_pool_enable_auto_scaling" {
-  description = "(Optional) Whether to enable auto-scaler. Defaults to false."
-  type          = bool
-  default       = true
-}
-
-variable "system_node_pool_enable_host_encryption" {
-  description = "(Optional) Should the nodes in this Node Pool have host encryption enabled? Defaults to false."
-  type          = bool
-  default       = false
-} 
-
-variable "system_node_pool_enable_node_public_ip" {
-  description = "(Optional) Should each node have a Public IP Address? Defaults to false. Changing this forces a new resource to be created."
-  type          = bool
-  default       = false
-} 
-
 variable "system_node_pool_max_pods" {
   description = "(Optional) The maximum number of pods that can run on each agent. Changing this forces a new resource to be created."
   type          = number
@@ -242,24 +213,6 @@ variable "system_node_pool_os_disk_type" {
   default       = "Ephemeral"
 } 
 
-variable "system_node_pool_max_count" {
-  description = "(Required) The maximum number of nodes which should exist within this Node Pool. Valid values are between 0 and 1000 and must be greater than or equal to min_count."
-  type          = number
-  default       = 10
-}
-
-variable "system_node_pool_min_count" {
-  description = "(Required) The minimum number of nodes which should exist within this Node Pool. Valid values are between 0 and 1000 and must be less than or equal to max_count."
-  type          = number
-  default       = 3
-}
-
-variable "system_node_pool_node_count" {
-  description = "(Optional) The initial number of nodes which should exist within this Node Pool. Valid values are between 0 and 1000 and must be a value in the range min_count - max_count."
-  type          = number
-  default       = 3
-}
-
 variable "user_node_pool_name" {
   description = "(Required) Specifies the name of the node pool."
   type        = string
@@ -278,12 +231,6 @@ variable "user_node_pool_availability_zones" {
   default = ["1", "2", "3"]
 }
 
-variable "user_node_pool_enable_auto_scaling" {
-  description = "(Optional) Whether to enable auto-scaler. Defaults to false."
-  type          = bool
-  default       = true
-}
-
 variable "user_node_pool_enable_host_encryption" {
   description = "(Optional) Should the nodes in this Node Pool have host encryption enabled? Defaults to false."
   type          = bool
@@ -338,24 +285,6 @@ variable "user_node_pool_priority" {
   default       = "Regular"
 } 
 
-variable "user_node_pool_max_count" {
-  description = "(Required) The maximum number of nodes which should exist within this Node Pool. Valid values are between 0 and 1000 and must be greater than or equal to min_count."
-  type          = number
-  default       = 10
-}
-
-variable "user_node_pool_min_count" {
-  description = "(Required) The minimum number of nodes which should exist within this Node Pool. Valid values are between 0 and 1000 and must be less than or equal to max_count."
-  type          = number
-  default       = 3
-}
-
-variable "user_node_pool_node_count" {
-  description = "(Optional) The initial number of nodes which should exist within this Node Pool. Valid values are between 0 and 1000 and must be a value in the range min_count - max_count."
-  type          = number
-  default       = 3
-}
-
 variable "storage_account_kind" {
   description = "(Optional) Specifies the account kind of the storage account"
   default     = "StorageV2"