github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-14 21:53:52 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #62291 from rramkumar1/patch-7

Browse Source 
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
```
This commit is contained in:
Kubernetes Submit Queue
2018-04-10 06:19:50 -07:00
committed by GitHub
parent 865d3cf409 5dc1b7c1a2
commit 6bf1871e73
1 changed files with 4 additions and 7 deletions
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{}
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()