From 66fce897e10b08b4e397cfe88b5deae0bb0e751f Mon Sep 17 00:00:00 2001 From: Ritika Patil Date: Fri, 4 Oct 2024 11:58:02 -0500 Subject: [PATCH] feat: (PSKD-348) Additional module updates --- main.tf | 4 ++-- modules/azure_aks/main.tf | 2 +- modules/azure_aks/variables.tf | 2 +- outputs.tf | 2 +- variables.tf | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/main.tf b/main.tf index b69863f9..9557dfc7 100644 --- a/main.tf +++ b/main.tf @@ -144,7 +144,7 @@ module "aks" { aks_cluster_max_pods = var.default_nodepool_max_pods aks_cluster_os_disk_size = var.default_nodepool_os_disk_size aks_cluster_node_vm_size = var.default_nodepool_vm_type - aks_cluster_host_encryption_enabled = var.aks_cluster_host_encryption_enabled + aks_cluster_enable_host_encryption = var.aks_cluster_enable_host_encryption aks_node_disk_encryption_set_id = var.aks_node_disk_encryption_set_id aks_cluster_node_admin = var.node_vm_admin aks_cluster_ssh_public_key = try(file(var.ssh_public_key), "") @@ -209,7 +209,7 @@ module "node_pools" { zones = (var.node_pools_availability_zone == "" || var.node_pools_proximity_placement == true) ? [] : (var.node_pools_availability_zones != null) ? var.node_pools_availability_zones : [var.node_pools_availability_zone] proximity_placement_group_id = element(coalescelist(azurerm_proximity_placement_group.proximity[*].id, [""]), 0) orchestrator_version = var.kubernetes_version - host_encryption_enabled = var.aks_cluster_host_encryption_enabled + host_encryption_enabled = var.aks_cluster_enable_host_encryption tags = var.tags } diff --git a/modules/azure_aks/main.tf b/modules/azure_aks/main.tf index 3bf19996..744bab97 100644 --- a/modules/azure_aks/main.tf +++ b/modules/azure_aks/main.tf @@ -74,7 +74,7 @@ resource "azurerm_kubernetes_cluster" "aks" { node_public_ip_enabled = false node_labels = {} fips_enabled = var.fips_enabled - host_encryption_enabled = var.aks_cluster_host_encryption_enabled + host_encryption_enabled = var.aks_cluster_enable_host_encryption max_pods = var.aks_cluster_max_pods os_disk_size_gb = var.aks_cluster_os_disk_size max_count = var.aks_cluster_max_nodes diff --git a/modules/azure_aks/variables.tf b/modules/azure_aks/variables.tf index 187d8745..c4d3a904 100644 --- a/modules/azure_aks/variables.tf +++ b/modules/azure_aks/variables.tf @@ -131,7 +131,7 @@ variable "aks_cluster_max_pods" { default = 110 } -variable "aks_cluster_host_encryption_enabled" { +variable "aks_cluster_enable_host_encryption" { description = "Enables host encryption on all the nodes in the Default Node Pool" type = bool default = false diff --git a/outputs.tf b/outputs.tf index 9fdb6b94..7e3b9226 100644 --- a/outputs.tf +++ b/outputs.tf @@ -136,7 +136,7 @@ output "rwx_filestore_config" { "virtualNetwork" : module.vnet.name, "subnet" : module.vnet.subnets["netapp"], "defaults" : { - "exportRule" : element(module.vnet.address_space, 0), + "exportRule" : element(tolist(module.vnet.address_space), 0), } }) : null } diff --git a/variables.tf b/variables.tf index eee1f162..9d9c20ad 100644 --- a/variables.tf +++ b/variables.tf @@ -184,7 +184,7 @@ variable "default_nodepool_availability_zones" { default = ["1"] } -variable "aks_cluster_host_encryption_enabled" { +variable "aks_cluster_enable_host_encryption" { description = "Enables host encryption on all the nodes in the Node Pool." type = bool default = false