Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix azure provider renamed attributes #340

Merged
merged 1 commit into from
Dec 6, 2024
Merged

Fix azure provider renamed attributes #340

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions azurerm/_modules/aks/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@ resource "azurerm_kubernetes_cluster" "current" {
dns_prefix = var.dns_prefix
sku_tier = var.sku_tier
kubernetes_version = var.kubernetes_version
automatic_channel_upgrade = var.automatic_channel_upgrade
automatic_upgrade_channel = var.automatic_channel_upgrade

role_based_access_control_enabled = true

default_node_pool {
name = var.default_node_pool_name
type = var.default_node_pool_type

enable_auto_scaling = var.default_node_pool_enable_auto_scaling
auto_scaling_enabled = var.default_node_pool_enable_auto_scaling

# set min and max count only if autoscaling is _enabled_
min_count = var.default_node_pool_enable_auto_scaling ? var.default_node_pool_min_count : null
Expand All @@ -41,9 +41,9 @@ resource "azurerm_kubernetes_cluster" "current" {
network_plugin = var.network_plugin
network_policy = var.network_policy

service_cidr = var.service_cidr
dns_service_ip = var.dns_service_ip
pod_cidr = var.network_plugin == "azure" ? null : var.pod_cidr
service_cidr = var.service_cidr
dns_service_ip = var.dns_service_ip
pod_cidr = var.network_plugin == "azure" ? null : var.pod_cidr
}

dynamic "identity" {
Expand Down Expand Up @@ -76,8 +76,8 @@ resource "azurerm_kubernetes_cluster" "current" {
}

workload_autoscaler_profile {
keda_enabled = var.keda_enabled
vertical_pod_autoscaler_enabled = var.vertical_pod_autoscaler_enabled
keda_enabled = var.keda_enabled
vertical_pod_autoscaler_enabled = var.vertical_pod_autoscaler_enabled
}

tags = var.metadata_labels
Expand Down
2 changes: 1 addition & 1 deletion azurerm/_modules/aks/node_pool/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ locals {
resource "azurerm_kubernetes_cluster_node_pool" "current" {
name = var.node_pool_name
kubernetes_cluster_id = data.azurerm_kubernetes_cluster.current.id
enable_auto_scaling = var.enable_auto_scaling
auto_scaling_enabled = var.enable_auto_scaling
max_count = var.max_count
min_count = var.min_count
node_count = var.node_count
Expand Down
Loading