Update more gke tests to use bootstrapped network (GoogleCloudPlatfor…

…m#9664)
pengq-google · May 21, 2024 · e6fb455 · e6fb455
1 parent 0c6e236
commit e6fb455
Show file tree

Hide file tree

Showing 25 changed files with 313 additions and 127 deletions.
diff --git a/mmv1/products/gkebackup/BackupPlan.yaml b/mmv1/products/gkebackup/BackupPlan.yaml
@@ -45,8 +45,12 @@ examples:
       name: 'basic-plan'
       cluster_name: 'basic-cluster'
       deletion_protection: 'true'
+      network_name: 'default'
+      subnetwork_name: 'default'
     test_vars_overrides:
       deletion_protection: 'false'
+      network_name: 'acctest.BootstrapSharedTestNetwork(t, "gke-cluster")'
+      subnetwork_name: 'acctest.BootstrapSubnet(t, "gke-cluster", acctest.BootstrapSharedTestNetwork(t, "gke-cluster"))'
     oics_vars_overrides:
       deletion_protection: 'false'
     test_env_vars:
@@ -58,8 +62,12 @@ examples:
       name: 'autopilot-plan'
       cluster_name: 'autopilot-cluster'
       deletion_protection: 'true'
+      network_name: 'default'
+      subnetwork_name: 'default'
     test_vars_overrides:
       deletion_protection: 'false'
+      network_name: 'acctest.BootstrapSharedTestNetwork(t, "gke-cluster")'
+      subnetwork_name: 'acctest.BootstrapSubnet(t, "gke-cluster", acctest.BootstrapSharedTestNetwork(t, "gke-cluster"))'
     oics_vars_overrides:
       deletion_protection: 'false'
   - !ruby/object:Provider::Terraform::Examples
@@ -70,8 +78,12 @@ examples:
       cluster_name: 'cmek-cluster'
       key_name: 'backup-key'
       deletion_protection: 'true'
+      network_name: 'default'
+      subnetwork_name: 'default'
     test_vars_overrides:
       deletion_protection: 'false'
+      network_name: 'acctest.BootstrapSharedTestNetwork(t, "gke-cluster")'
+      subnetwork_name: 'acctest.BootstrapSubnet(t, "gke-cluster", acctest.BootstrapSharedTestNetwork(t, "gke-cluster"))'
     oics_vars_overrides:
       deletion_protection: 'false'
     test_env_vars:
@@ -83,8 +95,12 @@ examples:
       name: 'full-plan'
       cluster_name: 'full-cluster'
       deletion_protection: 'true'
+      network_name: 'default'
+      subnetwork_name: 'default'
     test_vars_overrides:
       deletion_protection: 'false'
+      network_name: 'acctest.BootstrapSharedTestNetwork(t, "gke-cluster")'
+      subnetwork_name: 'acctest.BootstrapSubnet(t, "gke-cluster", acctest.BootstrapSharedTestNetwork(t, "gke-cluster"))'
     oics_vars_overrides:
       deletion_protection: 'false'
     test_env_vars:

diff --git a/mmv1/products/gkebackup/RestorePlan.yaml b/mmv1/products/gkebackup/RestorePlan.yaml
@@ -43,71 +43,95 @@ examples:
       ])"
     vars:
       name: 'restore-all-ns'
+      network_name: 'default'
+      subnetwork_name: 'default'
     test_env_vars:
       project: :PROJECT_NAME
       deletion_protection: 'true'
     test_vars_overrides:
       deletion_protection: 'false'
+      network_name: 'acctest.BootstrapSharedTestNetwork(t, "gke-cluster")'
+      subnetwork_name: 'acctest.BootstrapSubnet(t, "gke-cluster", acctest.BootstrapSharedTestNetwork(t, "gke-cluster"))'
     oics_vars_overrides:
       deletion_protection: 'false'
   - !ruby/object:Provider::Terraform::Examples
     name: 'gkebackup_restoreplan_rollback_namespace'
     primary_resource_id: 'rollback_ns'
     vars:
       name: 'rollback-ns'
+      network_name: 'default'
+      subnetwork_name: 'default'
     test_env_vars:
       project: :PROJECT_NAME
       deletion_protection: 'true'
     test_vars_overrides:
       deletion_protection: 'false'
+      network_name: 'acctest.BootstrapSharedTestNetwork(t, "gke-cluster")'
+      subnetwork_name: 'acctest.BootstrapSubnet(t, "gke-cluster", acctest.BootstrapSharedTestNetwork(t, "gke-cluster"))'
     oics_vars_overrides:
       deletion_protection: 'false'
   - !ruby/object:Provider::Terraform::Examples
     name: 'gkebackup_restoreplan_protected_application'
     primary_resource_id: 'rollback_app'
     vars:
       name: 'rollback-app'
+      network_name: 'default'
+      subnetwork_name: 'default'
     test_env_vars:
       project: :PROJECT_NAME
       deletion_protection: 'true'
     test_vars_overrides:
       deletion_protection: 'false'
+      network_name: 'acctest.BootstrapSharedTestNetwork(t, "gke-cluster")'
+      subnetwork_name: 'acctest.BootstrapSubnet(t, "gke-cluster", acctest.BootstrapSharedTestNetwork(t, "gke-cluster"))'
     oics_vars_overrides:
       deletion_protection: 'false'
   - !ruby/object:Provider::Terraform::Examples
     name: 'gkebackup_restoreplan_all_cluster_resources'
     primary_resource_id: 'all_cluster_resources'
     vars:
       name: 'all-groupkinds'
+      network_name: 'default'
+      subnetwork_name: 'default'
     test_env_vars:
       project: :PROJECT_NAME
       deletion_protection: 'true'
     test_vars_overrides:
       deletion_protection: 'false'
+      network_name: 'acctest.BootstrapSharedTestNetwork(t, "gke-cluster")'
+      subnetwork_name: 'acctest.BootstrapSubnet(t, "gke-cluster", acctest.BootstrapSharedTestNetwork(t, "gke-cluster"))'
     oics_vars_overrides:
       deletion_protection: 'false'
   - !ruby/object:Provider::Terraform::Examples
     name: 'gkebackup_restoreplan_rename_namespace'
     primary_resource_id: 'rename_ns'
     vars:
       name: 'rename-ns'
+      network_name: 'default'
+      subnetwork_name: 'default'
     test_env_vars:
       project: :PROJECT_NAME
       deletion_protection: 'true'
     test_vars_overrides:
       deletion_protection: 'false'
+      network_name: 'acctest.BootstrapSharedTestNetwork(t, "gke-cluster")'
+      subnetwork_name: 'acctest.BootstrapSubnet(t, "gke-cluster", acctest.BootstrapSharedTestNetwork(t, "gke-cluster"))'
     oics_vars_overrides:
       deletion_protection: 'false'
   - !ruby/object:Provider::Terraform::Examples
     name: 'gkebackup_restoreplan_second_transformation'
     primary_resource_id: 'transform_rule'
     vars:
       name: 'transform-rule'
+      network_name: 'default'
+      subnetwork_name: 'default'
     test_env_vars:
       project: :PROJECT_NAME
       deletion_protection: 'true'
     test_vars_overrides:
       deletion_protection: 'false'
+      network_name: 'acctest.BootstrapSharedTestNetwork(t, "gke-cluster")'
+      subnetwork_name: 'acctest.BootstrapSubnet(t, "gke-cluster", acctest.BootstrapSharedTestNetwork(t, "gke-cluster"))'
     oics_vars_overrides:
       deletion_protection: 'false'
 skip_sweeper: true

diff --git a/mmv1/products/gkehub/Membership.yaml b/mmv1/products/gkehub/Membership.yaml
@@ -61,7 +61,12 @@ examples:
     primary_resource_id: 'membership'
     vars:
       name: 'basic'
-      cluster_name: 'basiccluster'
+      cluster_name: 'basic-cluster'
+      network_name: 'default'
+      subnetwork_name: 'default'
+    test_vars_overrides:
+      network_name: 'acctest.BootstrapSharedTestNetwork(t, "gke-cluster")'
+      subnetwork_name: 'acctest.BootstrapSubnet(t, "gke-cluster", acctest.BootstrapSharedTestNetwork(t, "gke-cluster"))'
     test_env_vars:
       project: :PROJECT_NAME
       location: :REGION
@@ -71,21 +76,29 @@ examples:
     primary_resource_id: 'membership'
     vars:
       name: 'basic'
-      cluster_name: 'basiccluster'
+      cluster_name: 'basic-cluster'
       deletion_protection: 'true'
+      network_name: 'default'
+      subnetwork_name: 'default'
     test_vars_overrides:
       deletion_protection: 'false'
+      network_name: 'acctest.BootstrapSharedTestNetwork(t, "gke-cluster")'
+      subnetwork_name: 'acctest.BootstrapSubnet(t, "gke-cluster", acctest.BootstrapSharedTestNetwork(t, "gke-cluster"))'
     oics_vars_overrides:
       deletion_protection: 'false'
   - !ruby/object:Provider::Terraform::Examples
     name: 'gkehub_membership_issuer'
     primary_resource_id: 'membership'
     vars:
       name: 'basic'
-      cluster_name: 'basiccluster'
+      cluster_name: 'basic-cluster'
       deletion_protection: 'true'
+      network_name: 'default'
+      subnetwork_name: 'default'
     test_vars_overrides:
       deletion_protection: 'false'
+      network_name: 'acctest.BootstrapSharedTestNetwork(t, "gke-cluster")'
+      subnetwork_name: 'acctest.BootstrapSubnet(t, "gke-cluster", acctest.BootstrapSharedTestNetwork(t, "gke-cluster"))'
     oics_vars_overrides:
       deletion_protection: 'false'
     test_env_vars:

diff --git a/mmv1/products/gkehub2/MembershipBinding.yaml b/mmv1/products/gkehub2/MembershipBinding.yaml
@@ -50,10 +50,14 @@ examples:
     primary_resource_name: "fmt.Sprintf(\"tf-test-membership%s\", context[\"random_suffix\"]), fmt.Sprintf(\"tf-test-membership-binding%s\", context[\"random_suffix\"])"
     primary_resource_id: "membership_binding"
     vars:
-      cluster_name: "basiccluster"
+      cluster_name: "basic-cluster"
       deletion_protection: 'true'
+      network_name: 'default'
+      subnetwork_name: 'default'
     test_vars_overrides:
       deletion_protection: 'false'
+      network_name: 'acctest.BootstrapSharedTestNetwork(t, "gke-cluster")'
+      subnetwork_name: 'acctest.BootstrapSubnet(t, "gke-cluster", acctest.BootstrapSharedTestNetwork(t, "gke-cluster"))'
     oics_vars_overrides:
       deletion_protection: 'false'
     test_env_vars:

diff --git a/mmv1/products/gkehub2/MembershipRBACRoleBinding.yaml b/mmv1/products/gkehub2/MembershipRBACRoleBinding.yaml
@@ -50,10 +50,14 @@ examples:
     primary_resource_id: 'membership_rbac_role_binding'
     min_version: beta
     vars:
-      cluster_name: "basiccluster"
+      cluster_name: "basic-cluster"
       deletion_protection: 'true'
+      network_name: 'default'
+      subnetwork_name: 'default'
     test_vars_overrides:
       deletion_protection: 'false'
+      network_name: 'acctest.BootstrapSharedTestNetwork(t, "gke-cluster")'
+      subnetwork_name: 'acctest.BootstrapSubnet(t, "gke-cluster", acctest.BootstrapSharedTestNetwork(t, "gke-cluster"))'
     oics_vars_overrides:
       deletion_protection: 'false'
     test_env_vars:

diff --git a/mmv1/templates/terraform/examples/gkebackup_backupplan_autopilot.tf.erb b/mmv1/templates/terraform/examples/gkebackup_backupplan_autopilot.tf.erb
@@ -13,6 +13,8 @@ resource "google_container_cluster" "primary" {
     }
   }
   deletion_protection  = "<%= ctx[:vars]['deletion_protection'] %>"
+  network       = "<%= ctx[:vars]['network_name'] %>"
+  subnetwork    = "<%= ctx[:vars]['subnetwork_name'] %>"
 }
 
 resource "google_gke_backup_backup_plan" "autopilot" {

diff --git a/mmv1/templates/terraform/examples/gkebackup_backupplan_basic.tf.erb b/mmv1/templates/terraform/examples/gkebackup_backupplan_basic.tf.erb
@@ -11,6 +11,8 @@ resource "google_container_cluster" "primary" {
     }
   }
   deletion_protection  = "<%= ctx[:vars]['deletion_protection'] %>"
+  network       = "<%= ctx[:vars]['network_name'] %>"
+  subnetwork    = "<%= ctx[:vars]['subnetwork_name'] %>"
 }
 
 resource "google_gke_backup_backup_plan" "basic" {

diff --git a/mmv1/templates/terraform/examples/gkebackup_backupplan_cmek.tf.erb b/mmv1/templates/terraform/examples/gkebackup_backupplan_cmek.tf.erb
@@ -11,6 +11,8 @@ resource "google_container_cluster" "primary" {
     }
   }
   deletion_protection  = "<%= ctx[:vars]['deletion_protection'] %>"
+  network       = "<%= ctx[:vars]['network_name'] %>"
+  subnetwork    = "<%= ctx[:vars]['subnetwork_name'] %>"
 }
 
 resource "google_gke_backup_backup_plan" "cmek" {

diff --git a/mmv1/templates/terraform/examples/gkebackup_backupplan_full.tf.erb b/mmv1/templates/terraform/examples/gkebackup_backupplan_full.tf.erb
@@ -11,6 +11,8 @@ resource "google_container_cluster" "primary" {
     }
   }
   deletion_protection  = "<%= ctx[:vars]['deletion_protection'] %>"
+  network       = "<%= ctx[:vars]['network_name'] %>"
+  subnetwork    = "<%= ctx[:vars]['subnetwork_name'] %>"
 }
 
 resource "google_gke_backup_backup_plan" "full" {

diff --git a/mmv1/templates/terraform/examples/gkebackup_restoreplan_all_cluster_resources.tf.erb b/mmv1/templates/terraform/examples/gkebackup_restoreplan_all_cluster_resources.tf.erb
@@ -11,6 +11,8 @@ resource "google_container_cluster" "primary" {
     }
   }
   deletion_protection  = "<%= ctx[:vars]['deletion_protection'] %>"
+  network       = "<%= ctx[:vars]['network_name'] %>"
+  subnetwork    = "<%= ctx[:vars]['subnetwork_name'] %>"
 }
 
 resource "google_gke_backup_backup_plan" "basic" {

diff --git a/mmv1/templates/terraform/examples/gkebackup_restoreplan_all_namespaces.tf.erb b/mmv1/templates/terraform/examples/gkebackup_restoreplan_all_namespaces.tf.erb
@@ -11,6 +11,8 @@ resource "google_container_cluster" "primary" {
     }
   }
   deletion_protection  = "<%= ctx[:vars]['deletion_protection'] %>"
+  network       = "<%= ctx[:vars]['network_name'] %>"
+  subnetwork    = "<%= ctx[:vars]['subnetwork_name'] %>"
 }
 
 resource "google_gke_backup_backup_plan" "basic" {

diff --git a/mmv1/templates/terraform/examples/gkebackup_restoreplan_protected_application.tf.erb b/mmv1/templates/terraform/examples/gkebackup_restoreplan_protected_application.tf.erb
@@ -11,6 +11,8 @@ resource "google_container_cluster" "primary" {
     }
   }
   deletion_protection  = "<%= ctx[:vars]['deletion_protection'] %>"
+  network       = "<%= ctx[:vars]['network_name'] %>"
+  subnetwork    = "<%= ctx[:vars]['subnetwork_name'] %>"
 }
 
 resource "google_gke_backup_backup_plan" "basic" {

diff --git a/mmv1/templates/terraform/examples/gkebackup_restoreplan_rename_namespace.tf.erb b/mmv1/templates/terraform/examples/gkebackup_restoreplan_rename_namespace.tf.erb
@@ -11,6 +11,8 @@ resource "google_container_cluster" "primary" {
     }
   }
   deletion_protection  = "<%= ctx[:vars]['deletion_protection'] %>"
+  network       = "<%= ctx[:vars]['network_name'] %>"
+  subnetwork    = "<%= ctx[:vars]['subnetwork_name'] %>"
 }
 
 resource "google_gke_backup_backup_plan" "basic" {

diff --git a/mmv1/templates/terraform/examples/gkebackup_restoreplan_rollback_namespace.tf.erb b/mmv1/templates/terraform/examples/gkebackup_restoreplan_rollback_namespace.tf.erb
@@ -11,6 +11,8 @@ resource "google_container_cluster" "primary" {
     }
   }
   deletion_protection  = "<%= ctx[:vars]['deletion_protection'] %>"
+  network       = "<%= ctx[:vars]['network_name'] %>"
+  subnetwork    = "<%= ctx[:vars]['subnetwork_name'] %>"
 }
 
 resource "google_gke_backup_backup_plan" "basic" {

diff --git a/mmv1/templates/terraform/examples/gkebackup_restoreplan_second_transformation.tf.erb b/mmv1/templates/terraform/examples/gkebackup_restoreplan_second_transformation.tf.erb
@@ -11,6 +11,8 @@ resource "google_container_cluster" "primary" {
     }
   }
   deletion_protection  = "<%= ctx[:vars]['deletion_protection'] %>"
+  network       = "<%= ctx[:vars]['network_name'] %>"
+  subnetwork    = "<%= ctx[:vars]['subnetwork_name'] %>"
 }
 
 resource "google_gke_backup_backup_plan" "basic" {

diff --git a/mmv1/templates/terraform/examples/gkehub_membership_basic.tf.erb b/mmv1/templates/terraform/examples/gkehub_membership_basic.tf.erb
@@ -3,6 +3,8 @@ resource "google_container_cluster" "primary" {
   location           = "us-central1-a"
   initial_node_count = 1
   deletion_protection  = "<%= ctx[:vars]['deletion_protection'] %>"
+  network       = "<%= ctx[:vars]['network_name'] %>"
+  subnetwork    = "<%= ctx[:vars]['subnetwork_name'] %>"
 }
 
 resource "google_gke_hub_membership" "membership" {

diff --git a/mmv1/templates/terraform/examples/gkehub_membership_binding_basic.tf.erb b/mmv1/templates/terraform/examples/gkehub_membership_binding_basic.tf.erb
@@ -3,6 +3,8 @@ resource "google_container_cluster" "primary" {
   location           = "us-central1-a"
   initial_node_count = 1
   deletion_protection  = "<%= ctx[:vars]['deletion_protection'] %>"
+  network       = "<%= ctx[:vars]['network_name'] %>"
+  subnetwork    = "<%= ctx[:vars]['subnetwork_name'] %>"
 }
 
 resource "google_gke_hub_membership" "membership" {

diff --git a/mmv1/templates/terraform/examples/gkehub_membership_issuer.tf.erb b/mmv1/templates/terraform/examples/gkehub_membership_issuer.tf.erb
@@ -6,6 +6,8 @@ resource "google_container_cluster" "primary" {
     workload_pool = "<%= ctx[:test_env_vars]['project'] %>.svc.id.goog"
   }
   deletion_protection  = "<%= ctx[:vars]['deletion_protection'] %>"
+  network       = "<%= ctx[:vars]['network_name'] %>"
+  subnetwork    = "<%= ctx[:vars]['subnetwork_name'] %>"
 }
 
 resource "google_gke_hub_membership" "membership" {

diff --git a/mmv1/templates/terraform/examples/gkehub_membership_rbac_role_binding_basic.tf.erb b/mmv1/templates/terraform/examples/gkehub_membership_rbac_role_binding_basic.tf.erb
@@ -4,6 +4,8 @@ resource "google_container_cluster" "primary" {
   location           = "us-central1-a"
   initial_node_count = 1
   deletion_protection  = "<%= ctx[:vars]['deletion_protection'] %>"
+  network       = "<%= ctx[:vars]['network_name'] %>"
+  subnetwork    = "<%= ctx[:vars]['subnetwork_name'] %>"
 }
 
 resource "google_gke_hub_membership" "membership" {

diff --git a/mmv1/templates/terraform/examples/gkehub_membership_regional.tf.erb b/mmv1/templates/terraform/examples/gkehub_membership_regional.tf.erb
@@ -3,6 +3,8 @@ resource "google_container_cluster" "primary" {
   location           = "us-central1-a"
   initial_node_count = 1
   deletion_protection = false
+  network       = "<%= ctx[:vars]['network_name'] %>"
+  subnetwork    = "<%= ctx[:vars]['subnetwork_name'] %>"
 }
 
 resource "google_gke_hub_membership" "membership" {