Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

OCPBUGS-11439: allow z-stream upgrade even if CVO Upgradeable is false #2381

Merged

Conversation

sjenning
Copy link
Contributor

@sjenning sjenning commented Apr 5, 2023

https://issues.redhat.com/browse/HOSTEDCP-632

Refactored version of #2336 to address #2336 (comment) and fixup/add unit tests

fyi @wking

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Apr 5, 2023
@openshift-ci-robot
Copy link

openshift-ci-robot commented Apr 5, 2023

@sjenning: This pull request references HOSTEDCP-632 which is a valid jira issue.

In response to this:

https://issues.redhat.com/browse/HOSTEDCP-632

Refactored version of #2336

fyi @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 kubernetes/test-infra repository.

@openshift-ci openshift-ci bot requested review from csrwng and enxebre April 5, 2023 15:38
@openshift-ci openshift-ci bot added the area/hypershift-operator Indicates the PR includes changes for the hypershift operator and API - outside an OCP release label Apr 5, 2023
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Apr 5, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: sjenning

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 /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci bot added approved Indicates a PR has been approved by an approver from all required OWNERS files. and removed do-not-merge/needs-area labels Apr 5, 2023
// 2) non-error message about the condition of the upgrade
// 3) error indicating that the upgrade is not allowed or we were not able to determine
func isUpgradeable(hcluster *hyperv1.HostedCluster, releaseImage *releaseinfo.ReleaseImage) (bool, string, error) {
if hcluster.Status.Version == nil || hcluster.Status.Version.Desired.Image == hcluster.Spec.Release.Image {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewer note: I inverted some of the logic here so we can just return early and make it clearer.

@openshift-ci-robot
Copy link

openshift-ci-robot commented Apr 5, 2023

@sjenning: This pull request references HOSTEDCP-632 which is a valid jira issue.

In response to this:

https://issues.redhat.com/browse/HOSTEDCP-632

Refactored version of #2336 to address #2336 (comment) and fixup/add unit tests

fyi @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 kubernetes/test-infra repository.

@celebdor
Copy link
Contributor

celebdor commented Apr 5, 2023

/retitle OCPBUGS-11439: allow z-stream upgrade even if CVO Upgradeable is false

@openshift-ci openshift-ci bot changed the title HOSTEDCP-632: allow z-stream upgrade even if CVO Upgradeable is false OCPBUGS-11439: allow z-stream upgrade even if CVO Upgradeable is false Apr 5, 2023
@openshift-ci-robot openshift-ci-robot added jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. labels Apr 5, 2023
@openshift-ci-robot
Copy link

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

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.14.0) matches configured target version for branch (4.14.0)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)

In response to this:

https://issues.redhat.com/browse/HOSTEDCP-632

Refactored version of #2336 to address #2336 (comment) and fixup/add unit tests

fyi @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 kubernetes/test-infra repository.

@muraee
Copy link
Contributor

muraee commented Apr 6, 2023

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Apr 6, 2023
@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD 6676c98 and 2 for PR HEAD 76d3e4c in total

@sjenning
Copy link
Contributor Author

sjenning commented Apr 6, 2023

/retest-required

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Apr 6, 2023

@sjenning: all tests passed!

Full PR test history. Your PR dashboard.

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

@openshift-merge-robot openshift-merge-robot merged commit 7e7c701 into openshift:main Apr 6, 2023
12 checks passed
@openshift-ci-robot
Copy link

@sjenning: Jira Issue OCPBUGS-11439: Some pull requests linked via external trackers have merged:

The following pull requests linked via external trackers have not merged:

These pull request must merge or be unlinked from the Jira bug in order for it to move to the next state. Once unlinked, request a bug refresh with /jira refresh.

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

In response to this:

https://issues.redhat.com/browse/HOSTEDCP-632

Refactored version of #2336 to address #2336 (comment) and fixup/add unit tests

fyi @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 kubernetes/test-infra repository.

@sjenning
Copy link
Contributor Author

/cherry-pick release-4.13

@openshift-cherrypick-robot

@sjenning: new pull request created: #2431

In response to this:

/cherry-pick release-4.13

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/hypershift-operator Indicates the PR includes changes for the hypershift operator and API - outside an OCP release bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants