Skip to content

Commit

Permalink
Auto update
Browse files Browse the repository at this point in the history
  • Loading branch information
github-actions[bot] committed Sep 23, 2024
1 parent 0643ee1 commit dfdb03c
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 1 deletion.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
2 changes: 1 addition & 1 deletion examples/uai_and_assign_role_on_subnet/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ variable "location" {

variable "resource_group_name" {
default = "tfmod-aks"
}
}
1 change: 1 addition & 0 deletions log_analytics.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 7 additions & 0 deletions main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit dfdb03c

Please sign in to comment.