Merge pull request #1091 from spencerhance/l7-ilb-ga

Update L7-ILB API to GA
kubernetes · May 5, 2020 · 4f4e36c · 4f4e36c
2 parents 0425dad + 5015eb8
commit 4f4e36c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 11 deletions.
diff --git a/pkg/healthchecks/healthchecks_test.go b/pkg/healthchecks/healthchecks_test.go
@@ -412,15 +412,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 {

diff --git a/pkg/loadbalancers/features/features.go b/pkg/loadbalancers/features/features.go
@@ -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 {