From e293a43d7327d9055fa73aacdf0b977ba0481c48 Mon Sep 17 00:00:00 2001 From: Bharath KKB Date: Mon, 14 Sep 2020 20:41:26 -0500 Subject: [PATCH] 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 --- autogen/main/cluster.tf.tmpl | 2 +- cluster.tf | 2 +- modules/beta-private-cluster-update-variant/cluster.tf | 2 +- modules/beta-private-cluster/cluster.tf | 2 +- modules/beta-public-cluster-update-variant/cluster.tf | 2 +- modules/beta-public-cluster/cluster.tf | 2 +- modules/private-cluster-update-variant/cluster.tf | 2 +- modules/private-cluster/cluster.tf | 2 +- test/integration/beta_cluster/controls/gcloud.rb | 8 +++++--- test/integration/safer_cluster/controls/gcloud.rb | 4 +++- 10 files changed, 16 insertions(+), 12 deletions(-) diff --git a/autogen/main/cluster.tf.tmpl b/autogen/main/cluster.tf.tmpl index 4ad9fd8f3..c46f6725f 100644 --- 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 index fc17c85eb..df45c9cba 100644 --- 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 index c652b9653..65b4ac56e 100644 --- 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 index 3228becf9..1a65d5922 100644 --- 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 index 4886fe5cd..525996978 100644 --- 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 index 6e69b0620..564948362 100644 --- 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 index 8248e8c3a..718044a4b 100644 --- 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 index 463ec09c6..a8401d0aa 100644 --- 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 index 8da5e768a..c7d67591e 100644 --- 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 index 9b737f73a..5f05dfd0f 100644 --- 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(