Merge pull request #62291 from rramkumar1/patch-7

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Patch ingress upgrade test logic to take note of SNI support in next glbc release **What this PR does / why we need it**: /assign @MrHohn **Release note**: ```release-note None ```

Merge pull request #62291 from rramkumar1/patch-7
6bf1871e · Kubernetes Submit Queue · GitHub · 865d3cf4 · 5dc1b7c1 · 6bf1871e
Unverified Commit 6bf1871e authored Apr 10, 2018 by Kubernetes Submit Queue Committed by GitHub Apr 10, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 7 deletions

ingress.go test/e2e/upgrades/ingress.go +4 -7

No files found.
--- a/test/e2e/upgrades/ingress.go
+++ b/test/e2e/upgrades/ingress.go
@@ -177,13 +177,10 @@ func (t *IngressUpgradeTest) verify(f *framework.Framework, done <-chan struct{}
 	postUpgradeResourceStore := &GCPResourceStore{}
 	t.populateGCPResourceStore(postUpgradeResourceStore)

-	// Ignore certain fields in compute.Firewall that we know will change
-	// due to the upgrade/downgrade.
-	// TODO(rramkumar): Remove this once glbc 0.9.8 is released.
-	t.resourceStore.Fw.Allowed = nil
-	t.resourceStore.Fw.SourceRanges = nil
-	postUpgradeResourceStore.Fw.Allowed = nil
-	postUpgradeResourceStore.Fw.SourceRanges = nil
+	// Ignore compute.SslCertificates since we know it will change during an upgrade/downgrade.
+	// TODO(rramkumar): Remove this once glbc 1.1 is released.
+	t.resourceStore.SslList = nil
+	postUpgradeResourceStore.SslList = nil

 	framework.ExpectNoError(compareGCPResourceStores(t.resourceStore, postUpgradeResourceStore, func(v1 reflect.Value, v2 reflect.Value) error {
 		i1 := v1.Interface()