Skip to content

Commit 45cb295

Browse files
wyardleywyardley
committed
fix: use correct enum value for insecureKubeletReadonlyPortEnabled
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 #2013
1 parent cccabcb commit 45cb295

File tree

11 files changed

+27
-25
lines changed

11 files changed

+27
-25
lines changed

‎autogen/main/cluster.tf.tmpl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -679,7 +679,7 @@ resource "google_container_cluster" "primary" {
679679
enabled = var.enable_gcfs
680680
}
681681
{% endif %}
682-
insecure_kubelet_readonly_port_enabled = var.insecure_kubelet_readonly_port_enabled != null ? var.insecure_kubelet_readonly_port_enabled : null
682+
insecure_kubelet_readonly_port_enabled = var.insecure_kubelet_readonly_port_enabled != null ? upper(tostring(var.insecure_kubelet_readonly_port_enabled)) : null
683683
{% endif %}
684684
}
685685
}
@@ -1054,7 +1054,7 @@ resource "google_container_node_pool" "windows_pools" {
10541054
cpu_manager_policy = lookup(each.value, "cpu_manager_policy", "static")
10551055
cpu_cfs_quota = lookup(each.value, "cpu_cfs_quota", null)
10561056
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)
1057+
insecure_kubelet_readonly_port_enabled = lookup(each.value, "insecure_kubelet_readonly_port_enabled", var.insecure_kubelet_readonly_port_enabled != null ? upper(tostring(var.insecure_kubelet_readonly_port_enabled)) : null)
10581058
pod_pids_limit = lookup(each.value, "pod_pids_limit", null)
10591059
}
10601060
}

‎cluster.tf‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -503,7 +503,7 @@ resource "google_container_cluster" "primary" {
503503

504504
node_pool_defaults {
505505
node_config_defaults {
506-
insecure_kubelet_readonly_port_enabled = var.insecure_kubelet_readonly_port_enabled != null ? var.insecure_kubelet_readonly_port_enabled : null
506+
insecure_kubelet_readonly_port_enabled = var.insecure_kubelet_readonly_port_enabled != null ? upper(tostring(var.insecure_kubelet_readonly_port_enabled)) : null
507507
}
508508
}
509509

@@ -753,7 +753,7 @@ resource "google_container_node_pool" "pools" {
753753
cpu_manager_policy = lookup(each.value, "cpu_manager_policy", "static")
754754
cpu_cfs_quota = lookup(each.value, "cpu_cfs_quota", null)
755755
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)
756+
insecure_kubelet_readonly_port_enabled = lookup(each.value, "insecure_kubelet_readonly_port_enabled", var.insecure_kubelet_readonly_port_enabled != null ? upper(tostring(var.insecure_kubelet_readonly_port_enabled)) : null)
757757
pod_pids_limit = lookup(each.value, "pod_pids_limit", null)
758758
}
759759
}
@@ -1044,7 +1044,7 @@ resource "google_container_node_pool" "windows_pools" {
10441044
cpu_manager_policy = lookup(each.value, "cpu_manager_policy", "static")
10451045
cpu_cfs_quota = lookup(each.value, "cpu_cfs_quota", null)
10461046
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)
1047+
insecure_kubelet_readonly_port_enabled = lookup(each.value, "insecure_kubelet_readonly_port_enabled", var.insecure_kubelet_readonly_port_enabled != null ? upper(tostring(var.insecure_kubelet_readonly_port_enabled)) : null)
10481048
pod_pids_limit = lookup(each.value, "pod_pids_limit", null)
10491049
}
10501050
}

‎examples/node_pool/main.tf‎

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 1 addition & 1 deletion
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‎

Lines changed: 2 additions & 0 deletions
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‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -581,7 +581,7 @@ resource "google_container_cluster" "primary" {
581581
gcfs_config {
582582
enabled = var.enable_gcfs
583583
}
584-
insecure_kubelet_readonly_port_enabled = var.insecure_kubelet_readonly_port_enabled != null ? var.insecure_kubelet_readonly_port_enabled : null
584+
insecure_kubelet_readonly_port_enabled = var.insecure_kubelet_readonly_port_enabled != null ? upper(tostring(var.insecure_kubelet_readonly_port_enabled)) : null
585585
}
586586
}
587587

@@ -923,7 +923,7 @@ resource "google_container_node_pool" "pools" {
923923
cpu_manager_policy = lookup(each.value, "cpu_manager_policy", "static")
924924
cpu_cfs_quota = lookup(each.value, "cpu_cfs_quota", null)
925925
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)
926+
insecure_kubelet_readonly_port_enabled = lookup(each.value, "insecure_kubelet_readonly_port_enabled", var.insecure_kubelet_readonly_port_enabled != null ? upper(tostring(var.insecure_kubelet_readonly_port_enabled)) : null)
927927
pod_pids_limit = lookup(each.value, "pod_pids_limit", null)
928928
}
929929
}
@@ -1228,7 +1228,7 @@ resource "google_container_node_pool" "windows_pools" {
12281228
cpu_manager_policy = lookup(each.value, "cpu_manager_policy", "static")
12291229
cpu_cfs_quota = lookup(each.value, "cpu_cfs_quota", null)
12301230
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)
1231+
insecure_kubelet_readonly_port_enabled = lookup(each.value, "insecure_kubelet_readonly_port_enabled", var.insecure_kubelet_readonly_port_enabled != null ? upper(tostring(var.insecure_kubelet_readonly_port_enabled)) : null)
12321232
pod_pids_limit = lookup(each.value, "pod_pids_limit", null)
12331233
}
12341234
}

‎modules/beta-private-cluster/cluster.tf‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -581,7 +581,7 @@ resource "google_container_cluster" "primary" {
581581
gcfs_config {
582582
enabled = var.enable_gcfs
583583
}
584-
insecure_kubelet_readonly_port_enabled = var.insecure_kubelet_readonly_port_enabled != null ? var.insecure_kubelet_readonly_port_enabled : null
584+
insecure_kubelet_readonly_port_enabled = var.insecure_kubelet_readonly_port_enabled != null ? upper(tostring(var.insecure_kubelet_readonly_port_enabled)) : null
585585
}
586586
}
587587

@@ -838,7 +838,7 @@ resource "google_container_node_pool" "pools" {
838838
cpu_manager_policy = lookup(each.value, "cpu_manager_policy", "static")
839839
cpu_cfs_quota = lookup(each.value, "cpu_cfs_quota", null)
840840
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)
841+
insecure_kubelet_readonly_port_enabled = lookup(each.value, "insecure_kubelet_readonly_port_enabled", var.insecure_kubelet_readonly_port_enabled != null ? upper(tostring(var.insecure_kubelet_readonly_port_enabled)) : null)
842842
pod_pids_limit = lookup(each.value, "pod_pids_limit", null)
843843
}
844844
}
@@ -1142,7 +1142,7 @@ resource "google_container_node_pool" "windows_pools" {
11421142
cpu_manager_policy = lookup(each.value, "cpu_manager_policy", "static")
11431143
cpu_cfs_quota = lookup(each.value, "cpu_cfs_quota", null)
11441144
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)
1145+
insecure_kubelet_readonly_port_enabled = lookup(each.value, "insecure_kubelet_readonly_port_enabled", var.insecure_kubelet_readonly_port_enabled != null ? upper(tostring(var.insecure_kubelet_readonly_port_enabled)) : null)
11461146
pod_pids_limit = lookup(each.value, "pod_pids_limit", null)
11471147
}
11481148
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -560,7 +560,7 @@ resource "google_container_cluster" "primary" {
560560
gcfs_config {
561561
enabled = var.enable_gcfs
562562
}
563-
insecure_kubelet_readonly_port_enabled = var.insecure_kubelet_readonly_port_enabled != null ? var.insecure_kubelet_readonly_port_enabled : null
563+
insecure_kubelet_readonly_port_enabled = var.insecure_kubelet_readonly_port_enabled != null ? upper(tostring(var.insecure_kubelet_readonly_port_enabled)) : null
564564
}
565565
}
566566

@@ -902,7 +902,7 @@ resource "google_container_node_pool" "pools" {
902902
cpu_manager_policy = lookup(each.value, "cpu_manager_policy", "static")
903903
cpu_cfs_quota = lookup(each.value, "cpu_cfs_quota", null)
904904
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)
905+
insecure_kubelet_readonly_port_enabled = lookup(each.value, "insecure_kubelet_readonly_port_enabled", var.insecure_kubelet_readonly_port_enabled != null ? upper(tostring(var.insecure_kubelet_readonly_port_enabled)) : null)
906906
pod_pids_limit = lookup(each.value, "pod_pids_limit", null)
907907
}
908908
}
@@ -1207,7 +1207,7 @@ resource "google_container_node_pool" "windows_pools" {
12071207
cpu_manager_policy = lookup(each.value, "cpu_manager_policy", "static")
12081208
cpu_cfs_quota = lookup(each.value, "cpu_cfs_quota", null)
12091209
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)
1210+
insecure_kubelet_readonly_port_enabled = lookup(each.value, "insecure_kubelet_readonly_port_enabled", var.insecure_kubelet_readonly_port_enabled != null ? upper(tostring(var.insecure_kubelet_readonly_port_enabled)) : null)
12111211
pod_pids_limit = lookup(each.value, "pod_pids_limit", null)
12121212
}
12131213
}

‎modules/beta-public-cluster/cluster.tf‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -560,7 +560,7 @@ resource "google_container_cluster" "primary" {
560560
gcfs_config {
561561
enabled = var.enable_gcfs
562562
}
563-
insecure_kubelet_readonly_port_enabled = var.insecure_kubelet_readonly_port_enabled != null ? var.insecure_kubelet_readonly_port_enabled : null
563+
insecure_kubelet_readonly_port_enabled = var.insecure_kubelet_readonly_port_enabled != null ? upper(tostring(var.insecure_kubelet_readonly_port_enabled)) : null
564564
}
565565
}
566566

@@ -817,7 +817,7 @@ resource "google_container_node_pool" "pools" {
817817
cpu_manager_policy = lookup(each.value, "cpu_manager_policy", "static")
818818
cpu_cfs_quota = lookup(each.value, "cpu_cfs_quota", null)
819819
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)
820+
insecure_kubelet_readonly_port_enabled = lookup(each.value, "insecure_kubelet_readonly_port_enabled", var.insecure_kubelet_readonly_port_enabled != null ? upper(tostring(var.insecure_kubelet_readonly_port_enabled)) : null)
821821
pod_pids_limit = lookup(each.value, "pod_pids_limit", null)
822822
}
823823
}
@@ -1121,7 +1121,7 @@ resource "google_container_node_pool" "windows_pools" {
11211121
cpu_manager_policy = lookup(each.value, "cpu_manager_policy", "static")
11221122
cpu_cfs_quota = lookup(each.value, "cpu_cfs_quota", null)
11231123
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)
1124+
insecure_kubelet_readonly_port_enabled = lookup(each.value, "insecure_kubelet_readonly_port_enabled", var.insecure_kubelet_readonly_port_enabled != null ? upper(tostring(var.insecure_kubelet_readonly_port_enabled)) : null)
11251125
pod_pids_limit = lookup(each.value, "pod_pids_limit", null)
11261126
}
11271127
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -524,7 +524,7 @@ resource "google_container_cluster" "primary" {
524524

525525
node_pool_defaults {
526526
node_config_defaults {
527-
insecure_kubelet_readonly_port_enabled = var.insecure_kubelet_readonly_port_enabled != null ? var.insecure_kubelet_readonly_port_enabled : null
527+
insecure_kubelet_readonly_port_enabled = var.insecure_kubelet_readonly_port_enabled != null ? upper(tostring(var.insecure_kubelet_readonly_port_enabled)) : null
528528
}
529529
}
530530

@@ -858,7 +858,7 @@ resource "google_container_node_pool" "pools" {
858858
cpu_manager_policy = lookup(each.value, "cpu_manager_policy", "static")
859859
cpu_cfs_quota = lookup(each.value, "cpu_cfs_quota", null)
860860
cpu_cfs_quota_period = lookup(each.value, "cpu_cfs_quota_period", null)
861-
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)
861+
insecure_kubelet_readonly_port_enabled = lookup(each.value, "insecure_kubelet_readonly_port_enabled", var.insecure_kubelet_readonly_port_enabled != null ? upper(tostring(var.insecure_kubelet_readonly_port_enabled)) : null)
862862
pod_pids_limit = lookup(each.value, "pod_pids_limit", null)
863863
}
864864
}
@@ -1150,7 +1150,7 @@ resource "google_container_node_pool" "windows_pools" {
11501150
cpu_manager_policy = lookup(each.value, "cpu_manager_policy", "static")
11511151
cpu_cfs_quota = lookup(each.value, "cpu_cfs_quota", null)
11521152
cpu_cfs_quota_period = lookup(each.value, "cpu_cfs_quota_period", null)
1153-
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)
1153+
insecure_kubelet_readonly_port_enabled = lookup(each.value, "insecure_kubelet_readonly_port_enabled", var.insecure_kubelet_readonly_port_enabled != null ? upper(tostring(var.insecure_kubelet_readonly_port_enabled)) : null)
11541154
pod_pids_limit = lookup(each.value, "pod_pids_limit", null)
11551155
}
11561156
}

0 commit comments

Comments
 (0)