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

GA ILB multi-nic #3289

Merged
merged 2 commits into from
Mar 23, 2020
Merged

GA ILB multi-nic #3289

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5d7a798
GA ILB multi-nic
slevenick Mar 23, 2020
dced4fe
Failover is not GA, needs if/else
slevenick Mar 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion products/compute/api.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2308,7 +2308,6 @@ objects:
description: |
The URL of the network to which this backend service belongs.
This field can only be specified when the load balancing scheme is set to INTERNAL.
min_version: beta
- !ruby/object:Api::Resource
name: 'BackendServiceSignedUrlKey'
kind: 'compute#BackendServiceSignedUrlKey'
Expand Down
10 changes: 4 additions & 6 deletions third_party/terraform/tests/resource_compute_region_backend_service_test.go.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,6 @@ func TestAccComputeRegionBackendService_withBackendInternalManaged(t *testing.T)
})
}

<% unless version == 'ga' -%>
func TestAccComputeRegionBackendService_withBackendMultiNic(t *testing.T) {
t.Parallel()

Expand All @@ -141,7 +140,6 @@ func TestAccComputeRegionBackendService_withBackendMultiNic(t *testing.T) {
},
})
}
<% end -%>

func TestAccComputeRegionBackendService_withConnectionDrainingAndUpdate(t *testing.T) {
t.Parallel()
Expand Down Expand Up @@ -559,7 +557,6 @@ resource "google_compute_health_check" "default" {
`, serviceName, timeout, igName, itName, checkName)
}

<% unless version == 'ga' -%>
func testAccComputeRegionBackendService_withBackendMultiNic(
serviceName, net1Name, net2Name, igName, itName, checkName string, timeout int64) string {
return fmt.Sprintf(`
Expand All @@ -577,13 +574,15 @@ resource "google_compute_region_backend_service" "lipsum" {

backend {
group = google_compute_instance_group_manager.foobar.instance_group
<% unless version.nil? || version == 'ga' -%>
failover = true
}

failover_policy {
disable_connection_drain_on_failover = true
drop_traffic_if_unhealthy = true
failover_ratio = 0.4
drop_traffic_if_unhealthy = true
failover_ratio = 0.4
<% end -%>
}

network = google_compute_network.network2.self_link
Expand Down Expand Up @@ -658,7 +657,6 @@ resource "google_compute_health_check" "default" {
}
`, serviceName, timeout, net1Name, net1Name, net2Name, net2Name, igName, itName, checkName)
}
<% end -%>

func testAccComputeRegionBackendService_withInvalidInternalBackend(
serviceName, igName, itName, checkName string) string {
Expand Down