Use openshift/api instead of machine-api-operator#5350
Use openshift/api instead of machine-api-operator#5350openshift-merge-robot merged 2 commits intoopenshift:masterfrom kirankt:remove-mao-vendor
Conversation
|
/test e2e-vsphere |
|
/retest |
kirankt
changed the title
openshift-ci
bot
added
the
do-not-merge/work-in-progress
|
/retest |
1 similar comment
|
/retest |
pkg/asset/machines/master.go
Outdated
There was a problem hiding this comment.
This is not an adequate replacement. The scheme from github.com/openshift/api/machine/v1beta1 does not include the provider specs [1]. If we want to use the types defined in openshift/api, then we will need to manual add the vSphere provider spec to the scheme.
There was a problem hiding this comment.
I agree. I was aware of the CI failure and was looking for a solution for this.
There was a problem hiding this comment.
Added the vspherespec into scheme.
Add vsphere spec into machineapi scheme
MAO vendored in due to alibaba deps
|
/test e2e-vsphere |
|
From the latest e2e-vsphere job, /lgtm |
openshift-ci
bot
changed the title
openshift-ci
bot
removed
the
do-not-merge/work-in-progress
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: staebler 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 |
openshift-ci
bot
added
the
approved
|
/retest-required Please review the full test history for this PR and help us cut down flakes. |
8 similar comments
|
/retest-required Please review the full test history for this PR and help us cut down flakes. |
|
/retest-required Please review the full test history for this PR and help us cut down flakes. |
|
/retest-required Please review the full test history for this PR and help us cut down flakes. |
|
/retest-required Please review the full test history for this PR and help us cut down flakes. |
|
/retest-required Please review the full test history for this PR and help us cut down flakes. |
|
/retest-required Please review the full test history for this PR and help us cut down flakes. |
|
/retest-required Please review the full test history for this PR and help us cut down flakes. |
|
/retest-required Please review the full test history for this PR and help us cut down flakes. |
|
/retest-required Please review the full test history for this PR and help us cut down flakes. |
2 similar comments
|
/retest-required Please review the full test history for this PR and help us cut down flakes. |
|
/retest-required Please review the full test history for this PR and help us cut down flakes. |
|
@kirankt: 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. |
|
/retest-required Please review the full test history for this PR and help us cut down flakes. |
5 similar comments
|
/retest-required Please review the full test history for this PR and help us cut down flakes. |
|
/retest-required Please review the full test history for this PR and help us cut down flakes. |
|
/retest-required Please review the full test history for this PR and help us cut down flakes. |
|
/retest-required Please review the full test history for this PR and help us cut down flakes. |
|
/retest-required Please review the full test history for this PR and help us cut down flakes. |
5 participants
This PR is a follow up to #5331.
In the previous PR, references to machine-api-operator was left behind. This PR removes the last references to machine-api-operator in the installer code. Please note that the MAO is still vendored indirectly because other packages haven't moved to openshift/api yet.
e.g. https://github.com/openshift/cluster-api-provider-ovirt/blob/master/pkg/apis/ovirtprovider/v1beta1/register.go