change Lister to DynamicClient for subscription clean up in Teardown #2616
Conversation
test/e2e/util.go
Outdated
| if list != nil { | ||
| remaining = list.Items | ||
| Eventually(func() ([]unstructured.Unstructured, error) { | ||
| var subscriptiongvr = schema.GroupVersionResource{Group: "operators.coreos.com", Version: "v1alpha1", Resource: "subscriptions"} |
There was a problem hiding this comment.
nit: could we move this assignment out of the Eventually() into the var block above since it only needs to be done once (and is not part of the core polling logic)?
There was a problem hiding this comment.
Sure. I'll move it. Thanks!
| remaining = list.Items | ||
| Eventually(func() ([]unstructured.Unstructured, error) { | ||
| var subscriptiongvr = schema.GroupVersionResource{Group: "operators.coreos.com", Version: "v1alpha1", Resource: "subscriptions"} | ||
| list, err := dynamic.Resource(subscriptiongvr).Namespace(namespace).List(context.Background(), metav1.ListOptions{}) |
There was a problem hiding this comment.
I think this logic makes sense, moving the call from the cache to the api-server. Maybe if this works well we can expand the change to the other types in TearDown() as well.
There was a problem hiding this comment.
Sounds good to me. Thanks!
akihikokuroda
force-pushed
the
subscriptioncleanup
branch
2 times, most recently
from
0baceb8
to
4a0ccde
Compare
Signed-off-by: akihikokuroda <akihikokuroda2020@gmail.com>
|
/lgtm |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: akihikokuroda, timflannagan The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
openshift-ci
bot
added
the
approved
Signed-off-by: akihikokuroda akihikokuroda2020@gmail.com
Description of the change:
This line
operator-lifecycle-manager/test/e2e/util.go
Line 403 in ac4de75
This line
operator-lifecycle-manager/test/e2e/util.go
Line 408 in ac4de75
DeleteAllOffunction deletes the subscriptions in the cache and theLIstfunction gets the instance from the cache.This PR changes the way to get the subscriptions from the API server directly instead of the cache.
Motivation for the change:
Closes #2615
Reviewer Checklist
/doc