Skip to content

Commit 1d64f99

Browse files
aaron-laneaaron-lane
authored
Merge pull request #205 from terraform-google-modules/aaron-lane-patch-breaking-migration
Patch breaking changes
2 parents 0382acd + 78662f1 commit 1d64f99

File tree

15 files changed

+108
-85
lines changed

15 files changed

+108
-85
lines changed

‎autogen/cluster_regional.tf‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,7 @@ resource "google_container_cluster" "primary" {
3030
node_locations = ["${coalescelist(compact(var.zones), sort(random_shuffle.available_zones.result))}"]
3131
cluster_ipv4_cidr = "${var.cluster_ipv4_cidr}"
3232
network = "${replace(data.google_compute_network.gke_network.self_link, "https://www.googleapis.com/compute/v1/", "")}"
33-
34-
network_policy {
35-
enabled = "${var.network_policy}"
36-
provider = "${var.network_policy_provider}"
37-
}
33+
network_policy = "${local.cluster_network_policy["${var.network_policy ? "enabled" : "disabled"}"]}"
3834

3935
subnetwork = "${replace(data.google_compute_subnetwork.gke_subnetwork.self_link, "https://www.googleapis.com/compute/v1/", "")}"
4036
min_master_version = "${local.kubernetes_version_regional}"
@@ -79,9 +75,7 @@ resource "google_container_cluster" "primary" {
7975
disabled = "${var.istio ? 0 : 1}"
8076
}
8177

82-
cloudrun_config {
83-
disabled = "${var.cloudrun ? 0 : 1}"
84-
}
78+
cloudrun_config = "${local.cluster_cloudrun_config["${var.cloudrun ? "enabled" : "disabled"}"]}"
8579
{% endif %}
8680
}
8781

‎autogen/cluster_zonal.tf‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,7 @@ resource "google_container_cluster" "zonal_primary" {
3030
node_locations = ["${slice(var.zones,1,length(var.zones))}"]
3131
cluster_ipv4_cidr = "${var.cluster_ipv4_cidr}"
3232
network = "${replace(data.google_compute_network.gke_network.self_link, "https://www.googleapis.com/compute/v1/", "")}"
33-
34-
network_policy {
35-
enabled = "${var.network_policy}"
36-
provider = "${var.network_policy_provider}"
37-
}
33+
network_policy = "${local.cluster_network_policy["${var.network_policy ? "enabled" : "disabled"}"]}"
3834

3935
subnetwork = "${replace(data.google_compute_subnetwork.gke_subnetwork.self_link, "https://www.googleapis.com/compute/v1/", "")}"
4036
min_master_version = "${local.kubernetes_version_zonal}"
@@ -80,9 +76,7 @@ resource "google_container_cluster" "zonal_primary" {
8076
disabled = "${var.istio ? 0 : 1}"
8177
}
8278

83-
cloudrun_config {
84-
disabled = "${var.cloudrun ? 0 : 1}"
85-
}
79+
cloudrun_config = "${local.cluster_cloudrun_config["${var.cloudrun ? "enabled" : "disabled"}"]}"
8680
{% endif %}
8781
}
8882

‎autogen/main.tf‎

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,19 @@ locals {
4040

4141
cluster_type = "${var.regional ? "regional" : "zonal"}"
4242

43+
cluster_network_policy = {
44+
enabled = [{
45+
enabled = "true"
46+
provider = "${var.network_policy_provider}"
47+
}]
48+
disabled = [{enabled = "false"}]
49+
}
50+
51+
cluster_cloudrun_config = {
52+
enabled = [{disabled = "false"}]
53+
disabled = []
54+
}
55+
4356
cluster_type_output_name = {
4457
regional = "${element(concat(google_container_cluster.primary.*.name, list("")), 0)}"
4558
zonal = "${element(concat(google_container_cluster.zonal_primary.*.name, list("")), 0)}"
@@ -136,10 +149,6 @@ locals {
136149
zonal = "${element(concat(google_container_cluster.zonal_primary.*.addons_config.0.istio_config.0.disabled, list("")), 0)}"
137150
}
138151

139-
cluster_type_output_cloudrun_enabled = {
140-
regional = "${element(concat(google_container_cluster.primary.*.addons_config.0.cloudrun_config.0.disabled, list("")), 0)}"
141-
zonal = "${element(concat(google_container_cluster.zonal_primary.*.addons_config.0.cloudrun_config.0.disabled, list("")), 0)}"
142-
}
143152
cluster_type_output_pod_security_policy_enabled = {
144153
regional = "${element(concat(google_container_cluster.primary.*.pod_security_policy_config.0.enabled, list("")), 0)}"
145154
zonal = "${element(concat(google_container_cluster.zonal_primary.*.pod_security_policy_config.0.enabled, list("")), 0)}"
@@ -180,7 +189,7 @@ locals {
180189
{% if beta_cluster %}
181190
# BETA features
182191
cluster_istio_enabled = "${local.cluster_type_output_istio_enabled[local.cluster_type] ? false : true}"
183-
cluster_cloudrun_enabled = "${local.cluster_type_output_cloudrun_enabled[local.cluster_type] ? false : true}"
192+
cluster_cloudrun_enabled = "${var.cloudrun}"
184193

185194
cluster_pod_security_policy_enabled = "${local.cluster_type_output_pod_security_policy_enabled[local.cluster_type] ? true : false}"
186195
# /BETA features

‎cluster_regional.tf‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,7 @@ resource "google_container_cluster" "primary" {
3030
node_locations = ["${coalescelist(compact(var.zones), sort(random_shuffle.available_zones.result))}"]
3131
cluster_ipv4_cidr = "${var.cluster_ipv4_cidr}"
3232
network = "${replace(data.google_compute_network.gke_network.self_link, "https://www.googleapis.com/compute/v1/", "")}"
33-
34-
network_policy {
35-
enabled = "${var.network_policy}"
36-
provider = "${var.network_policy_provider}"
37-
}
33+
network_policy = "${local.cluster_network_policy["${var.network_policy ? "enabled" : "disabled"}"]}"
3834

3935
subnetwork = "${replace(data.google_compute_subnetwork.gke_subnetwork.self_link, "https://www.googleapis.com/compute/v1/", "")}"
4036
min_master_version = "${local.kubernetes_version_regional}"

‎cluster_zonal.tf‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,7 @@ resource "google_container_cluster" "zonal_primary" {
3030
node_locations = ["${slice(var.zones,1,length(var.zones))}"]
3131
cluster_ipv4_cidr = "${var.cluster_ipv4_cidr}"
3232
network = "${replace(data.google_compute_network.gke_network.self_link, "https://www.googleapis.com/compute/v1/", "")}"
33-
34-
network_policy {
35-
enabled = "${var.network_policy}"
36-
provider = "${var.network_policy_provider}"
37-
}
33+
network_policy = "${local.cluster_network_policy["${var.network_policy ? "enabled" : "disabled"}"]}"
3834

3935
subnetwork = "${replace(data.google_compute_subnetwork.gke_subnetwork.self_link, "https://www.googleapis.com/compute/v1/", "")}"
4036
min_master_version = "${local.kubernetes_version_zonal}"

‎main.tf‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,25 @@ locals {
4040

4141
cluster_type = "${var.regional ? "regional" : "zonal"}"
4242

43+
cluster_network_policy = {
44+
enabled = [{
45+
enabled = "true"
46+
provider = "${var.network_policy_provider}"
47+
}]
48+
49+
disabled = [{
50+
enabled = "false"
51+
}]
52+
}
53+
54+
cluster_cloudrun_config = {
55+
enabled = [{
56+
disabled = "false"
57+
}]
58+
59+
disabled = []
60+
}
61+
4362
cluster_type_output_name = {
4463
regional = "${element(concat(google_container_cluster.primary.*.name, list("")), 0)}"
4564
zonal = "${element(concat(google_container_cluster.zonal_primary.*.name, list("")), 0)}"

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

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,7 @@ resource "google_container_cluster" "primary" {
3030
node_locations = ["${coalescelist(compact(var.zones), sort(random_shuffle.available_zones.result))}"]
3131
cluster_ipv4_cidr = "${var.cluster_ipv4_cidr}"
3232
network = "${replace(data.google_compute_network.gke_network.self_link, "https://www.googleapis.com/compute/v1/", "")}"
33-
34-
network_policy {
35-
enabled = "${var.network_policy}"
36-
provider = "${var.network_policy_provider}"
37-
}
33+
network_policy = "${local.cluster_network_policy["${var.network_policy ? "enabled" : "disabled"}"]}"
3834

3935
subnetwork = "${replace(data.google_compute_subnetwork.gke_subnetwork.self_link, "https://www.googleapis.com/compute/v1/", "")}"
4036
min_master_version = "${local.kubernetes_version_regional}"
@@ -76,9 +72,7 @@ resource "google_container_cluster" "primary" {
7672
disabled = "${var.istio ? 0 : 1}"
7773
}
7874

79-
cloudrun_config {
80-
disabled = "${var.cloudrun ? 0 : 1}"
81-
}
75+
cloudrun_config = "${local.cluster_cloudrun_config["${var.cloudrun ? "enabled" : "disabled"}"]}"
8276
}
8377

8478
ip_allocation_policy {

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

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,7 @@ resource "google_container_cluster" "zonal_primary" {
3030
node_locations = ["${slice(var.zones,1,length(var.zones))}"]
3131
cluster_ipv4_cidr = "${var.cluster_ipv4_cidr}"
3232
network = "${replace(data.google_compute_network.gke_network.self_link, "https://www.googleapis.com/compute/v1/", "")}"
33-
34-
network_policy {
35-
enabled = "${var.network_policy}"
36-
provider = "${var.network_policy_provider}"
37-
}
33+
network_policy = "${local.cluster_network_policy["${var.network_policy ? "enabled" : "disabled"}"]}"
3834

3935
subnetwork = "${replace(data.google_compute_subnetwork.gke_subnetwork.self_link, "https://www.googleapis.com/compute/v1/", "")}"
4036
min_master_version = "${local.kubernetes_version_zonal}"
@@ -77,9 +73,7 @@ resource "google_container_cluster" "zonal_primary" {
7773
disabled = "${var.istio ? 0 : 1}"
7874
}
7975

80-
cloudrun_config {
81-
disabled = "${var.cloudrun ? 0 : 1}"
82-
}
76+
cloudrun_config = "${local.cluster_cloudrun_config["${var.cloudrun ? "enabled" : "disabled"}"]}"
8377
}
8478

8579
ip_allocation_policy {

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

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,25 @@ locals {
4040

4141
cluster_type = "${var.regional ? "regional" : "zonal"}"
4242

43+
cluster_network_policy = {
44+
enabled = [{
45+
enabled = "true"
46+
provider = "${var.network_policy_provider}"
47+
}]
48+
49+
disabled = [{
50+
enabled = "false"
51+
}]
52+
}
53+
54+
cluster_cloudrun_config = {
55+
enabled = [{
56+
disabled = "false"
57+
}]
58+
59+
disabled = []
60+
}
61+
4362
cluster_type_output_name = {
4463
regional = "${element(concat(google_container_cluster.primary.*.name, list("")), 0)}"
4564
zonal = "${element(concat(google_container_cluster.zonal_primary.*.name, list("")), 0)}"
@@ -128,11 +147,6 @@ locals {
128147
zonal = "${element(concat(google_container_cluster.zonal_primary.*.addons_config.0.istio_config.0.disabled, list("")), 0)}"
129148
}
130149

131-
cluster_type_output_cloudrun_enabled = {
132-
regional = "${element(concat(google_container_cluster.primary.*.addons_config.0.cloudrun_config.0.disabled, list("")), 0)}"
133-
zonal = "${element(concat(google_container_cluster.zonal_primary.*.addons_config.0.cloudrun_config.0.disabled, list("")), 0)}"
134-
}
135-
136150
cluster_type_output_pod_security_policy_enabled = {
137151
regional = "${element(concat(google_container_cluster.primary.*.pod_security_policy_config.0.enabled, list("")), 0)}"
138152
zonal = "${element(concat(google_container_cluster.zonal_primary.*.pod_security_policy_config.0.enabled, list("")), 0)}"
@@ -170,7 +184,7 @@ locals {
170184
cluster_kubernetes_dashboard_enabled = "${local.cluster_type_output_kubernetes_dashboard_enabled[local.cluster_type] ? false : true}"
171185
# BETA features
172186
cluster_istio_enabled = "${local.cluster_type_output_istio_enabled[local.cluster_type] ? false : true}"
173-
cluster_cloudrun_enabled = "${local.cluster_type_output_cloudrun_enabled[local.cluster_type] ? false : true}"
187+
cluster_cloudrun_enabled = "${var.cloudrun}"
174188
cluster_pod_security_policy_enabled = "${local.cluster_type_output_pod_security_policy_enabled[local.cluster_type] ? true : false}"
175189

176190
# /BETA features

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

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,7 @@ resource "google_container_cluster" "primary" {
3030
node_locations = ["${coalescelist(compact(var.zones), sort(random_shuffle.available_zones.result))}"]
3131
cluster_ipv4_cidr = "${var.cluster_ipv4_cidr}"
3232
network = "${replace(data.google_compute_network.gke_network.self_link, "https://www.googleapis.com/compute/v1/", "")}"
33-
34-
network_policy {
35-
enabled = "${var.network_policy}"
36-
provider = "${var.network_policy_provider}"
37-
}
33+
network_policy = "${local.cluster_network_policy["${var.network_policy ? "enabled" : "disabled"}"]}"
3834

3935
subnetwork = "${replace(data.google_compute_subnetwork.gke_subnetwork.self_link, "https://www.googleapis.com/compute/v1/", "")}"
4036
min_master_version = "${local.kubernetes_version_regional}"
@@ -76,9 +72,7 @@ resource "google_container_cluster" "primary" {
7672
disabled = "${var.istio ? 0 : 1}"
7773
}
7874

79-
cloudrun_config {
80-
disabled = "${var.cloudrun ? 0 : 1}"
81-
}
75+
cloudrun_config = "${local.cluster_cloudrun_config["${var.cloudrun ? "enabled" : "disabled"}"]}"
8276
}
8377

8478
ip_allocation_policy {

0 commit comments

Comments
 (0)