OSASINFRA-3690: Bump machine-api-operator #136
Conversation
openshift-ci-robot
added
the
jira/valid-reference
|
@stephenfin: This pull request references OSASINFRA-3690 which is a valid jira issue. DetailsIn response to this:
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 openshift-eng/jira-lifecycle-plugin repository. |
openshift-ci
bot
added
the
do-not-merge/work-in-progress
|
Skipping CI for Draft Pull Request. |
openshift-ci
bot
added
the
approved
|
/assign |
Achieved by updating with release-0.9 branch: replace sigs.k8s.io/cluster-api-provider-openstack => github.com/openshift/cluster-api-provider-openstack release-0.9 Then tidying things up: go mod tidy go mod vendor Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
To pick up [1], among other changes since we last bumped this. go get github.com/openshift/machine-api-operator@main go mod tidy go mod vendor [1] openshift/machine-api-operator#1362 Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
stephenfin
force-pushed
the
OSASINFRA-3690
branch
from
d809968 to
215172b
Compare
openshift-ci
bot
removed
the
do-not-merge/work-in-progress
|
@stephenfin: This pull request references OSASINFRA-3690 which is a valid jira issue. DetailsIn response to this:
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 openshift-eng/jira-lifecycle-plugin repository. |
|
/cc @mandre |
openshift-ci
bot
requested review from
mandre
and removed request for
gryf and
pierreprinetti
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: mandre, stephenfin 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 |
|
Known frequent flake in e2e-openstack job. |
|
@mandre: Overrode contexts on behalf of mandre: ci/prow/e2e-openstack DetailsIn response to this:
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-sigs/prow repository. |
|
@stephenfin: 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-sigs/prow repository. I understand the commands that are listed here. |
openshift-merge-bot
bot
merged commit 5085f18
into
openshift:main
|
[ART PR BUILD NOTIFIER] Distgit: ose-machine-api-provider-openstack |
4 participants
This is two part change. We first (hopefully temporarily) switch to the github.com/openshift fork of CAPO, allowing us to pull in kubernetes-sigs/cluster-api-provider-openstack#2612 before it's merged upstream. This is important since it allows us to drop all of the webhook-related code (we don't use it in MAPO) and in turn drop the indirect dependency on
controller-runtimefrom CAPO. We then bump machine-api-operator (MAO) to the latest and greatest version. This bumps many indirect dependencies, includingcontroller-runtime, but is relatively noddy otherwise (I've described the steps taken in the commit messages). Failure to do the first step results in the bump of MAO also bumping CAPO. We can't do that since CAPO v0.10 was a massive rework that will require an equally massive rework in MAPO, which we don't want to do.