[release-4.17] OCPBUGS-42386: Fix desired before sync_worker's work is initialized by openshift-cherrypick-robot · Pull Request #1089 · openshift/cluster-version-operator

openshift-cherrypick-robot · 2024-09-24T14:52:09Z

This is an automated cherry-pick of #1081

/assign wking

If the CVO pod gets restarted after a user sends a cluster upgrade request with `--to-image`, the desired should not ALWAYS be taken from `.Spec.DesiredUpdate`, e.g., when the targeting payload is blocked on some precondition check failure. The user request will be written to `cv.spec.desiredUpdate` where only the `image` field is set, i.e., the `Version` field is empty. If the CVO gets restarted, then 1. The desied [1] from `cv.spec.desiredUpdate` will be used to set `w.status.Actual` [2] and then applied to `cv.status.desired`. 2. When the next `optr.sync()` happens, the precondition check may become non-blocking [3] as the `Version` field is empty now. 3. CVO will then start an upgrade that should have been blocked. [1]. https://github.com/openshift/cluster-version-operator/blob/1995380b6d755c29b926b846a64ca0039002c2cf/pkg/cvo/cvo.go#L680 [2]. https://github.com/openshift/cluster-version-operator/blob/1995380b6d755c29b926b846a64ca0039002c2cf/pkg/cvo/sync_worker.go#L502 [3]. https://github.com/openshift/cluster-version-operator/blob/1995380b6d755c29b926b846a64ca0039002c2cf/pkg/payload/precondition/clusterversion/rollback.go#L57

openshift-ci-robot · 2024-09-24T14:53:21Z

@openshift-cherrypick-robot: Jira Issue OCPBUGS-35228 has been cloned as Jira Issue OCPBUGS-42386. Will retitle bug to link to clone.
/retitle [release-4.17] OCPBUGS-42386: Fix desired before sync_worker's work is initialized

Details

In response to this:

This is an automated cherry-pick of #1081

/assign wking

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 openshift-eng/jira-lifecycle-plugin repository.

openshift-ci-robot · 2024-09-24T14:53:32Z

@openshift-cherrypick-robot: This pull request references Jira Issue OCPBUGS-42386, which is invalid:

release note text must be set and not match the template OR release note type must be set to "Release Note Not Required". For more information you can reference the OpenShift Bug Process.

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

The bug has been updated to refer to the pull request using the external bug tracker.

Details

In response to this:

This is an automated cherry-pick of #1081

/assign wking

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 openshift-eng/jira-lifecycle-plugin repository.

hongkailiu · 2024-09-24T21:55:01Z

/test e2e-agnostic-operator

petr-muller

/lgtm
/approved
/label backport-risk-assessed
/meow

openshift-ci · 2024-09-25T11:52:34Z

@petr-muller:

Details

In response to this:

/lgtm
/approved
/label backport-risk-assessed
/meow

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-sigs/prow repository.

openshift-ci · 2024-09-25T11:52:52Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: openshift-cherrypick-robot, petr-muller

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~~ [petr-muller]

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

petr-muller · 2024-09-25T11:53:28Z

/hold

Unhold as needed

hongkailiu · 2024-09-25T12:42:57Z

/label tide/merge-method-squash

wking · 2024-10-15T05:46:46Z

/jira refresh

openshift-ci-robot · 2024-10-15T05:46:50Z

@wking: This pull request references Jira Issue OCPBUGS-42386, which is invalid:

release note text must be set and not match the template OR release note type must be set to "Release Note Not Required". For more information you can reference the OpenShift Bug Process.

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

Details

In response to this:

/jira 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 openshift-eng/jira-lifecycle-plugin repository.

hongkailiu · 2024-10-22T22:49:50Z

/jira refresh

openshift-ci-robot · 2024-10-22T22:49:57Z

@hongkailiu: This pull request references Jira Issue OCPBUGS-42386, which is valid. The bug has been moved to the POST state.

7 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target version (4.17.z) matches configured target version for branch (4.17.z)
bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)
release note text is set and does not match the template
dependent bug Jira Issue OCPBUGS-35228 is in the state Verified, which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
dependent Jira Issue OCPBUGS-35228 targets the "4.18.0" version, which is one of the valid target versions: 4.18.0
bug has dependents

Requesting review from QA contact:
/cc @evakhoni

Details

In response to this:

/jira 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 openshift-eng/jira-lifecycle-plugin repository.

hongkailiu · 2024-10-28T15:49:19Z

/hold cancel

evakhoni · 2024-10-29T15:54:00Z

pre-merge verified successfully
/label qe-approved

openshift-ci-robot · 2024-10-29T15:54:11Z

@openshift-cherrypick-robot: This pull request references Jira Issue OCPBUGS-42386, which is valid.

7 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target version (4.17.z) matches configured target version for branch (4.17.z)
bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)
release note text is set and does not match the template
dependent bug Jira Issue OCPBUGS-35228 is in the state Verified, which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
dependent Jira Issue OCPBUGS-35228 targets the "4.18.0" version, which is one of the valid target versions: 4.18.0
bug has dependents

Requesting review from QA contact:
/cc @evakhoni

Details

In response to this:

This is an automated cherry-pick of #1081

/assign wking

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 openshift-eng/jira-lifecycle-plugin repository.

evakhoni · 2024-10-29T15:54:46Z

/cc @jiajliu
for cherry-pick-approved thanks!

jiajliu · 2024-10-30T04:58:03Z

/label cherry-pick-approved

openshift-ci-robot · 2024-10-30T07:43:30Z

/retest-required

Remaining retests: 0 against base HEAD 1e57277 and 2 for PR HEAD 889a6fd in total

hongkailiu · 2024-10-30T13:28:51Z

/retest-required

openshift-ci · 2024-10-30T16:19:05Z

@openshift-cherrypick-robot: all tests passed!

Full PR test history. Your PR dashboard.

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-sigs/prow repository. I understand the commands that are listed here.

openshift-ci-robot · 2024-10-30T16:23:46Z

@openshift-cherrypick-robot: Jira Issue OCPBUGS-42386: All pull requests linked via external trackers have merged:

openshift/cluster-version-operator#1089

Jira Issue OCPBUGS-42386 has been moved to the MODIFIED state.

Details

In response to this:

This is an automated cherry-pick of #1081

/assign wking

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 openshift-eng/jira-lifecycle-plugin repository.

openshift-bot · 2024-10-30T17:40:53Z

[ART PR BUILD NOTIFIER]

Distgit: cluster-version-operator
This PR has been included in build cluster-version-operator-container-v4.17.0-202410301707.p0.g9606439.assembly.stream.el9.
All builds following this will include this PR.

hongkailiu added 5 commits September 24, 2024 14:52

Fix unit tests

ba3df9d

Add test to cover the case of stillInitializing == true

346f45f

Better naming of variables and functions

02bef39

Improve some wording and simplify unit tests

889a6fd

openshift-cherrypick-robot assigned wking Sep 24, 2024

openshift-cherrypick-robot mentioned this pull request Sep 24, 2024

OCPBUGS-35228: Fix desired before sync_worker's work is initialized #1081

Merged

openshift-ci bot requested review from hongkailiu and petr-muller September 24, 2024 14:52

openshift-ci bot changed the title ~~[release-4.17] OCPBUGS-35228: Fix desired before sync_worker's work is initialized~~ [release-4.17] OCPBUGS-42386: Fix desired before sync_worker's work is initialized Sep 24, 2024

petr-muller approved these changes Sep 25, 2024

View reviewed changes

openshift-ci bot added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label Sep 25, 2024

openshift-ci bot assigned petr-muller Sep 25, 2024

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Sep 25, 2024

openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 25, 2024

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

openshift-ci bot added the tide/merge-method-squash Denotes a PR that should be squashed by tide when it merges. label Sep 25, 2024

openshift-ci-robot added jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. and removed jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Oct 22, 2024

openshift-ci bot requested a review from evakhoni October 22, 2024 22:49

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

openshift-ci bot added the qe-approved Signifies that QE has signed off on this PR label Oct 29, 2024

openshift-ci bot requested a review from jiajliu October 29, 2024 15:54

hongkailiu mentioned this pull request Oct 29, 2024

[release-4.16] OCPBUGS-43964: Fix desired before sync_worker's work is initialized #1097

Merged

openshift-ci bot added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Oct 30, 2024

openshift-merge-bot bot merged commit 9606439 into openshift:release-4.17 Oct 30, 2024

Comments

Conversation

openshift-cherrypick-robot commented Sep 24, 2024

Uh oh!

openshift-ci-robot commented Sep 24, 2024

Uh oh!

openshift-ci-robot commented Sep 24, 2024

Uh oh!

hongkailiu commented Sep 24, 2024

Uh oh!

petr-muller left a comment

Choose a reason for hiding this comment

Uh oh!

openshift-ci bot commented Sep 25, 2024

Uh oh!

openshift-ci bot commented Sep 25, 2024

Uh oh!

petr-muller commented Sep 25, 2024

Uh oh!

hongkailiu commented Sep 25, 2024

Uh oh!

wking commented Oct 15, 2024

Uh oh!

openshift-ci-robot commented Oct 15, 2024

Uh oh!

hongkailiu commented Oct 22, 2024

Uh oh!

openshift-ci-robot commented Oct 22, 2024

Uh oh!

hongkailiu commented Oct 28, 2024

Uh oh!

evakhoni commented Oct 29, 2024

Uh oh!

openshift-ci-robot commented Oct 29, 2024

Uh oh!

evakhoni commented Oct 29, 2024

Uh oh!

jiajliu commented Oct 30, 2024

Uh oh!

openshift-ci-robot commented Oct 30, 2024

Uh oh!

hongkailiu commented Oct 30, 2024

Uh oh!

openshift-ci bot commented Oct 30, 2024

Uh oh!

openshift-ci-robot commented Oct 30, 2024

Uh oh!

openshift-bot commented Oct 30, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants