Skip to content

Commit

Permalink
feat: add missing properties node pools (#13)
Browse files Browse the repository at this point in the history 
Co-authored-by: dkool <dkool@dkools-MacBook-Pro.local>
  • Loading branch information
@dkooll
dkooll and dkool authored Jan 15, 2024
1 parent 10466e6 commit 29a155f
Show file tree
Hide file tree
Showing 3 changed files with 83 additions and 46 deletions.
2 changes: 1 addition & 1 deletion examples/node-pools/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ module "rg" {

module "network" {
source = "cloudnationhq/vnet/azure"
version = "~> 0.1"
version = "~> 1.0"

naming = local.naming

Expand Down
48 changes: 30 additions & 18 deletions locals.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,24 +30,36 @@ locals {
topology_manager_policy = try(pools.config.kubelet.topology_manager_policy, null)

})
workload_runtime = try(pools.workload_runtime, null)
snapshot_id = try(pools.snapshot_id, null)
priority = try(pools.priority, null)
os_type = try(pools.os_type, null)
os_sku = try(pools.os_sku, null)
node_labels = try(pools.node_labels, {})
node_taints = try(pools.node_taints, [])
mode = try(pools.mode, "User")
max_pods = try(pools.max_pods, 30)
kubelet_disk_type = try(pools.kubelet_disk_type, null)
eviction_policy = try(pools.eviction_policy, null)
enable_fips = try(pools.enable.fips, false)
zones = try(pools.zones, null)
enable_node_public_ip = try(pools.enable.node_public_ip, false)
enable_auto_scaling = try(pools.enable.auto_scaling, false)
enable_host_encryption = try(pools.enable.host_encryption, false)
availability_zones = try(pools.availability_zones, [])
vnet_subnet_id = try(pools.vnet_subnet_id, null)
workload_runtime = try(pools.workload_runtime, null)
snapshot_id = try(pools.snapshot_id, null)
priority = try(pools.priority, null)
os_type = try(pools.os_type, null)
os_sku = try(pools.os_sku, null)
node_labels = try(pools.node_labels, {})
node_taints = try(pools.node_taints, [])
mode = try(pools.mode, "User")
max_pods = try(pools.max_pods, 30)
kubelet_disk_type = try(pools.kubelet_disk_type, null)
eviction_policy = try(pools.eviction_policy, null)
enable_fips = try(pools.enable.fips, false)
zones = try(pools.zones, null)
enable_node_public_ip = try(pools.enable.node_public_ip, false)
enable_auto_scaling = try(pools.enable.auto_scaling, false)
enable_host_encryption = try(pools.enable.host_encryption, false)
availability_zones = try(pools.availability_zones, [])
vnet_subnet_id = try(pools.vnet_subnet_id, null)
os_disk_size_gb = try(pools.os_disk_size_gb, null)
os_disk_type = try(pools.os_disk_type, null)
orchestrator_version = try(pools.orchestrator_version, null)
message_of_the_day = try(pools.message_of_the_day, null)
host_group_id = try(pools.host_group_id, null)
pod_subnet_id = try(pools.pod_subnet_id, null)
spot_max_price = try(pools.spot_max_price, null)
scale_down_mode = try(pools.scale_down_mode, null)
node_public_ip_prefix_id = try(pools.node_public_ip_prefix_id, null)
proximity_placement_group_id = try(pools.proximity_placement_group_id, null)
capacity_reservation_group_id = try(pools.capacity_reservation_group_id, null)
ultra_ssd_enabled = try(pools.ultra_ssd_enabled, false)

custom_ca_trust = try(pools.custom_ca_trust, false)
tags = try(pools.tags, {})
Expand Down
79 changes: 52 additions & 27 deletions main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -262,18 +262,31 @@ resource "azurerm_kubernetes_cluster" "aks" {
zones = try(var.cluster.default_node_pool.zones, [1, 2, 3])
vnet_subnet_id = try(var.cluster.default_node_pool.vnet_subnet_id, null)
node_labels = try(var.cluster.default_node_pool.node_labels, {})
node_taints = try(var.cluster.default_node_pool.node_taints, [])
tags = try(var.cluster.default_node_pool.tags, {})

custom_ca_trust_enabled = try(var.cluster.default_node_pool.enable.custom_ca_trust, false)
enable_auto_scaling = try(var.cluster.default_node_pool.auto_scaling, false)
enable_host_encryption = try(var.cluster.default_node_pool.enable.host_encryption, false)
enable_node_public_ip = try(var.cluster.default_node_pool.enable.node_public_ip, false)
fips_enabled = try(var.cluster.default_node_pool.enable.fips, null)
only_critical_addons_enabled = try(var.cluster.default_node_pool.enable.only_critical_addons, false)
os_sku = try(var.cluster.default_node_pool.sku, null)
type = try(var.cluster.default_node_pool.type, "VirtualMachineScaleSets")
workload_runtime = try(var.cluster.default_node_pool.workload_runtime, null)
custom_ca_trust_enabled = try(var.cluster.default_node_pool.enable.custom_ca_trust, false)
enable_auto_scaling = try(var.cluster.default_node_pool.auto_scaling, false)
enable_host_encryption = try(var.cluster.default_node_pool.enable.host_encryption, false)
enable_node_public_ip = try(var.cluster.default_node_pool.enable.node_public_ip, false)
fips_enabled = try(var.cluster.default_node_pool.enable.fips, null)
only_critical_addons_enabled = try(var.cluster.default_node_pool.enable.only_critical_addons, false)
os_sku = try(var.cluster.default_node_pool.sku, null)
type = try(var.cluster.default_node_pool.type, "VirtualMachineScaleSets")
workload_runtime = try(var.cluster.default_node_pool.workload_runtime, null)
capacity_reservation_group_id = try(var.cluster.default_node_pool.capacity_reservation_group_id, null)
proximity_placement_group_id = try(var.cluster.default_node_pool.proximity_placement_group_id, null)
node_public_ip_prefix_id = try(var.cluster.default_node_pool.node_public_ip_prefix_id, null)
scale_down_mode = try(var.cluster.default_node_pool.scale_down_mode, null)
pod_subnet_id = try(var.cluster.default_node_pool.pod_subnet_id, null)
host_group_id = try(var.cluster.default_node_pool.host_group_id, null)
message_of_the_day = try(var.cluster.default_node_pool.message_of_the_day, null)
ultra_ssd_enabled = try(var.cluster.default_node_pool.ultra_ssd_enabled, false)
orchestrator_version = try(var.cluster.default_node_pool.orchestrator_version, null)
os_disk_type = try(var.cluster.default_node_pool.os_disk_type, null)
os_disk_size_gb = try(var.cluster.default_node_pool.os_disk_size_gb, null)
kubelet_disk_type = try(var.cluster.default_node_pool.kubelet_disk_type, null)
snapshot_id = try(var.cluster.default_node_pool.snapshot_id, null)
temporary_name_for_rotation = try(var.cluster.default_node_pool.temporary_name_for_rotation, null)

dynamic "upgrade_settings" {
for_each = {
Expand Down Expand Up @@ -411,23 +424,35 @@ resource "azurerm_kubernetes_cluster_node_pool" "pools" {
node_count = each.value.node_count
custom_ca_trust_enabled = each.value.custom_ca_trust

zones = each.value.availability_zones
enable_auto_scaling = each.value.enable_auto_scaling
enable_host_encryption = each.value.enable_host_encryption
enable_node_public_ip = each.value.enable_node_public_ip
fips_enabled = each.value.enable_fips
eviction_policy = each.value.eviction_policy
kubelet_disk_type = each.value.kubelet_disk_type
max_pods = each.value.max_pods
mode = each.value.mode
node_labels = each.value.node_labels
node_taints = each.value.node_taints
os_sku = each.value.os_sku
os_type = each.value.os_type
priority = each.value.priority
snapshot_id = each.value.snapshot_id
workload_runtime = each.value.workload_runtime
vnet_subnet_id = each.value.vnet_subnet_id
zones = each.value.availability_zones
enable_auto_scaling = each.value.enable_auto_scaling
enable_host_encryption = each.value.enable_host_encryption
enable_node_public_ip = each.value.enable_node_public_ip
fips_enabled = each.value.enable_fips
eviction_policy = each.value.eviction_policy
kubelet_disk_type = each.value.kubelet_disk_type
os_disk_size_gb = each.value.os_disk_size_gb
os_disk_type = each.value.os_disk_type
orchestrator_version = each.value.orchestrator_version
ultra_ssd_enabled = each.value.ultra_ssd_enabled
message_of_the_day = each.value.message_of_the_day
host_group_id = each.value.host_group_id
pod_subnet_id = each.value.pod_subnet_id
spot_max_price = each.value.spot_max_price
scale_down_mode = each.value.scale_down_mode
node_public_ip_prefix_id = each.value.node_public_ip_prefix_id
proximity_placement_group_id = each.value.proximity_placement_group_id
capacity_reservation_group_id = each.value.capacity_reservation_group_id
max_pods = each.value.max_pods
mode = each.value.mode
node_labels = each.value.node_labels
node_taints = each.value.node_taints
os_sku = each.value.os_sku
os_type = each.value.os_type
priority = each.value.priority
snapshot_id = each.value.snapshot_id
workload_runtime = each.value.workload_runtime
vnet_subnet_id = each.value.vnet_subnet_id

dynamic "windows_profile" {
for_each = each.value.os_type == "windows" ? [1] : []
Expand Down

0 comments on commit 29a155f

Please sign in to comment.