Merge branch 'master' into enabled-components-autopilot

Author: apeabody

examples/autopilot_private_firewalls/network.tf

@@ -23,9 +23,10 @@ module "gcp-network" {
 
   subnets = [
     {
-      subnet_name   = local.subnet_name
-      subnet_ip     = "10.0.0.0/17"
-      subnet_region = var.region
+      subnet_name           = local.subnet_name
+      subnet_ip             = "10.0.0.0/17"
+      subnet_region         = var.region
+      subnet_private_access = true
     },
     {
       subnet_name   = local.master_auth_subnetwork

examples/safer_cluster_iap_bastion/bastion.tf

@@ -21,7 +21,7 @@ locals {
 
 module "bastion" {
   source  = "terraform-google-modules/bastion-host/google"
-  version = "~> 7.0"
+  version = "~> 8.0"
 
   network        = module.vpc.network_self_link
   subnet         = module.vpc.subnets_self_links[0]

examples/simple_autopilot_public/network.tf

@@ -23,9 +23,10 @@ module "gcp-network" {
 
   subnets = [
     {
-      subnet_name   = local.subnet_name
-      subnet_ip     = "10.0.0.0/17"
-      subnet_region = var.region
+      subnet_name           = local.subnet_name
+      subnet_ip             = "10.0.0.0/17"
+      subnet_region         = var.region
+      subnet_private_access = true
     },
     {
       subnet_name   = local.master_auth_subnetwork

test/integration/autopilot_private_firewalls/autopilot_private_firewalls_test.go

@@ -26,8 +26,7 @@ import (
 func TestAutopilotPrivateFirewalls(t *testing.T) {
 	bpt := tft.NewTFBlueprintTest(t)
 	bpt.DefineVerify(func(assert *assert.Assertions) {
-		//Skipping Default Verify as the Verify Stage fails due to change in Client Cert Token
-		// bpt.DefaultVerify(assert)
+		bpt.DefaultVerify(assert)
 		projectId := bpt.GetStringOutput("project_id")
 		location := bpt.GetStringOutput("location")
 		clusterName := bpt.GetStringOutput("cluster_name")

test/integration/beta_cluster/beta_cluster_test.go

@@ -33,8 +33,7 @@ func TestBetaCluster(t *testing.T) {
 	)
 
 	gke.DefineVerify(func(assert *assert.Assertions) {
-		// Commenting Default Verify due to issue 1478 for location Policy
-		// gke.DefaultVerify(assert) //disables no changes
+		gke.DefaultVerify(assert)
 
 		projectId := gke.GetStringOutput("project_id")
 		location := gke.GetStringOutput("location")

test/integration/simple_autopilot_private_non_default_sa/simple_autopilot_private_non_default_sa_test.go

@@ -33,8 +33,7 @@ func TestSimpleAutopilotPrivateNonDefaultSA(t *testing.T) {
 	)
 
 	bpt.DefineVerify(func(assert *assert.Assertions) {
-		//Skipping Default Verify as the Verify Stage fails due to change in Client Cert Token
-		// bpt.DefaultVerify(assert)
+		bpt.DefaultVerify(assert)
 
 		location := bpt.GetStringOutput("location")
 		clusterName := bpt.GetStringOutput("cluster_name")

test/integration/simple_autopilot_public/simple_autopiliot_public_test.go

@@ -30,8 +30,7 @@ func TestSimpleAutopilotPublic(t *testing.T) {
 	)
 
 	bpt.DefineVerify(func(assert *assert.Assertions) {
-		//Skipping Default Verify as the Verify Stage fails due to change in Client Cert Token
-		// bpt.DefaultVerify(assert)
+		bpt.DefaultVerify(assert)
 
 		projectId := bpt.GetStringOutput("project_id")
 		location := bpt.GetStringOutput("location")