github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Patch ingress upgrade test logic to take note of SNI support in next release.

pull/8/head
Rohit Ramkumar 2018-04-09 12:54:04 -07:00 committed by GitHub
parent c820e31b25
commit f91667e364
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
test/e2e/upgrades/ingress.go
View File

@ -177,13 +177,10 @@ func (t *IngressUpgradeTest) verify(f *framework.Framework, done <-chan struct{}
postUpgradeResourceStore := &GCPResourceStore{} postUpgradeResourceStore := &GCPResourceStore{}
t.populateGCPResourceStore(postUpgradeResourceStore) t.populateGCPResourceStore(postUpgradeResourceStore)
// Ignore certain fields in compute.Firewall that we know will change // Ignore compute.SslCertificates since we know it will change during an upgrade/downgrade.
// due to the upgrade/downgrade. // TODO(rramkumar): Remove this once glbc 1.1 is released.
// TODO(rramkumar): Remove this once glbc 0.9.8 is released. t.resourceStore.SslList = nil
t.resourceStore.Fw.Allowed = nil postUpgradeResourceStore.Fw.SslList = nil
t.resourceStore.Fw.SourceRanges = nil
postUpgradeResourceStore.Fw.Allowed = nil
postUpgradeResourceStore.Fw.SourceRanges = nil
framework.ExpectNoError(compareGCPResourceStores(t.resourceStore, postUpgradeResourceStore, func(v1 reflect.Value, v2 reflect.Value) error { framework.ExpectNoError(compareGCPResourceStores(t.resourceStore, postUpgradeResourceStore, func(v1 reflect.Value, v2 reflect.Value) error {
i1 := v1.Interface() i1 := v1.Interface()