Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: Fix skip_provisioners enabled flag for wait_for_cluster #669

Merged
merged 4 commits into from
Sep 15, 2020
Merged

fix: Fix skip_provisioners enabled flag for wait_for_cluster #669

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1f97df1
invert logic
bharathkkb Sep 14, 2020
7c411d3
fix cloud run int tests
bharathkkb Sep 14, 2020
1b83237
fix cloud run int tests beta cluster
bharathkkb Sep 14, 2020
befa212
use including in beta test for loose match
bharathkkb Sep 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion autogen/main/cluster.tf.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion cluster.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion modules/beta-private-cluster-update-variant/cluster.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion modules/beta-private-cluster/cluster.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion modules/beta-public-cluster-update-variant/cluster.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion modules/beta-public-cluster/cluster.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion modules/private-cluster-update-variant/cluster.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion modules/private-cluster/cluster.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 5 additions & 3 deletions test/integration/beta_cluster/controls/gcloud.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" => {
Expand All @@ -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
Expand Down
4 changes: 3 additions & 1 deletion test/integration/safer_cluster/controls/gcloud.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down