Skip to content

Commit bd221b2

Browse files
wyardleyapeabody
andcommitted
fix: add insecureKubeletReadonlyPortEnabled to node_config
Add `insecureKubeletReadonlyPortEnabled` to `node_config.kubelet_config` for the default node-pool and for additional pools. It may also be necessary to define the top level `node_config` more broadly for the case where `remove_default_node_pool` is set to false, which should probably be handled separately. Also, the upstream provider (intentionally) uses an enum of `"TRUE"` / `"FALSE"` vs. a boolean. Update the code to follow this, and add a test case that covers the cluster level setting vs node pool one. Fixes terraform-google-modules#2013 Co-authored-by: Andrew Peabody <[email protected]>
1 parent cccabcb commit bd221b2

File tree

12 files changed

+110
-25
lines changed

12 files changed

+110
-25
lines changed

autogen/main/cluster.tf.tmpl

+12-2
Original file line numberDiff line numberDiff line change
@@ -530,6 +530,16 @@ resource "google_container_cluster" "primary" {
530530
}
531531
}
532532

533+
# In the case of the default pool use the module level variable as a
534+
# fallback if it's not set explicitly for this pool.
535+
dynamic "kubelet_config" {
536+
for_each = lookup(var.node_pools[0], "insecure_kubelet_readonly_port_enabled", var.insecure_kubelet_readonly_port_enabled) != null ? [lookup(var.node_pools[0], "insecure_kubelet_readonly_port_enabled", var.insecure_kubelet_readonly_port_enabled)] : []
537+
538+
content {
539+
insecure_kubelet_readonly_port_enabled = upper(tostring(kubelet_config.value))
540+
}
541+
}
542+
533543
service_account = lookup(var.node_pools[0], "service_account", local.service_account)
534544

535545
tags = concat(
@@ -679,7 +689,7 @@ resource "google_container_cluster" "primary" {
679689
enabled = var.enable_gcfs
680690
}
681691
{% endif %}
682-
insecure_kubelet_readonly_port_enabled = var.insecure_kubelet_readonly_port_enabled != null ? var.insecure_kubelet_readonly_port_enabled : null
692+
insecure_kubelet_readonly_port_enabled = var.insecure_kubelet_readonly_port_enabled != null ? upper(tostring(var.insecure_kubelet_readonly_port_enabled)) : null
683693
{% endif %}
684694
}
685695
}
@@ -1054,7 +1064,7 @@ resource "google_container_node_pool" "windows_pools" {
10541064
cpu_manager_policy = lookup(each.value, "cpu_manager_policy", "static")
10551065
cpu_cfs_quota = lookup(each.value, "cpu_cfs_quota", null)
10561066
cpu_cfs_quota_period = lookup(each.value, "cpu_cfs_quota_period", null)
1057-
insecure_kubelet_readonly_port_enabled = lookup(each.value, "insecure_kubelet_readonly_port_enabled", var.insecure_kubelet_readonly_port_enabled != null ? var.insecure_kubelet_readonly_port_enabled : null)
1067+
insecure_kubelet_readonly_port_enabled = lookup(each.value, "insecure_kubelet_readonly_port_enabled", null) != null ? upper(tostring(each.value.insecure_kubelet_readonly_port_enabled)) : null
10581068
pod_pids_limit = lookup(each.value, "pod_pids_limit", null)
10591069
}
10601070
}

cluster.tf

+13-3
Original file line numberDiff line numberDiff line change
@@ -407,6 +407,16 @@ resource "google_container_cluster" "primary" {
407407
}
408408
}
409409

410+
# In the case of the default pool use the module level variable as a
411+
# fallback if it's not set explicitly for this pool.
412+
dynamic "kubelet_config" {
413+
for_each = lookup(var.node_pools[0], "insecure_kubelet_readonly_port_enabled", var.insecure_kubelet_readonly_port_enabled) != null ? [lookup(var.node_pools[0], "insecure_kubelet_readonly_port_enabled", var.insecure_kubelet_readonly_port_enabled)] : []
414+
415+
content {
416+
insecure_kubelet_readonly_port_enabled = upper(tostring(kubelet_config.value))
417+
}
418+
}
419+
410420
service_account = lookup(var.node_pools[0], "service_account", local.service_account)
411421

412422
tags = concat(
@@ -503,7 +513,7 @@ resource "google_container_cluster" "primary" {
503513

504514
node_pool_defaults {
505515
node_config_defaults {
506-
insecure_kubelet_readonly_port_enabled = var.insecure_kubelet_readonly_port_enabled != null ? var.insecure_kubelet_readonly_port_enabled : null
516+
insecure_kubelet_readonly_port_enabled = var.insecure_kubelet_readonly_port_enabled != null ? upper(tostring(var.insecure_kubelet_readonly_port_enabled)) : null
507517
}
508518
}
509519

@@ -753,7 +763,7 @@ resource "google_container_node_pool" "pools" {
753763
cpu_manager_policy = lookup(each.value, "cpu_manager_policy", "static")
754764
cpu_cfs_quota = lookup(each.value, "cpu_cfs_quota", null)
755765
cpu_cfs_quota_period = lookup(each.value, "cpu_cfs_quota_period", null)
756-
insecure_kubelet_readonly_port_enabled = lookup(each.value, "insecure_kubelet_readonly_port_enabled", var.insecure_kubelet_readonly_port_enabled != null ? var.insecure_kubelet_readonly_port_enabled : null)
766+
insecure_kubelet_readonly_port_enabled = lookup(each.value, "insecure_kubelet_readonly_port_enabled", null) != null ? upper(tostring(each.value.insecure_kubelet_readonly_port_enabled)) : null
757767
pod_pids_limit = lookup(each.value, "pod_pids_limit", null)
758768
}
759769
}
@@ -1044,7 +1054,7 @@ resource "google_container_node_pool" "windows_pools" {
10441054
cpu_manager_policy = lookup(each.value, "cpu_manager_policy", "static")
10451055
cpu_cfs_quota = lookup(each.value, "cpu_cfs_quota", null)
10461056
cpu_cfs_quota_period = lookup(each.value, "cpu_cfs_quota_period", null)
1047-
insecure_kubelet_readonly_port_enabled = lookup(each.value, "insecure_kubelet_readonly_port_enabled", var.insecure_kubelet_readonly_port_enabled != null ? var.insecure_kubelet_readonly_port_enabled : null)
1057+
insecure_kubelet_readonly_port_enabled = lookup(each.value, "insecure_kubelet_readonly_port_enabled", null) != null ? upper(tostring(each.value.insecure_kubelet_readonly_port_enabled)) : null
10481058
pod_pids_limit = lookup(each.value, "pod_pids_limit", null)
10491059
}
10501060
}

examples/node_pool/main.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ module "gke" {
7979
sandbox_enabled = true
8080
cpu_manager_policy = "static"
8181
cpu_cfs_quota = true
82-
insecure_kubelet_readonly_port_enabled = "FALSE"
82+
insecure_kubelet_readonly_port_enabled = false
8383
local_ssd_ephemeral_count = 2
8484
pod_pids_limit = 4096
8585
},

examples/node_pool_update_variant/main.tf

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ module "gke" {
6666
max_count = 2
6767
service_account = var.compute_engine_service_account
6868
auto_upgrade = true
69-
insecure_kubelet_readonly_port_enabled = "FALSE"
69+
insecure_kubelet_readonly_port_enabled = false
7070
},
7171
{
7272
name = "pool-02"

examples/private_zonal_with_networking/main.tf

+2
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,8 @@ module "gke" {
7979
master_ipv4_cidr_block = "172.16.0.0/28"
8080
deletion_protection = false
8181

82+
insecure_kubelet_readonly_port_enabled = false
83+
8284
master_authorized_networks = [
8385
{
8486
cidr_block = data.google_compute_subnetwork.subnetwork.ip_cidr_range

modules/beta-private-cluster-update-variant/cluster.tf

+13-3
Original file line numberDiff line numberDiff line change
@@ -453,6 +453,16 @@ resource "google_container_cluster" "primary" {
453453
}
454454
}
455455

456+
# In the case of the default pool use the module level variable as a
457+
# fallback if it's not set explicitly for this pool.
458+
dynamic "kubelet_config" {
459+
for_each = lookup(var.node_pools[0], "insecure_kubelet_readonly_port_enabled", var.insecure_kubelet_readonly_port_enabled) != null ? [lookup(var.node_pools[0], "insecure_kubelet_readonly_port_enabled", var.insecure_kubelet_readonly_port_enabled)] : []
460+
461+
content {
462+
insecure_kubelet_readonly_port_enabled = upper(tostring(kubelet_config.value))
463+
}
464+
}
465+
456466
service_account = lookup(var.node_pools[0], "service_account", local.service_account)
457467

458468
tags = concat(
@@ -581,7 +591,7 @@ resource "google_container_cluster" "primary" {
581591
gcfs_config {
582592
enabled = var.enable_gcfs
583593
}
584-
insecure_kubelet_readonly_port_enabled = var.insecure_kubelet_readonly_port_enabled != null ? var.insecure_kubelet_readonly_port_enabled : null
594+
insecure_kubelet_readonly_port_enabled = var.insecure_kubelet_readonly_port_enabled != null ? upper(tostring(var.insecure_kubelet_readonly_port_enabled)) : null
585595
}
586596
}
587597

@@ -923,7 +933,7 @@ resource "google_container_node_pool" "pools" {
923933
cpu_manager_policy = lookup(each.value, "cpu_manager_policy", "static")
924934
cpu_cfs_quota = lookup(each.value, "cpu_cfs_quota", null)
925935
cpu_cfs_quota_period = lookup(each.value, "cpu_cfs_quota_period", null)
926-
insecure_kubelet_readonly_port_enabled = lookup(each.value, "insecure_kubelet_readonly_port_enabled", var.insecure_kubelet_readonly_port_enabled != null ? var.insecure_kubelet_readonly_port_enabled : null)
936+
insecure_kubelet_readonly_port_enabled = lookup(each.value, "insecure_kubelet_readonly_port_enabled", null) != null ? upper(tostring(each.value.insecure_kubelet_readonly_port_enabled)) : null
927937
pod_pids_limit = lookup(each.value, "pod_pids_limit", null)
928938
}
929939
}
@@ -1228,7 +1238,7 @@ resource "google_container_node_pool" "windows_pools" {
12281238
cpu_manager_policy = lookup(each.value, "cpu_manager_policy", "static")
12291239
cpu_cfs_quota = lookup(each.value, "cpu_cfs_quota", null)
12301240
cpu_cfs_quota_period = lookup(each.value, "cpu_cfs_quota_period", null)
1231-
insecure_kubelet_readonly_port_enabled = lookup(each.value, "insecure_kubelet_readonly_port_enabled", var.insecure_kubelet_readonly_port_enabled != null ? var.insecure_kubelet_readonly_port_enabled : null)
1241+
insecure_kubelet_readonly_port_enabled = lookup(each.value, "insecure_kubelet_readonly_port_enabled", null) != null ? upper(tostring(each.value.insecure_kubelet_readonly_port_enabled)) : null
12321242
pod_pids_limit = lookup(each.value, "pod_pids_limit", null)
12331243
}
12341244
}

modules/beta-private-cluster/cluster.tf

+13-3
Original file line numberDiff line numberDiff line change
@@ -453,6 +453,16 @@ resource "google_container_cluster" "primary" {
453453
}
454454
}
455455

456+
# In the case of the default pool use the module level variable as a
457+
# fallback if it's not set explicitly for this pool.
458+
dynamic "kubelet_config" {
459+
for_each = lookup(var.node_pools[0], "insecure_kubelet_readonly_port_enabled", var.insecure_kubelet_readonly_port_enabled) != null ? [lookup(var.node_pools[0], "insecure_kubelet_readonly_port_enabled", var.insecure_kubelet_readonly_port_enabled)] : []
460+
461+
content {
462+
insecure_kubelet_readonly_port_enabled = upper(tostring(kubelet_config.value))
463+
}
464+
}
465+
456466
service_account = lookup(var.node_pools[0], "service_account", local.service_account)
457467

458468
tags = concat(
@@ -581,7 +591,7 @@ resource "google_container_cluster" "primary" {
581591
gcfs_config {
582592
enabled = var.enable_gcfs
583593
}
584-
insecure_kubelet_readonly_port_enabled = var.insecure_kubelet_readonly_port_enabled != null ? var.insecure_kubelet_readonly_port_enabled : null
594+
insecure_kubelet_readonly_port_enabled = var.insecure_kubelet_readonly_port_enabled != null ? upper(tostring(var.insecure_kubelet_readonly_port_enabled)) : null
585595
}
586596
}
587597

@@ -838,7 +848,7 @@ resource "google_container_node_pool" "pools" {
838848
cpu_manager_policy = lookup(each.value, "cpu_manager_policy", "static")
839849
cpu_cfs_quota = lookup(each.value, "cpu_cfs_quota", null)
840850
cpu_cfs_quota_period = lookup(each.value, "cpu_cfs_quota_period", null)
841-
insecure_kubelet_readonly_port_enabled = lookup(each.value, "insecure_kubelet_readonly_port_enabled", var.insecure_kubelet_readonly_port_enabled != null ? var.insecure_kubelet_readonly_port_enabled : null)
851+
insecure_kubelet_readonly_port_enabled = lookup(each.value, "insecure_kubelet_readonly_port_enabled", null) != null ? upper(tostring(each.value.insecure_kubelet_readonly_port_enabled)) : null
842852
pod_pids_limit = lookup(each.value, "pod_pids_limit", null)
843853
}
844854
}
@@ -1142,7 +1152,7 @@ resource "google_container_node_pool" "windows_pools" {
11421152
cpu_manager_policy = lookup(each.value, "cpu_manager_policy", "static")
11431153
cpu_cfs_quota = lookup(each.value, "cpu_cfs_quota", null)
11441154
cpu_cfs_quota_period = lookup(each.value, "cpu_cfs_quota_period", null)
1145-
insecure_kubelet_readonly_port_enabled = lookup(each.value, "insecure_kubelet_readonly_port_enabled", var.insecure_kubelet_readonly_port_enabled != null ? var.insecure_kubelet_readonly_port_enabled : null)
1155+
insecure_kubelet_readonly_port_enabled = lookup(each.value, "insecure_kubelet_readonly_port_enabled", null) != null ? upper(tostring(each.value.insecure_kubelet_readonly_port_enabled)) : null
11461156
pod_pids_limit = lookup(each.value, "pod_pids_limit", null)
11471157
}
11481158
}

modules/beta-public-cluster-update-variant/cluster.tf

+13-3
Original file line numberDiff line numberDiff line change
@@ -453,6 +453,16 @@ resource "google_container_cluster" "primary" {
453453
}
454454
}
455455

456+
# In the case of the default pool use the module level variable as a
457+
# fallback if it's not set explicitly for this pool.
458+
dynamic "kubelet_config" {
459+
for_each = lookup(var.node_pools[0], "insecure_kubelet_readonly_port_enabled", var.insecure_kubelet_readonly_port_enabled) != null ? [lookup(var.node_pools[0], "insecure_kubelet_readonly_port_enabled", var.insecure_kubelet_readonly_port_enabled)] : []
460+
461+
content {
462+
insecure_kubelet_readonly_port_enabled = upper(tostring(kubelet_config.value))
463+
}
464+
}
465+
456466
service_account = lookup(var.node_pools[0], "service_account", local.service_account)
457467

458468
tags = concat(
@@ -560,7 +570,7 @@ resource "google_container_cluster" "primary" {
560570
gcfs_config {
561571
enabled = var.enable_gcfs
562572
}
563-
insecure_kubelet_readonly_port_enabled = var.insecure_kubelet_readonly_port_enabled != null ? var.insecure_kubelet_readonly_port_enabled : null
573+
insecure_kubelet_readonly_port_enabled = var.insecure_kubelet_readonly_port_enabled != null ? upper(tostring(var.insecure_kubelet_readonly_port_enabled)) : null
564574
}
565575
}
566576

@@ -902,7 +912,7 @@ resource "google_container_node_pool" "pools" {
902912
cpu_manager_policy = lookup(each.value, "cpu_manager_policy", "static")
903913
cpu_cfs_quota = lookup(each.value, "cpu_cfs_quota", null)
904914
cpu_cfs_quota_period = lookup(each.value, "cpu_cfs_quota_period", null)
905-
insecure_kubelet_readonly_port_enabled = lookup(each.value, "insecure_kubelet_readonly_port_enabled", var.insecure_kubelet_readonly_port_enabled != null ? var.insecure_kubelet_readonly_port_enabled : null)
915+
insecure_kubelet_readonly_port_enabled = lookup(each.value, "insecure_kubelet_readonly_port_enabled", null) != null ? upper(tostring(each.value.insecure_kubelet_readonly_port_enabled)) : null
906916
pod_pids_limit = lookup(each.value, "pod_pids_limit", null)
907917
}
908918
}
@@ -1207,7 +1217,7 @@ resource "google_container_node_pool" "windows_pools" {
12071217
cpu_manager_policy = lookup(each.value, "cpu_manager_policy", "static")
12081218
cpu_cfs_quota = lookup(each.value, "cpu_cfs_quota", null)
12091219
cpu_cfs_quota_period = lookup(each.value, "cpu_cfs_quota_period", null)
1210-
insecure_kubelet_readonly_port_enabled = lookup(each.value, "insecure_kubelet_readonly_port_enabled", var.insecure_kubelet_readonly_port_enabled != null ? var.insecure_kubelet_readonly_port_enabled : null)
1220+
insecure_kubelet_readonly_port_enabled = lookup(each.value, "insecure_kubelet_readonly_port_enabled", null) != null ? upper(tostring(each.value.insecure_kubelet_readonly_port_enabled)) : null
12111221
pod_pids_limit = lookup(each.value, "pod_pids_limit", null)
12121222
}
12131223
}

modules/beta-public-cluster/cluster.tf

+13-3
Original file line numberDiff line numberDiff line change
@@ -453,6 +453,16 @@ resource "google_container_cluster" "primary" {
453453
}
454454
}
455455

456+
# In the case of the default pool use the module level variable as a
457+
# fallback if it's not set explicitly for this pool.
458+
dynamic "kubelet_config" {
459+
for_each = lookup(var.node_pools[0], "insecure_kubelet_readonly_port_enabled", var.insecure_kubelet_readonly_port_enabled) != null ? [lookup(var.node_pools[0], "insecure_kubelet_readonly_port_enabled", var.insecure_kubelet_readonly_port_enabled)] : []
460+
461+
content {
462+
insecure_kubelet_readonly_port_enabled = upper(tostring(kubelet_config.value))
463+
}
464+
}
465+
456466
service_account = lookup(var.node_pools[0], "service_account", local.service_account)
457467

458468
tags = concat(
@@ -560,7 +570,7 @@ resource "google_container_cluster" "primary" {
560570
gcfs_config {
561571
enabled = var.enable_gcfs
562572
}
563-
insecure_kubelet_readonly_port_enabled = var.insecure_kubelet_readonly_port_enabled != null ? var.insecure_kubelet_readonly_port_enabled : null
573+
insecure_kubelet_readonly_port_enabled = var.insecure_kubelet_readonly_port_enabled != null ? upper(tostring(var.insecure_kubelet_readonly_port_enabled)) : null
564574
}
565575
}
566576

@@ -817,7 +827,7 @@ resource "google_container_node_pool" "pools" {
817827
cpu_manager_policy = lookup(each.value, "cpu_manager_policy", "static")
818828
cpu_cfs_quota = lookup(each.value, "cpu_cfs_quota", null)
819829
cpu_cfs_quota_period = lookup(each.value, "cpu_cfs_quota_period", null)
820-
insecure_kubelet_readonly_port_enabled = lookup(each.value, "insecure_kubelet_readonly_port_enabled", var.insecure_kubelet_readonly_port_enabled != null ? var.insecure_kubelet_readonly_port_enabled : null)
830+
insecure_kubelet_readonly_port_enabled = lookup(each.value, "insecure_kubelet_readonly_port_enabled", null) != null ? upper(tostring(each.value.insecure_kubelet_readonly_port_enabled)) : null
821831
pod_pids_limit = lookup(each.value, "pod_pids_limit", null)
822832
}
823833
}
@@ -1121,7 +1131,7 @@ resource "google_container_node_pool" "windows_pools" {
11211131
cpu_manager_policy = lookup(each.value, "cpu_manager_policy", "static")
11221132
cpu_cfs_quota = lookup(each.value, "cpu_cfs_quota", null)
11231133
cpu_cfs_quota_period = lookup(each.value, "cpu_cfs_quota_period", null)
1124-
insecure_kubelet_readonly_port_enabled = lookup(each.value, "insecure_kubelet_readonly_port_enabled", var.insecure_kubelet_readonly_port_enabled != null ? var.insecure_kubelet_readonly_port_enabled : null)
1134+
insecure_kubelet_readonly_port_enabled = lookup(each.value, "insecure_kubelet_readonly_port_enabled", null) != null ? upper(tostring(each.value.insecure_kubelet_readonly_port_enabled)) : null
11251135
pod_pids_limit = lookup(each.value, "pod_pids_limit", null)
11261136
}
11271137
}

0 commit comments

Comments
 (0)