Bug 1982046: lib/resourcedelete: Always check delete progress #629

jottofar · 2021-07-14T18:52:42Z

Previously delete methods would simply return when not in UpdateMode. This meant that if a delete was started in UpdateMode but had not completed while in UpdateMode the delete would never be marked as completed and minor upgrades would remain blocked. With this change deletes are continuously checked which also means a deleted resource that is recreated is logged as such by CVO even when not in UpdateMode. Deletes are still only requested when in UpdateMode.

openshift-ci · 2021-07-14T18:52:46Z

@jottofar: This pull request references Bugzilla bug 1982046, which is invalid:

expected the bug to target the "4.9.0" release, but it targets "---" instead

Comment /bugzilla refresh to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.

In response to this:

Bug 1982046: Check for deletes in progress when not in UpdateMode

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.

jottofar · 2021-07-14T18:55:01Z

/bugzilla refresh

openshift-ci · 2021-07-14T18:55:08Z

@jottofar: This pull request references Bugzilla bug 1982046, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker.

3 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target release (4.9.0) matches configured target release for branch (4.9.0)
bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

No GitHub users were found matching the public email listed for the QA contact in Bugzilla (yanyang@redhat.com), skipping review request.

In response to this:

/bugzilla refresh

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.

jottofar · 2021-07-14T18:55:53Z

/hold

jottofar · 2021-07-15T14:33:34Z

/test images

jottofar · 2021-07-19T13:36:28Z

/retitle Bug 1982046: lib/resourcedelete: Always check delete progress

openshift-ci · 2021-07-19T13:41:34Z

@jottofar: This pull request references Bugzilla bug 1982046, which is valid.

3 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target release (4.9.0) matches configured target release for branch (4.9.0)
bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

No GitHub users were found matching the public email listed for the QA contact in Bugzilla (yanyang@redhat.com), skipping review request.

In response to this:

Bug 1982046: lib/resourcedelete: Always check delete progress

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.

jottofar · 2021-07-19T13:53:22Z

/unhold

jottofar · 2021-07-19T21:43:05Z

/retest

jottofar · 2021-07-21T17:15:42Z

/retest

vrutkovs

/lgtm
/hold
/cc @wking @LalatenduMohanty

Loots fine to me (except the comment below to improve the diff), feel free to pull the hold

vrutkovs · 2021-07-23T09:32:03Z

lib/resourcedelete/apiext.go

 	}
+	existing, err := client.CustomResourceDefinitions().Get(ctx, required.Name, metav1.GetOptions{})


There's no real reason to move this higher, right?

Not required but I did it so this matches resourcedelete delete methods. Also, a minor thing, but now resource is declared closer to where it's used.

LalatenduMohanty

/lgtm

LalatenduMohanty · 2021-07-23T15:24:53Z

/hold cancel

openshift-bot · 2021-07-23T15:32:41Z

/retest-required

Please review the full test history for this PR and help us cut down flakes.

vrutkovs · 2021-07-23T16:00:07Z

/lgtm cancel

 Building github.com/openshift/cluster-version-operator (v1.0.0-627-g98177c71-dirty)
# github.com/openshift/cluster-version-operator/pkg/cvo/internal
pkg/cvo/internal/generic.go:124:2: duplicate field mode
pkg/cvo/internal/generic.go:137:3: ambiguous selector b.mode

Must be a bad rebase

vrutkovs

/lgtm

openshift-ci · 2021-07-26T09:15:43Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jottofar, LalatenduMohanty, vrutkovs

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:

~~OWNERS~~ [LalatenduMohanty,jottofar,vrutkovs]

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

openshift-ci · 2021-07-26T09:16:36Z

@jottofar: All pull requests linked via external trackers have merged:

openshift/cluster-version-operator#629

Bugzilla bug 1982046 has been moved to the MODIFIED state.

In response to this:

Bug 1982046: lib/resourcedelete: Always check delete progress

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.

openshift-ci bot added bugzilla/severity-medium Referenced Bugzilla bug's severity is medium for the branch this PR is targeting. bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. labels Jul 14, 2021

openshift-ci bot requested review from crawford and vrutkovs July 14, 2021 18:52

openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 14, 2021

jottofar force-pushed the bug-1982046-fix-del-cplt branch from 9024d17 to 711d079 Compare July 14, 2021 18:53

openshift-ci bot added bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. and removed bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. labels Jul 14, 2021

openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 14, 2021

jottofar force-pushed the bug-1982046-fix-del-cplt branch 2 times, most recently from 5ce2fcd to a961ed8 Compare July 19, 2021 13:35

openshift-ci bot changed the title ~~Bug 1982046: Check for deletes in progress when not in UpdateMode~~ Bug 1982046: lib/resourcedelete: Always check delete progress Jul 19, 2021

jottofar force-pushed the bug-1982046-fix-del-cplt branch from a961ed8 to ac2f54d Compare July 19, 2021 13:48

openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 19, 2021

jottofar force-pushed the bug-1982046-fix-del-cplt branch from ac2f54d to 0c482d5 Compare July 20, 2021 21:46

vrutkovs reviewed Jul 23, 2021

View reviewed changes

openshift-ci bot requested review from LalatenduMohanty and wking July 23, 2021 09:34

openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 23, 2021

openshift-ci bot assigned vrutkovs Jul 23, 2021

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jul 23, 2021

LalatenduMohanty approved these changes Jul 23, 2021

View reviewed changes

openshift-ci bot assigned LalatenduMohanty Jul 23, 2021

openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jul 23, 2021

openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Jul 23, 2021

lib/resourcedelete: Always check delete progress

19fa33e

jottofar force-pushed the bug-1982046-fix-del-cplt branch from 0c482d5 to 19fa33e Compare July 23, 2021 20:25

vrutkovs approved these changes Jul 26, 2021

View reviewed changes

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jul 26, 2021

openshift-merge-robot merged commit 4333850 into openshift:master Jul 26, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Bug 1982046: lib/resourcedelete: Always check delete progress #629

Bug 1982046: lib/resourcedelete: Always check delete progress #629

jottofar commented Jul 14, 2021 •

edited

openshift-ci bot commented Jul 14, 2021

jottofar commented Jul 14, 2021

openshift-ci bot commented Jul 14, 2021

jottofar commented Jul 14, 2021

jottofar commented Jul 15, 2021

jottofar commented Jul 19, 2021

openshift-ci bot commented Jul 19, 2021

jottofar commented Jul 19, 2021

jottofar commented Jul 19, 2021

jottofar commented Jul 21, 2021

vrutkovs left a comment

vrutkovs Jul 23, 2021

jottofar Jul 23, 2021

LalatenduMohanty left a comment

LalatenduMohanty commented Jul 23, 2021

openshift-bot commented Jul 23, 2021

vrutkovs commented Jul 23, 2021

vrutkovs left a comment

openshift-ci bot commented Jul 26, 2021

openshift-ci bot commented Jul 26, 2021

		}
		existing, err := client.CustomResourceDefinitions().Get(ctx, required.Name, metav1.GetOptions{})

Bug 1982046: lib/resourcedelete: Always check delete progress #629

Bug 1982046: lib/resourcedelete: Always check delete progress #629

Conversation

jottofar commented Jul 14, 2021 • edited

openshift-ci bot commented Jul 14, 2021

jottofar commented Jul 14, 2021

openshift-ci bot commented Jul 14, 2021

jottofar commented Jul 14, 2021

jottofar commented Jul 15, 2021

jottofar commented Jul 19, 2021

openshift-ci bot commented Jul 19, 2021

jottofar commented Jul 19, 2021

jottofar commented Jul 19, 2021

jottofar commented Jul 21, 2021

vrutkovs left a comment

Choose a reason for hiding this comment

vrutkovs Jul 23, 2021

Choose a reason for hiding this comment

jottofar Jul 23, 2021

Choose a reason for hiding this comment

LalatenduMohanty left a comment

Choose a reason for hiding this comment

LalatenduMohanty commented Jul 23, 2021

openshift-bot commented Jul 23, 2021

vrutkovs commented Jul 23, 2021

vrutkovs left a comment

Choose a reason for hiding this comment

openshift-ci bot commented Jul 26, 2021

openshift-ci bot commented Jul 26, 2021

jottofar commented Jul 14, 2021 •

edited