fix: Fix skip_provisioners enabled flag for wait_for_cluster (#669)

* invert logic * fix cloud run int tests * fix cloud run int tests beta cluster * use including in beta test for loose match
terraform-google-modules · Sep 15, 2020 · e293a43 · e293a43
1 parent 0225458
commit e293a43
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 12 deletions.
diff --git a/autogen/main/cluster.tf.tmpl b/autogen/main/cluster.tf.tmpl
@@ -548,7 +548,7 @@ resource "google_container_node_pool" "pools" {
 module "gcloud_wait_for_cluster" {
   source  = "terraform-google-modules/gcloud/google"
   version = "~> 2.0.2"
-  enabled = var.skip_provisioners
+  enabled = ! var.skip_provisioners
 
   upgrade       = var.gcloud_upgrade
   skip_download = var.gcloud_skip_download

diff --git a/cluster.tf b/cluster.tf
@@ -252,7 +252,7 @@ resource "google_container_node_pool" "pools" {
 module "gcloud_wait_for_cluster" {
   source  = "terraform-google-modules/gcloud/google"
   version = "~> 2.0.2"
-  enabled = var.skip_provisioners
+  enabled = ! var.skip_provisioners
 
   upgrade       = var.gcloud_upgrade
   skip_download = var.gcloud_skip_download

diff --git a/modules/beta-private-cluster-update-variant/cluster.tf b/modules/beta-private-cluster-update-variant/cluster.tf
@@ -494,7 +494,7 @@ resource "google_container_node_pool" "pools" {
 module "gcloud_wait_for_cluster" {
   source  = "terraform-google-modules/gcloud/google"
   version = "~> 2.0.2"
-  enabled = var.skip_provisioners
+  enabled = ! var.skip_provisioners
 
   upgrade       = var.gcloud_upgrade
   skip_download = var.gcloud_skip_download

diff --git a/modules/beta-private-cluster/cluster.tf b/modules/beta-private-cluster/cluster.tf
@@ -421,7 +421,7 @@ resource "google_container_node_pool" "pools" {
 module "gcloud_wait_for_cluster" {
   source  = "terraform-google-modules/gcloud/google"
   version = "~> 2.0.2"
-  enabled = var.skip_provisioners
+  enabled = ! var.skip_provisioners
 
   upgrade       = var.gcloud_upgrade
   skip_download = var.gcloud_skip_download

diff --git a/modules/beta-public-cluster-update-variant/cluster.tf b/modules/beta-public-cluster-update-variant/cluster.tf
@@ -475,7 +475,7 @@ resource "google_container_node_pool" "pools" {
 module "gcloud_wait_for_cluster" {
   source  = "terraform-google-modules/gcloud/google"
   version = "~> 2.0.2"
-  enabled = var.skip_provisioners
+  enabled = ! var.skip_provisioners
 
   upgrade       = var.gcloud_upgrade
   skip_download = var.gcloud_skip_download

diff --git a/modules/beta-public-cluster/cluster.tf b/modules/beta-public-cluster/cluster.tf
@@ -402,7 +402,7 @@ resource "google_container_node_pool" "pools" {
 module "gcloud_wait_for_cluster" {
   source  = "terraform-google-modules/gcloud/google"
   version = "~> 2.0.2"
-  enabled = var.skip_provisioners
+  enabled = ! var.skip_provisioners
 
   upgrade       = var.gcloud_upgrade
   skip_download = var.gcloud_skip_download

diff --git a/modules/private-cluster-update-variant/cluster.tf b/modules/private-cluster-update-variant/cluster.tf
@@ -338,7 +338,7 @@ resource "google_container_node_pool" "pools" {
 module "gcloud_wait_for_cluster" {
   source  = "terraform-google-modules/gcloud/google"
   version = "~> 2.0.2"
-  enabled = var.skip_provisioners
+  enabled = ! var.skip_provisioners
 
   upgrade       = var.gcloud_upgrade
   skip_download = var.gcloud_skip_download

diff --git a/modules/private-cluster/cluster.tf b/modules/private-cluster/cluster.tf
@@ -265,7 +265,7 @@ resource "google_container_node_pool" "pools" {
 module "gcloud_wait_for_cluster" {
   source  = "terraform-google-modules/gcloud/google"
   version = "~> 2.0.2"
-  enabled = var.skip_provisioners
+  enabled = ! var.skip_provisioners
 
   upgrade       = var.gcloud_upgrade
   skip_download = var.gcloud_skip_download

diff --git a/test/integration/beta_cluster/controls/gcloud.rb b/test/integration/beta_cluster/controls/gcloud.rb
@@ -49,7 +49,7 @@
       end
 
       it "has the expected addon settings" do
-        expect(data['addonsConfig']).to eq({
+        expect(data['addonsConfig']).to include(
           "horizontalPodAutoscaling" => {},
           "httpLoadBalancing" => {},
           "kubernetesDashboard" => {
@@ -59,14 +59,16 @@
           "configConnectorConfig" => {},
           "networkPolicyConfig" => {},
           "istioConfig" => {"auth"=>"AUTH_MUTUAL_TLS"},
-          "cloudRunConfig" => {},
+          "cloudRunConfig" => including(
+              "loadBalancerType" => "LOAD_BALANCER_TYPE_EXTERNAL",
+            ),
           "dnsCacheConfig" => {
             "enabled" => true,
           },
           "gcePersistentDiskCsiDriverConfig" => {
             "enabled" => true,
           }
-        })
+        )
       end
 
       it "has the expected binaryAuthorization config" do

diff --git a/test/integration/safer_cluster/controls/gcloud.rb b/test/integration/safer_cluster/controls/gcloud.rb
@@ -49,7 +49,9 @@
 
       it "has the expected addon settings" do
         expect(data['addonsConfig']).to include(
-            "cloudRunConfig" => {},
+            "cloudRunConfig" => including(
+              "loadBalancerType" => "LOAD_BALANCER_TYPE_EXTERNAL",
+            ),
             "horizontalPodAutoscaling" => {},
             "httpLoadBalancing" => {},
             "kubernetesDashboard" => including(