fix: If release_channel is active, set min_master_version to null (#412)

* If release_channel is active on the module, set min_master_version to null * Fixing PR comments
terraform-google-modules · Feb 3, 2020 · 4c7b399 · 4c7b399
1 parent 34f89c5
commit 4c7b399
Show file tree

Hide file tree

Showing 11 changed files with 34 additions and 21 deletions.
diff --git a/autogen/main/cluster.tf.tmpl b/autogen/main/cluster.tf.tmpl
@@ -55,8 +55,13 @@ resource "google_container_cluster" "primary" {
   }
 {% endif %}
 
-  subnetwork         = data.google_compute_subnetwork.gke_subnetwork.self_link
+  subnetwork = data.google_compute_subnetwork.gke_subnetwork.self_link
+
+{% if beta_cluster %}
+  min_master_version = var.release_channel != null ? null : local.master_version
+{% else %}
   min_master_version = local.master_version
+{% endif %}
 
   logging_service    = var.logging_service
   monitoring_service = var.monitoring_service
@@ -354,7 +359,7 @@ resource "google_container_node_pool" "pools" {
   version = lookup(each.value, "auto_upgrade", false) ? "" : lookup(
     each.value,
     "version",
-    local.node_version,
+    google_container_cluster.primary.min_master_version,
   )
 
   initial_node_count = lookup(each.value, "autoscaling", true) ? lookup(

diff --git a/cluster.tf b/cluster.tf
@@ -42,7 +42,8 @@ resource "google_container_cluster" "primary" {
   }
 
 
-  subnetwork         = data.google_compute_subnetwork.gke_subnetwork.self_link
+  subnetwork = data.google_compute_subnetwork.gke_subnetwork.self_link
+
   min_master_version = local.master_version
 
   logging_service    = var.logging_service
@@ -133,7 +134,7 @@ resource "google_container_node_pool" "pools" {
   version = lookup(each.value, "auto_upgrade", false) ? "" : lookup(
     each.value,
     "version",
-    local.node_version,
+    google_container_cluster.primary.min_master_version,
   )
 
   initial_node_count = lookup(each.value, "autoscaling", true) ? lookup(

diff --git a/examples/simple_regional_beta/main.tf b/examples/simple_regional_beta/main.tf
@@ -45,6 +45,7 @@ module "gke" {
   database_encryption         = var.database_encryption
   enable_binary_authorization = var.enable_binary_authorization
   pod_security_policy_config  = var.pod_security_policy_config
+  release_channel             = "REGULAR"
 }
 
 data "google_client_config" "default" {

diff --git a/helpers/migrate7.py b/helpers/migrate7.py
@@ -31,6 +31,7 @@
     },
 ]
 
+
 class ModuleMigration:
     """
     Migrate the resources from a flat project factory to match the new
@@ -396,4 +397,4 @@ def argparser():
 
 
 if __name__ == "__main__":
-    main(sys.argv)
+    main(sys.argv)
diff --git a/modules/beta-private-cluster-update-variant/cluster.tf b/modules/beta-private-cluster-update-variant/cluster.tf
@@ -49,8 +49,9 @@ resource "google_container_cluster" "primary" {
     }
   }
 
-  subnetwork         = data.google_compute_subnetwork.gke_subnetwork.self_link
-  min_master_version = local.master_version
+  subnetwork = data.google_compute_subnetwork.gke_subnetwork.self_link
+
+  min_master_version = var.release_channel != null ? null : local.master_version
 
   logging_service    = var.logging_service
   monitoring_service = var.monitoring_service
@@ -320,7 +321,7 @@ resource "google_container_node_pool" "pools" {
   version = lookup(each.value, "auto_upgrade", false) ? "" : lookup(
     each.value,
     "version",
-    local.node_version,
+    google_container_cluster.primary.min_master_version,
   )
 
   initial_node_count = lookup(each.value, "autoscaling", true) ? lookup(

diff --git a/modules/beta-private-cluster/cluster.tf b/modules/beta-private-cluster/cluster.tf
@@ -49,8 +49,9 @@ resource "google_container_cluster" "primary" {
     }
   }
 
-  subnetwork         = data.google_compute_subnetwork.gke_subnetwork.self_link
-  min_master_version = local.master_version
+  subnetwork = data.google_compute_subnetwork.gke_subnetwork.self_link
+
+  min_master_version = var.release_channel != null ? null : local.master_version
 
   logging_service    = var.logging_service
   monitoring_service = var.monitoring_service
@@ -248,7 +249,7 @@ resource "google_container_node_pool" "pools" {
   version = lookup(each.value, "auto_upgrade", false) ? "" : lookup(
     each.value,
     "version",
-    local.node_version,
+    google_container_cluster.primary.min_master_version,
   )
 
   initial_node_count = lookup(each.value, "autoscaling", true) ? lookup(

diff --git a/modules/beta-public-cluster/cluster.tf b/modules/beta-public-cluster/cluster.tf
@@ -49,8 +49,9 @@ resource "google_container_cluster" "primary" {
     }
   }
 
-  subnetwork         = data.google_compute_subnetwork.gke_subnetwork.self_link
-  min_master_version = local.master_version
+  subnetwork = data.google_compute_subnetwork.gke_subnetwork.self_link
+
+  min_master_version = var.release_channel != null ? null : local.master_version
 
   logging_service    = var.logging_service
   monitoring_service = var.monitoring_service
@@ -235,7 +236,7 @@ resource "google_container_node_pool" "pools" {
   version = lookup(each.value, "auto_upgrade", false) ? "" : lookup(
     each.value,
     "version",
-    local.node_version,
+    google_container_cluster.primary.min_master_version,
   )
 
   initial_node_count = lookup(each.value, "autoscaling", true) ? lookup(

diff --git a/modules/private-cluster-update-variant/cluster.tf b/modules/private-cluster-update-variant/cluster.tf
@@ -42,7 +42,8 @@ resource "google_container_cluster" "primary" {
   }
 
 
-  subnetwork         = data.google_compute_subnetwork.gke_subnetwork.self_link
+  subnetwork = data.google_compute_subnetwork.gke_subnetwork.self_link
+
   min_master_version = local.master_version
 
   logging_service    = var.logging_service
@@ -218,7 +219,7 @@ resource "google_container_node_pool" "pools" {
   version = lookup(each.value, "auto_upgrade", false) ? "" : lookup(
     each.value,
     "version",
-    local.node_version,
+    google_container_cluster.primary.min_master_version,
   )
 
   initial_node_count = lookup(each.value, "autoscaling", true) ? lookup(

diff --git a/modules/private-cluster/cluster.tf b/modules/private-cluster/cluster.tf
@@ -42,7 +42,8 @@ resource "google_container_cluster" "primary" {
   }
 
 
-  subnetwork         = data.google_compute_subnetwork.gke_subnetwork.self_link
+  subnetwork = data.google_compute_subnetwork.gke_subnetwork.self_link
+
   min_master_version = local.master_version
 
   logging_service    = var.logging_service
@@ -146,7 +147,7 @@ resource "google_container_node_pool" "pools" {
   version = lookup(each.value, "auto_upgrade", false) ? "" : lookup(
     each.value,
     "version",
-    local.node_version,
+    google_container_cluster.primary.min_master_version,
   )
 
   initial_node_count = lookup(each.value, "autoscaling", true) ? lookup(

diff --git a/test/fixtures/beta_cluster/main.tf b/test/fixtures/beta_cluster/main.tf
@@ -35,7 +35,7 @@ module "this" {
 
   cluster_name_suffix            = "-${random_string.suffix.result}"
   project_id                     = local.project_id
-  regional                       = false
+  regional                       = true
   region                         = var.region
   zones                          = slice(var.zones, 0, 1)
   network                        = google_compute_network.main.name

diff --git a/test/integration/beta_cluster/controls/gcloud.rb b/test/integration/beta_cluster/controls/gcloud.rb
@@ -36,8 +36,8 @@
         expect(data['status']).to eq 'RUNNING'
       end
 
-      it "is zonal" do
-        expect(data['location']).to match(/^(.*)[1-9]-[a-z]$/)
+      it "is regional" do
+        expect(data['location']).to match(/^.*[1-9]$/)
       end
 
       it "is single zoned" do