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

Jump to bottom

Cherry-pick #1091 [Update L7-ILB API to GA] into release-1-9 #1295

Merged
merged 1 commit into from
Oct 14, 2020
Merged

Cherry-pick #1091 [Update L7-ILB API to GA] into release-1-9 #1295

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions pkg/healthchecks/healthchecks_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,15 +413,15 @@ func TestVersion(t *testing.T) {
version: meta.VersionBeta,
},
{
desc: "Http2 Health Check with ILB and NEG",
desc: "Http Health Check with ILB and NEG",
hc: &HealthCheck{
HealthCheck: computealpha.HealthCheck{
Type: string(annotations.ProtocolHTTP),
},
forILB: true,
forNEG: true,
},
version: meta.VersionBeta,
version: meta.VersionGA,
},
}
for _, tc := range testCases {
Expand Down
11 changes: 2 additions & 9 deletions pkg/loadbalancers/features/features.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,15 +63,8 @@ var (
}

// All of these fields must be filled in to allow L7ILBVersions() to work
l7IlbVersions = ResourceVersions{
UrlMap: meta.VersionBeta,
ForwardingRule: meta.VersionBeta,
TargetHttpProxy: meta.VersionBeta,
TargetHttpsProxy: meta.VersionBeta,
SslCertificate: meta.VersionBeta,
BackendService: meta.VersionBeta,
HealthCheck: meta.VersionBeta,
}
// TODO(shance) Remove this entirely
l7IlbVersions = *NewResourceVersions()
)

func NewResourceVersions() *ResourceVersions {
Expand Down