mce-2.4: OpenstackProviderSpec moved to to machinev1alpha1#2119
Merged
openshift-merge-robot merged 2 commits intoopenshift:mce-2.4from Sep 26, 2023
Merged
Conversation
This was missed in openshift#2052 / 26a0b81. HIVE-2308 (cherry picked from commit 1f1ec2c)
Since the recent revendor (openshift#2052 / 26a0b81), OpenstackProviderSpec (embedded in MachineSets under OpenStack) stopped being able to unmarshal. This is because its schema moved from github.com/openshift/cluster-api-provider-openstack to github.com/openshift/api/machine/v1alpha1 and the revendor picked up this move from the installer code: see openshift/installer#6382 This commit moves our references accordingly to match that upstream code. Quirk 1: Strangely, this one type is in o/api/machine v1alpha1 even though everything else in o/api/machine is in v1beta1. Quirk 2: o/api/machine v1alpha1's registration methods don't actually register the OpenstackProviderSpec type. (Why??) So we have to register it explicitly, as the installer does. This more or less reverts the prior attempt at openshift#2114 / 1f1ec2c, which turned out to be completely redundant (the added registration call ended up in the same place as the one on the previous line). HIVE-2308 (cherry picked from commit 43376d8)
Member
Author
|
/assign @lleshchi |
openshift-ci
Bot
added
the
approved
Contributor
|
@2uasimojo: all tests passed! Full PR test history. Your PR dashboard. DetailsInstructions 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. |
Codecov Report
Additional details and impacted files@@ Coverage Diff @@
## mce-2.4 #2119 +/- ##
===========================================
+ Coverage 57.49% 57.57% +0.07%
===========================================
Files 187 187
Lines 25749 25834 +85
===========================================
+ Hits 14804 14873 +69
- Misses 9709 9716 +7
- Partials 1236 1245 +9
|
Contributor
|
/lgtm |
Contributor
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: 2uasimojo, lleshchi The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR backports fixes for OpenstackProviderSpec having been moved from cluster-api-provider-openstack to openshift/api/machine/v1alpha1 as part of the Great Revendor (#2052).
For the sake of form, both related commits are backported, even though the first one was bogus (the second one gets us into a good and clean state).
HIVE-2308