github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 04:33:26 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #62476 from rramkumar1/patch-9

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 62324, 61459, 62475, 62476, 61914). 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>.

Remove unnecessary code in ingress upgrade logic

Now that 1.1 is released, fix the TODO.

/assign @nicksardo 

**Release note**:

```release-note
None
```
This commit is contained in:
Kubernetes Submit Queue 2018-04-12 13:18:14 -07:00 committed by GitHub
commit f3dbc1e3e6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -177,11 +177,6 @@ func (t *IngressUpgradeTest) verify(f *framework.Framework, done <-chan struct{}
postUpgradeResourceStore := &GCPResourceStore{}
t.populateGCPResourceStore(postUpgradeResourceStore)
// 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()
i2 := v2.Interface()