From dfdb03c36288aa183b4bb7f0bc92206441c3df18 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Mon, 23 Sep 2024 01:18:35 +0000 Subject: [PATCH] Auto update --- CHANGELOG.md | 1 + examples/uai_and_assign_role_on_subnet/variables.tf | 2 +- log_analytics.tf | 1 + main.tf | 7 +++++++ 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a5e90232..e4e46d6c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ **Merged pull requests:** +- Update README.md [\#589](https://github.com/Azure/terraform-azurerm-aks/pull/589) ([shailwx](https://github.com/shailwx)) - Add `cost_analysis_enabled` option [\#583](https://github.com/Azure/terraform-azurerm-aks/pull/583) ([artificial-aidan](https://github.com/artificial-aidan)) - Bump github.com/Azure/terraform-module-test-helper from 0.24.0 to 0.25.0 in /test [\#581](https://github.com/Azure/terraform-azurerm-aks/pull/581) ([dependabot[bot]](https://github.com/apps/dependabot)) - Bump github.com/gruntwork-io/terratest from 0.46.15 to 0.47.0 in /test [\#579](https://github.com/Azure/terraform-azurerm-aks/pull/579) ([dependabot[bot]](https://github.com/apps/dependabot)) diff --git a/examples/uai_and_assign_role_on_subnet/variables.tf b/examples/uai_and_assign_role_on_subnet/variables.tf index bf99527e..b57ac5b7 100644 --- a/examples/uai_and_assign_role_on_subnet/variables.tf +++ b/examples/uai_and_assign_role_on_subnet/variables.tf @@ -8,4 +8,4 @@ variable "location" { variable "resource_group_name" { default = "tfmod-aks" -} \ No newline at end of file +} diff --git a/log_analytics.tf b/log_analytics.tf index b791ecdd..1d3a2993 100644 --- a/log_analytics.tf +++ b/log_analytics.tf @@ -28,6 +28,7 @@ resource "azurerm_log_analytics_workspace" "main" { dynamic "identity" { for_each = var.log_analytics_workspace_identity == null ? [] : [var.log_analytics_workspace_identity] + content { type = identity.value.type identity_ids = identity.value.identity_ids diff --git a/main.tf b/main.tf index 44f81f94..499a8b30 100644 --- a/main.tf +++ b/main.tf @@ -327,6 +327,7 @@ resource "azurerm_kubernetes_cluster" "main" { } dynamic "http_proxy_config" { for_each = var.http_proxy_config == null ? [] : ["http_proxy_config"] + content { http_proxy = coalesce(var.http_proxy_config.http_proxy, var.http_proxy_config.https_proxy) https_proxy = coalesce(var.http_proxy_config.https_proxy, var.http_proxy_config.http_proxy) @@ -370,6 +371,7 @@ resource "azurerm_kubernetes_cluster" "main" { } dynamic "kubelet_identity" { for_each = var.kubelet_identity == null ? [] : [var.kubelet_identity] + content { client_id = kubelet_identity.value.client_id object_id = kubelet_identity.value.object_id @@ -411,6 +413,7 @@ resource "azurerm_kubernetes_cluster" "main" { } dynamic "maintenance_window_auto_upgrade" { for_each = var.maintenance_window_auto_upgrade == null ? [] : [var.maintenance_window_auto_upgrade] + content { duration = maintenance_window_auto_upgrade.value.duration frequency = maintenance_window_auto_upgrade.value.frequency @@ -424,6 +427,7 @@ resource "azurerm_kubernetes_cluster" "main" { dynamic "not_allowed" { for_each = maintenance_window_auto_upgrade.value.not_allowed == null ? [] : maintenance_window_auto_upgrade.value.not_allowed + content { end = not_allowed.value.end start = not_allowed.value.start @@ -433,6 +437,7 @@ resource "azurerm_kubernetes_cluster" "main" { } dynamic "maintenance_window_node_os" { for_each = var.maintenance_window_node_os == null ? [] : [var.maintenance_window_node_os] + content { duration = maintenance_window_node_os.value.duration frequency = maintenance_window_node_os.value.frequency @@ -446,6 +451,7 @@ resource "azurerm_kubernetes_cluster" "main" { dynamic "not_allowed" { for_each = maintenance_window_node_os.value.not_allowed == null ? [] : maintenance_window_node_os.value.not_allowed + content { end = not_allowed.value.end start = not_allowed.value.start @@ -504,6 +510,7 @@ resource "azurerm_kubernetes_cluster" "main" { } dynamic "service_mesh_profile" { for_each = var.service_mesh_profile == null ? [] : ["service_mesh_profile"] + content { mode = var.service_mesh_profile.mode external_ingress_gateway_enabled = var.service_mesh_profile.external_ingress_gateway_enabled