InstallPlan wait for condition update by akihikokuroda · Pull Request #2510 · operator-framework/operator-lifecycle-manager

akihikokuroda · 2021-12-06T19:15:51Z

Signed-off-by: akihikokuroda akihikokuroda2020@gmail.com

Description of the change:
There are a small gap between the phase update and the condition update of the InstallPlan. This change makes sure the correct condition is put into the installplan at the beginning of the test.

Motivation for the change:
Closes #2509

Reviewer Checklist

Implementation matches the proposed design, or proposal is updated to match implementation
Sufficient unit test coverage
Sufficient end-to-end test coverage
Docs updated or added to /doc
Commit messages sensible and descriptive

openshift-ci · 2021-12-06T19:16:01Z

Hi @akihikokuroda. Thanks for your PR.

I'm waiting for a operator-framework member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

dinhxuanvu · 2021-12-08T02:29:27Z

/ok-to-test

timflannagan

Thanks for continuing to dish these flake/cleanup PRs out - I think these changes are reasonable. I just had one quick comment about simplifying the Eventually block. Any idea on how we could reproduce this more frequently to gauge whether these fixes will remove this flake?

timflannagan · 2021-12-21T14:53:17Z

@akihikokuroda I'm going to recycle the checks for this PR as well as we may have regressed in CI health in the past couple of weeks and I want to double check whether these changes pop up as failures in the e2e-tests workflow.

timflannagan · 2021-12-21T16:07:01Z

/lgtm

akihikokuroda · 2021-12-21T20:13:21Z

The unit test failure should be fixed by this: #2521

awgreene

Two nits. Thanks for fixing this.

awgreene · 2022-01-14T20:26:06Z

+					return false
+				}
+				return hasCondition(fetchedInstallPlan, cond)
+			}, 1*time.Minute, interval).Should(BeTrue())


Non-blocking nit: the minute timeout seems a bit arbitrary.

Yes, I feel a minute is a little short now. I'll change it to 5.

awgreene · 2022-01-14T20:34:26Z

-			// first check that a condition with a message exists
-			fetchedInstallPlan, err := fetchInstallPlanWithNamespace(GinkgoT(), crc, installPlanName, ns.GetName(), buildInstallPlanPhaseCheckFunc(operatorsv1alpha1.InstallPlanPhaseInstalling))
-			Expect(err).NotTo(HaveOccurred())
-			Expect(fetchedInstallPlan).NotTo(BeNil())


Based on this return statement within the fetchInstallPlanWithNamespace function, it is possible that the fetchedInstallPlan will be nil if the Get call from the client ever returns nil, nil.

I can't think of a time where this could happen, but we should probably safeguard against it.

Yes, that's right. I'll add nil check for fetchedInstallPaln. Thanks!

Signed-off-by: akihikokuroda <akihikokuroda2020@gmail.com>

awgreene

Thanks, nice work on this!

openshift-ci · 2022-01-17T19:31:59Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: akihikokuroda, awgreene

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details

Needs approval from an approver in each of these files:

~~OWNERS~~ [awgreene]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

timflannagan · 2022-01-18T01:14:20Z

+					return false
+				}
+				return hasCondition(fetchedInstallPlan, cond)
+			}, 5*time.Minute, interval).Should(BeTrue())


nit: technically we can drop 5*time.Minute call as it's the global default (and interval might also be the global default but I'm a bit fuzzier on that).

timflannagan · 2022-01-18T01:14:56Z

/lgtm

timflannagan · 2022-01-18T01:16:09Z

Force merging to try and clear out as many e2e flakes (that don't touch any runtime code) as much as possible.

openshift-ci Bot requested review from benluddy and hasbro17 December 6, 2021 19:15

openshift-ci Bot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Dec 6, 2021

akihikokuroda changed the title ~~wait for condition update~~ InstallPlan wait for condition update Dec 6, 2021

openshift-ci Bot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Dec 8, 2021

akihikokuroda force-pushed the fix2509 branch from 0da9a45 to f50d78c Compare December 10, 2021 19:23

timflannagan reviewed Dec 21, 2021

View reviewed changes

Comment thread test/e2e/installplan_e2e_test.go Outdated

timflannagan reviewed Dec 21, 2021

View reviewed changes

timflannagan closed this Dec 21, 2021

timflannagan reopened this Dec 21, 2021

akihikokuroda force-pushed the fix2509 branch from f50d78c to 0c1b2ea Compare December 21, 2021 15:58

openshift-ci Bot assigned timflannagan Dec 21, 2021

openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Dec 21, 2021

akihikokuroda force-pushed the fix2509 branch from 0c1b2ea to d8681e0 Compare January 11, 2022 19:31

openshift-ci Bot removed the lgtm Indicates that a PR is ready to be merged. label Jan 11, 2022

akihikokuroda mentioned this pull request Jan 11, 2022

REQUEST: New membership for akihikokuroda operator-framework/community#58

Closed

6 tasks

akihikokuroda force-pushed the fix2509 branch from d8681e0 to dd80477 Compare January 13, 2022 13:17

awgreene requested changes Jan 14, 2022

View reviewed changes

wait for condition update

5eefbbf

Signed-off-by: akihikokuroda <akihikokuroda2020@gmail.com>

akihikokuroda force-pushed the fix2509 branch from dd80477 to 5eefbbf Compare January 15, 2022 01:44

akihikokuroda requested review from awgreene and timflannagan January 15, 2022 01:45

awgreene approved these changes Jan 17, 2022

View reviewed changes

openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 17, 2022

timflannagan reviewed Jan 18, 2022

View reviewed changes

openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Jan 18, 2022

timflannagan merged commit 08ca061 into operator-framework:master Jan 18, 2022

awgreene mentioned this pull request Sep 3, 2022

fix(e2e): Use Eventually for installplan status fetch operation #2394

Closed

5 tasks

Conversation

akihikokuroda commented Dec 6, 2021

Uh oh!

openshift-ci Bot commented Dec 6, 2021

Uh oh!

dinhxuanvu commented Dec 8, 2021

Uh oh!

Uh oh!

timflannagan left a comment

Choose a reason for hiding this comment

Uh oh!

timflannagan commented Dec 21, 2021

Uh oh!

timflannagan commented Dec 21, 2021

Uh oh!

akihikokuroda commented Dec 21, 2021

Uh oh!

awgreene left a comment

Choose a reason for hiding this comment

Uh oh!

awgreene Jan 14, 2022

Choose a reason for hiding this comment

Uh oh!

akihikokuroda Jan 15, 2022

Choose a reason for hiding this comment

Uh oh!

awgreene Jan 14, 2022

Choose a reason for hiding this comment

Uh oh!

akihikokuroda Jan 15, 2022

Choose a reason for hiding this comment

Uh oh!

awgreene left a comment

Choose a reason for hiding this comment

Uh oh!

openshift-ci Bot commented Jan 17, 2022

Uh oh!

timflannagan Jan 18, 2022

Choose a reason for hiding this comment

Uh oh!

timflannagan commented Jan 18, 2022

Uh oh!

timflannagan commented Jan 18, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants