Moving nexthop ILB to GA

GoogleCloudPlatform · Dec 12, 2019 · f6977fd · f6977fd
1 parent 94079a3
commit f6977fd
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 12 deletions.
diff --git a/products/compute/api.yaml b/products/compute/api.yaml
@@ -8998,7 +8998,6 @@ objects:
           - next_hop_ip
           - next_hop_vpn_tunnel
           - next_hop_ilb
-        min_version: beta
   - !ruby/object:Api::Resource
     name: 'Router'
     kind: 'compute#router'
@@ -11697,7 +11696,7 @@ objects:
                   - https://www.googleapis.com/compute/v1/projects/project/global/backendServices/backen
                 dService
                   - compute/v1/projects/project/global/backendServices/backendService
-                  - global/backendServices/backendService 
+                  - global/backendServices/backendService
                 If defaultRouteAction is additionally
                 specified, advanced routing actions like URL Rewrites, etc. take effect prior to
                 sending the request to the backend. However, if defaultService is specified,

diff --git a/products/compute/terraform.yaml b/products/compute/terraform.yaml
@@ -1311,16 +1311,15 @@ overrides: !ruby/object:Overrides::ResourceOverrides
           route_name: "network-route"
           network_name: "compute-network"
       - !ruby/object:Provider::Terraform::Examples
-        name: "route_ilb_beta"
-        min_version: "beta"
-        primary_resource_id: "route-ilb-beta"
+        name: "route_ilb"
+        primary_resource_id: "route-ilb"
         vars:
           network_name: "compute-network"
           subnet_name: "compute-subnet"
           forwarding_rule_name: "compute-forwarding-rule"
           health_check_name: "proxy-health-check"
           backend_name: "compute-backend"
-          route_name: "route-ilb-beta"
+          route_name: "route-ilb"
     properties:
       name: !ruby/object:Overrides::Terraform::PropertyOverride
         validation: !ruby/object:Provider::Terraform::Validation

diff --git a/.../terraform/examples/route_ilb_beta.tf.erb → ...lates/terraform/examples/route_ilb.tf.erb b/.../terraform/examples/route_ilb_beta.tf.erb → ...lates/terraform/examples/route_ilb.tf.erb
@@ -1,19 +1,16 @@
 resource "google_compute_network" "default" {
-  provider                = google-beta
   name                    = "<%= ctx[:vars]['network_name'] %>"
   auto_create_subnetworks = false
 }
 
 resource "google_compute_subnetwork" "default" {
-  provider      = google-beta
   name          = "<%= ctx[:vars]['subnet_name'] %>"
   ip_cidr_range = "10.0.1.0/24"
   region        = "us-central1"
   network       = google_compute_network.default.self_link
 }
 
 resource "google_compute_health_check" "hc" {
-  provider           = google-beta
   name               = "<%= ctx[:vars]['health_check_name'] %>"
   check_interval_sec = 1
   timeout_sec        = 1
@@ -24,14 +21,12 @@ resource "google_compute_health_check" "hc" {
 }
 
 resource "google_compute_region_backend_service" "backend" {
-  provider      = google-beta
   name          = "<%= ctx[:vars]['backend_name'] %>"
   region        = "us-central1"
   health_checks = [google_compute_health_check.hc.self_link]
 }
 
 resource "google_compute_forwarding_rule" "default" {
-  provider = google-beta
   name     = "<%= ctx[:vars]['forwarding_rule_name'] %>"
   region   = "us-central1"
 
@@ -43,7 +38,6 @@ resource "google_compute_forwarding_rule" "default" {
 }
 
 resource "google_compute_route" "<%= ctx[:primary_resource_id] %>" {
-  provider     = google-beta
   name         = "<%= ctx[:vars]['route_name'] %>"
   dest_range   = "0.0.0.0/0"
   network      = google_compute_network.default.name