Unstructured OpenstackProviderSpec#2202
Unstructured OpenstackProviderSpec#2202openshift-merge-bot[bot] merged 1 commit intoopenshift:mce-2.3from
Conversation
This is a manual backport of openshift#2196 to address the move of OpenstackProviderSpec from cluster-api-provider-openstack to openstack/api/machine. We need to decode OpenstackProviderSpec to steal the osImage from the master machines so we can use that value for new workers. Rather than importing both schemata, trying to figure out which version we're talking to, and decoding against the correct one, this commit unmarshals the providerSpec as raw JSON into an Unstructured object and explicitly paths into it map-wise. On the creation side, we're told that the spoke cluster itself will understand the new thing even if it's an old version (MAPI also unmarshals the JSON raw). So it should be fine to continue using the existing version of vendored installer code to generate MachineSets. HIVE-2308
openshift-ci
Bot
added
the
approved
|
/assign @lleshchi |
|
@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 ReportAttention:
Additional details and impacted files@@ Coverage Diff @@
## mce-2.3 #2202 +/- ##
===========================================
+ Coverage 57.72% 57.81% +0.09%
===========================================
Files 186 186
Lines 25231 25226 -5
===========================================
+ Hits 14564 14585 +21
+ Misses 9428 9401 -27
- Partials 1239 1240 +1
|
|
/lgtm |
|
[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 |
2 participants
This is a manual backport of #2196 to address the move of OpenstackProviderSpec from cluster-api-provider-openstack to openstack/api/machine.
We need to decode OpenstackProviderSpec to steal the osImage from the master machines so we can use that value for new workers. Rather than importing both schemata, trying to figure out which version we're talking to, and decoding against the correct one, this commit unmarshals the providerSpec as raw JSON into an Unstructured object and explicitly paths into it map-wise.
On the creation side, we're told that the spoke cluster itself will understand the new thing even if it's an old version (MAPI also unmarshals the JSON raw). So it should be fine to continue using the existing version of vendored installer code to generate MachineSets.
HIVE-2308