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.

Sign up for GitHub

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

Jump to bottom

Revert "Merge pull request #2770 from dharaneeshvrd/upgrade-capi-ibmcloud #2776

Merged
merged 1 commit into from Jul 6, 2023
Merged

Revert "Merge pull request #2770 from dharaneeshvrd/upgrade-capi-ibmcloud #2776

merged 1 commit into from Jul 6, 2023

Conversation

sjenning
Copy link
Contributor

@sjenning sjenning commented Jul 6, 2023 •
edited

@netlify
Copy link

netlify bot commented Jul 6, 2023

✅ Deploy Preview for hypershift-docs ready!

Name Link
🔨 Latest commit 07a0796
🔍 Latest deploy log https://app.netlify.com/sites/hypershift-docs/deploys/64a6d39a14e679000738ec2f
😎 Deploy Preview https://deploy-preview-2776--hypershift-docs.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

@sjenning
Revert "Merge pull request openshift#2770 from dharaneeshvrd/upgrade-…
949ae22 
…capi-ibmcloud"

This reverts commit 836efe7, reversing
changes made to 28fd470.
@openshift-ci openshift-ci bot added area/ci-tooling Indicates the PR includes changes for CI or tooling area/cli Indicates the PR includes changes for CLI labels Jul 6, 2023
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jul 6, 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 area/control-plane-operator Indicates the PR includes changes for the control plane operator - in an OCP release approved Indicates a PR has been approved by an approver from all required OWNERS files. area/documentation Indicates the PR includes changes for documentation area/hypershift-operator Indicates the PR includes changes for the hypershift operator and API - outside an OCP release and removed do-not-merge/needs-area labels Jul 6, 2023
@sjenning
Copy link
Contributor Author

sjenning commented Jul 6, 2023

/override ci/prow/e2e-aws
/override ci/prow/e2e-kubevirt-aws-ovn

@muraee
Copy link
Contributor

muraee commented Jul 6, 2023

/lgtm

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

openshift-ci bot commented Jul 6, 2023

@sjenning: Overrode contexts on behalf of sjenning: ci/prow/e2e-aws, ci/prow/e2e-kubevirt-aws-ovn

In response to this:

/override ci/prow/e2e-aws
/override ci/prow/e2e-kubevirt-aws-ovn

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.

@enxebre
Copy link
Member

enxebre commented Jul 6, 2023 •
edited

@dharaneeshvrd
This is because we didn't account for transitions from existing HC/HOs.
See #2000
https://github.com/openshift/hypershift/blob/main/api/v1beta1/capi_types.go#L5-L6
Also I'm not sure how this could work at all given you are pointing to v1 here https://github.com/openshift/hypershift/blob/main/cmd/install/assets/assets.go#L37-L41

If you don't want any kind of backward compatibility the hypershift install would need to account for removing existing powerIBM CRDs first so apply command stop complaining about the stored version.

@openshift-merge-robot openshift-merge-robot merged commit 4b49f1f into openshift:main Jul 6, 2023
12 of 14 checks passed
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Jul 6, 2023

@sjenning: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/e2e-ibmcloud-roks 949ae22 link false /test e2e-ibmcloud-roks
ci/prow/e2e-ibmcloud-iks 949ae22 link false /test e2e-ibmcloud-iks

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.

@dharaneeshvrd
Copy link
Member

@enxebre
Apologies for the inconvenience caused and thanks for the input.
I have reworked on this and created a PR here #2831
Tested the upgrade scenarios works fine.

Please review this PR

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@csrwng csrwng Awaiting requested review from csrwng

@isco-rodriguez isco-rodriguez Awaiting requested review from isco-rodriguez

Assignees

@muraee muraee

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/ci-tooling Indicates the PR includes changes for CI or tooling area/cli Indicates the PR includes changes for CLI area/control-plane-operator Indicates the PR includes changes for the control plane operator - in an OCP release area/documentation Indicates the PR includes changes for documentation area/hypershift-operator Indicates the PR includes changes for the hypershift operator and API - outside an OCP release lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@sjenning @muraee @enxebre @dharaneeshvrd @openshift-merge-robot