mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-23 19:56:01 +00:00
Merge pull request #62476 from rramkumar1/patch-9
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:
commit
f3dbc1e3e6
@ -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()
|
||||
|
Loading…
Reference in New Issue
Block a user