fix: various fix to address CI issues (#1248)

apeabody · web-flow · commit 9e9231897f78 · 2022-05-12T12:10:50.000-07:00
fix: add output "service_account" to simple_zonal

chore: convert remaining examples/CI to COS_CONTAINERD
diff --git a/examples/node_pool/main.tf b/examples/node_pool/main.tf
@@ -60,7 +60,6 @@ module "gke" {
       accelerator_count  = 1
       accelerator_type   = "nvidia-tesla-a100"
       gpu_partition_size = "1g.5gb"
-      image_type         = "COS"
       auto_repair        = false
       service_account    = var.compute_engine_service_account
     },
diff --git a/examples/node_pool_update_variant/main.tf b/examples/node_pool_update_variant/main.tf
@@ -73,7 +73,6 @@ module "gke" {
       disk_type         = "pd-standard"
       accelerator_count = 1
       accelerator_type  = "nvidia-tesla-p4"
-      image_type        = "COS"
       auto_repair       = false
       service_account   = var.compute_engine_service_account
     },
diff --git a/examples/node_pool_update_variant_beta/main.tf b/examples/node_pool_update_variant_beta/main.tf
@@ -78,7 +78,6 @@ module "gke" {
       disk_type         = "pd-standard"
       accelerator_count = 1
       accelerator_type  = "nvidia-tesla-p4"
-      image_type        = "COS"
       auto_repair       = false
       service_account   = var.compute_engine_service_account
     },
diff --git a/examples/node_pool_update_variant_public_beta/main.tf b/examples/node_pool_update_variant_public_beta/main.tf
@@ -74,7 +74,6 @@ module "gke" {
       disk_type         = "pd-standard"
       accelerator_count = 1
       accelerator_type  = "nvidia-tesla-p4"
-      image_type        = "COS"
       auto_repair       = false
       service_account   = var.compute_engine_service_account
     },
diff --git a/examples/regional_private_node_pool_oauth_scopes/main.tf b/examples/regional_private_node_pool_oauth_scopes/main.tf
@@ -48,7 +48,6 @@ module "gke" {
       max_count          = 1
       disk_size_gb       = 100
       disk_type          = "pd-ssd"
-      image_type         = "COS"
       auto_repair        = true
       auto_upgrade       = false
       preemptible        = false
diff --git a/examples/safer_cluster_iap_bastion/apis.tf b/examples/safer_cluster_iap_bastion/apis.tf
@@ -22,6 +22,7 @@ module "enabled_google_apis" {
   disable_services_on_destroy = false
 
   activate_apis = [
+    "serviceusage.googleapis.com",
     "iam.googleapis.com",
     "compute.googleapis.com",
     "logging.googleapis.com",
diff --git a/examples/simple_regional_private/main.tf b/examples/simple_regional_private/main.tf
@@ -58,7 +58,6 @@ module "gke" {
       local_ssd_count   = 0
       disk_size_gb      = 100
       disk_type         = "pd-standard"
-      image_type        = "COS"
       auto_repair       = true
       auto_upgrade      = true
       service_account   = var.compute_engine_service_account
diff --git a/test/fixtures/sandbox_enabled/example.tf b/test/fixtures/sandbox_enabled/example.tf
@@ -33,7 +33,6 @@ module "example" {
   node_pools = [
     {
       name         = "default-node-pool"
-      image_type   = "COS_CONTAINERD"
       machine_type = "n1-standard-2"
     },
   ]
diff --git a/test/fixtures/simple_zonal/outputs.tf b/test/fixtures/simple_zonal/outputs.tf
@@ -51,3 +51,8 @@ output "ca_certificate" {
   value       = module.example.ca_certificate
   sensitive   = true
 }
+
+output "service_account" {
+  description = "The service account to default running nodes as if not overridden in `node_pools`."
+  value       = module.example.service_account
+}
diff --git a/test/integration/node_pool/controls/gcloud.rb b/test/integration/node_pool/controls/gcloud.rb
@@ -297,7 +297,7 @@
             including(
               "name" => "pool-02",
               "config" => including(
-                "imageType" => "COS",
+                "imageType" => "COS_CONTAINERD",
               ),
             )
           )
diff --git a/test/integration/simple_autopilot_private/controls/gcloud.rb b/test/integration/simple_autopilot_private/controls/gcloud.rb
@@ -32,7 +32,7 @@
 
     describe "cluster" do
       it "is running" do
-        expect(data['status']).to eq 'RUNNING'
+        expect(data['status']).to eq('RUNNING').or eq('RECONCILING')
       end
 
       it "is autopilot" do

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,6 @@ module "example" {`
`33`	`33`	`node_pools = [`
`34`	`34`	`{`
`35`	`35`	`name = "default-node-pool"`
`36`		`- image_type = "COS_CONTAINERD"`
`37`	`36`	`machine_type = "n1-standard-2"`
`38`	`37`	`},`
`39`	`38`	`]`
Original file line number	Diff line number	Diff line change
`@@ -51,3 +51,8 @@ output "ca_certificate" {`
`51`	`51`	`value = module.example.ca_certificate`
`52`	`52`	`sensitive = true`
`53`	`53`	`}`
	`54`	`+`
	`55`	`+output "service_account" {`
	`56`	+ description = "The service account to default running nodes as if not overridden in `node_pools`."
	`57`	`+ value = module.example.service_account`
	`58`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -297,7 +297,7 @@`
`297`	`297`	`including(`
`298`	`298`	`"name" => "pool-02",`
`299`	`299`	`"config" => including(`
`300`		`- "imageType" => "COS",`
	`300`	`+ "imageType" => "COS_CONTAINERD",`
`301`	`301`	`),`
`302`	`302`	`)`
`303`	`303`	`)`