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

openshift-cherrypick-robot · 2024-11-19T00:42:49Z

This is an automated cherry-pick of #1104

/assign hongkailiu

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-11-19T00:44:01Z

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

Details

In response to this:

This is an automated cherry-pick of #1104

/assign hongkailiu

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-11-19T00:44:18Z

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

expected dependent Jira Issue OCPBUGS-44328 to be in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but it is MODIFIED instead

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 #1104

/assign hongkailiu

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-11-19T14:24:57Z

/retest-required

hongkailiu · 2024-11-19T14:38:50Z

/jira refresh

openshift-ci-robot · 2024-11-19T14:38:59Z

@hongkailiu: This pull request references Jira Issue OCPBUGS-44704, 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.14.z) matches configured target version for branch (4.14.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-44328 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-44328 targets the "4.15.z" version, which is one of the valid target versions: 4.15.0, 4.15.z
bug has dependents

Requesting review from QA contact:
/cc @jiajliu

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.

wking

/lgtm

openshift-ci · 2024-11-19T16:10:52Z

[APPROVALNOTIFIER] This PR is APPROVED

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

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~~ [wking]

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

hongkailiu · 2024-11-19T16:16:12Z

/test e2e-hypershift

hongkailiu · 2024-11-19T19:39:58Z

/test e2e-hypershift
/test e2e-hypershift-conformance

hongkailiu · 2024-11-19T22:38:53Z

/retest-required

hongkailiu · 2024-11-20T14:23:44Z

/retest-required

hongkailiu · 2024-11-21T03:04:16Z

/retest-required

openshift-ci · 2024-11-21T04:48:45Z

@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.

petr-muller · 2024-11-22T11:15:36Z

/cc

evakhoni · 2024-11-25T20:46:14Z

verified successfully.
/label qe-approved
/cc @jiajliu
for the labels. tnx!

openshift-ci-robot · 2024-11-25T20:46:21Z

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

7 validation(s) were run on this bug

bug is open, matching expected state (open)
bug target version (4.14.z) matches configured target version for branch (4.14.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-44328 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-44328 targets the "4.15.z" version, which is one of the valid target versions: 4.15.0, 4.15.z
bug has dependents

Requesting review from QA contact:
/cc @evakhoni

Details

In response to this:

This is an automated cherry-pick of #1104

/assign hongkailiu

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.

jiajliu · 2024-11-26T06:10:06Z

/label cherry-pick-approved

petr-muller · 2024-11-26T13:34:49Z

/label backport-risk-assessed

openshift-ci-robot · 2024-11-26T13:40:30Z

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

openshift/cluster-version-operator#1109

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

Details

In response to this:

This is an automated cherry-pick of #1104

/assign hongkailiu

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-11-26T14:35:20Z

[ART PR BUILD NOTIFIER]

Distgit: cluster-version-operator
This PR has been included in build cluster-version-operator-container-v4.14.0-202411261404.p0.g9bc8538.assembly.stream.el8.
All builds following this will include this PR.

openshift-merge-robot · 2024-11-27T00:29:27Z

Fix included in accepted release 4.14.0-0.nightly-2024-11-26-165121

hongkailiu added 6 commits November 19, 2024 00:42

Fix unit tests

03b90ee

Add test to cover the case of stillInitializing == true

c5af2a0

Better naming of variables and functions

4b48a5f

Improve some wording and simplify unit tests

b447b74

Fix the backported unit test

fa1c146

openshift-cherrypick-robot assigned hongkailiu Nov 19, 2024

openshift-cherrypick-robot mentioned this pull request Nov 19, 2024

OCPBUGS-44328: Fix desired before sync_worker's work is initialized #1104

Merged

openshift-ci Bot changed the title ~~[release-4.14] OCPBUGS-44328: Fix desired before sync_worker's work is initialized~~ [release-4.14] OCPBUGS-44704: Fix desired before sync_worker's work is initialized Nov 19, 2024

openshift-ci Bot requested review from LalatenduMohanty and wking November 19, 2024 00:44

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 Nov 19, 2024

openshift-ci Bot requested a review from jiajliu November 19, 2024 14:39

wking approved these changes Nov 19, 2024

View reviewed changes

openshift-ci Bot assigned wking Nov 19, 2024

openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Nov 19, 2024

openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 19, 2024

hongkailiu mentioned this pull request Nov 20, 2024

[release-4.14]cvo: explicitly import hypershift base images openshift/release#59030

Merged

openshift-ci Bot requested a review from petr-muller November 22, 2024 11:15

openshift-ci Bot added the qe-approved Signifies that QE has signed off on this PR label Nov 25, 2024

openshift-ci Bot requested a review from evakhoni November 25, 2024 20:46

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 Nov 26, 2024

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

openshift-merge-bot Bot merged commit 9bc8538 into openshift:release-4.14 Nov 26, 2024

wking mentioned this pull request Dec 11, 2024

WIP: Fix desired before sync_worker's work is initialized #1126

Closed

Uh oh!

Conversation

openshift-cherrypick-robot commented Nov 19, 2024

Uh oh!

openshift-ci-robot commented Nov 19, 2024

Uh oh!

openshift-ci-robot commented Nov 19, 2024

Uh oh!

hongkailiu commented Nov 19, 2024

Uh oh!

hongkailiu commented Nov 19, 2024

Uh oh!

openshift-ci-robot commented Nov 19, 2024

Uh oh!

wking left a comment

Choose a reason for hiding this comment

Uh oh!

openshift-ci Bot commented Nov 19, 2024

Uh oh!

hongkailiu commented Nov 19, 2024

Uh oh!

hongkailiu commented Nov 19, 2024

Uh oh!

hongkailiu commented Nov 19, 2024

Uh oh!

hongkailiu commented Nov 20, 2024

Uh oh!

hongkailiu commented Nov 21, 2024

Uh oh!

openshift-ci Bot commented Nov 21, 2024

Uh oh!

petr-muller commented Nov 22, 2024

Uh oh!

evakhoni commented Nov 25, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openshift-ci-robot commented Nov 25, 2024

Uh oh!

jiajliu commented Nov 26, 2024

Uh oh!

petr-muller commented Nov 26, 2024

Uh oh!

openshift-ci-robot commented Nov 26, 2024

Uh oh!

openshift-bot commented Nov 26, 2024

Uh oh!

openshift-merge-robot commented Nov 27, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants

evakhoni commented Nov 25, 2024 •

edited

Loading