Update OpenStack spec dependencies#6382
Merged
openshift-merge-robot merged 1 commit intoopenshift:masterfrom Dec 5, 2022
Merged
Update OpenStack spec dependencies#6382openshift-merge-robot merged 1 commit intoopenshift:masterfrom
openshift-merge-robot merged 1 commit intoopenshift:masterfrom
Conversation
openshift-ci
Bot
added
the
do-not-merge/work-in-progress
Contributor
|
Skipping CI for Draft Pull Request. |
Contributor
Author
|
openshift/api was bumped with 1dd74ca |
openshift-ci
Bot
removed
the
do-not-merge/work-in-progress
Contributor
|
@pierreprinetti seems you need to run |
pierreprinetti
force-pushed
the
bump_capo
branch
from
8bf8856 to
1a8ac61
Compare
openshift-merge-robot
added
the
needs-rebase
pierreprinetti
changed the title
pierreprinetti
force-pushed
the
bump_capo
branch
from
1a8ac61 to
3315c48
Compare
openshift-merge-robot
removed
the
needs-rebase
pierreprinetti
force-pushed
the
bump_capo
branch
2 times, most recently
from
2370c06 to
91c45e6
Compare
Contributor
Author
|
/hold |
openshift-ci
Bot
added
the
do-not-merge/hold
pierreprinetti
force-pushed
the
bump_capo
branch
6 times, most recently
from
5585140 to
f9dfbc4
Compare
Contributor
Author
|
Should be ready now. |
Contributor
Author
|
/hold cancel |
Contributor
Author
|
/retest-required |
Contributor
Author
|
@patrickdillon Any chance we can override ci/prow/e2e-vsphere-ovn? |
Contributor
Author
|
/hold cancel |
openshift-ci
Bot
removed
the
do-not-merge/hold
Contributor
Contributor
Contributor
Author
|
/retest-required |
Contributor
Contributor
Author
|
/skip |
Contributor
|
/hold Revision f8bf57d was retested 3 times: holding |
openshift-ci
Bot
added
the
do-not-merge/hold
Contributor
Author
|
/hold cancel |
openshift-ci
Bot
removed
the
do-not-merge/hold
Contributor
Author
|
/retest-required |
Contributor
Contributor
Author
|
/retest |
Contributor
Contributor
Author
|
/retest-required |
Contributor
Contributor
|
/hold Revision f8bf57d was retested 3 times: holding |
openshift-ci
Bot
added
the
do-not-merge/hold
Contributor
Author
|
/retest-required |
openshift-ci
Bot
removed
the
do-not-merge/hold
Contributor
Author
|
/retest |
Contributor
|
@pierreprinetti: The following tests failed, say
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. |
2uasimojo
added a commit
to 2uasimojo/hive
that referenced
this pull request
Sep 18, 2023
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
2uasimojo
added a commit
to 2uasimojo/hive
that referenced
this pull request
Sep 26, 2023
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)
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
8 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.
The the OpenStack providerSpec for Machine has been moved to openshift/api.
Implements OSASINFRA-2981