From f91667e364aafa0413dcba9c42f43fa62438dcc4 Mon Sep 17 00:00:00 2001 From: Rohit Ramkumar Date: Mon, 9 Apr 2018 12:54:04 -0700 Subject: [PATCH 1/2] Patch ingress upgrade test logic to take note of SNI support in next release. --- test/e2e/upgrades/ingress.go | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/test/e2e/upgrades/ingress.go b/test/e2e/upgrades/ingress.go index a51a8c6a8cb..c804d628d31 100644 --- 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.Fw.SslList = nil framework.ExpectNoError(compareGCPResourceStores(t.resourceStore, postUpgradeResourceStore, func(v1 reflect.Value, v2 reflect.Value) error { i1 := v1.Interface() From 5dc1b7c1a291f6499e04aae51426f7295528c02a Mon Sep 17 00:00:00 2001 From: Rohit Ramkumar Date: Mon, 9 Apr 2018 12:56:31 -0700 Subject: [PATCH 2/2] Update ingress.go --- test/e2e/upgrades/ingress.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/e2e/upgrades/ingress.go b/test/e2e/upgrades/ingress.go index c804d628d31..fc0d8a8c199 100644 --- a/test/e2e/upgrades/ingress.go +++ b/test/e2e/upgrades/ingress.go @@ -180,7 +180,7 @@ func (t *IngressUpgradeTest) verify(f *framework.Framework, done <-chan struct{} // 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.Fw.SslList = nil + postUpgradeResourceStore.SslList = nil framework.ExpectNoError(compareGCPResourceStores(t.resourceStore, postUpgradeResourceStore, func(v1 reflect.Value, v2 reflect.Value) error { i1 := v1.Interface()