OSPRH-33247: Update openshift/release CAPO rebasebot periodic configs to reference hook script - #82967
OSPRH-33247: Update openshift/release CAPO rebasebot periodic configs to reference hook script #82967dlaw4608 wants to merge 1 commit into
Conversation
…-rebase hook The builtin --update-go-modules hook fails on CAPO because go mod tidy resolves sigs.k8s.io/cluster-api/api@latest to an incompatible version (v1.14.0-rc.0) that no longer contains the v1beta1 package. Replace it with a custom --post-rebase-hook that runs make merge-bot, which handles downstream vendoring correctly with pinned dependencies. Depends on openshift/cluster-api-provider-openstack#428. Signed-off-by: Daniel Lawton <dlawton@redhat.com>
openshift-ci-robot
added
the
jira/valid-reference
|
@dlaw4608: This pull request references OSPRH-33247 which is a valid jira issue. Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the task to target the "5.0.0" version, but no target version was set. 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. |
|
/hold |
|
No actionable comments were generated in the recent review. 🎉 ℹ️ Recent review info⚙️ Run configurationConfiguration used: Repository YAML (base), Central YAML (inherited) Review profile: CHILL Plan: Pro Plus Run ID: 📒 Files selected for processing (8)
WalkthroughThe OpenStack periodic rebasebot configurations now invoke ChangesOpenStack periodic rebase workflows
Estimated code review effort: 2 (Simple) | ~5 minutes 🚥 Pre-merge checks | ✅ 15✅ Passed checks (15 passed)
✨ Finishing Touches🧪 Generate unit tests (beta)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
openshift-ci
Bot
added
the
do-not-merge/hold
|
[REHEARSALNOTIFIER]
Prior to this PR being merged, you will need to either run and acknowledge or opt to skip these rehearsals. Interacting with pj-rehearseComment: Once you are satisfied with the results of the rehearsals, comment: |
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: dlaw4608 The full list of commands accepted by this bot can be found here. DetailsNeeds approval from an approver in each of these files:Approvers can indicate their approval by writing |
|
@dlaw4608: 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-sigs/prow repository. I understand the commands that are listed here. |
2 participants
Why this is needed:
The CAPO rebasebot periodic jobs for main, release-4.21, and release-4.22 have been consistently failing since the upstream
sigs.k8s.io/cluster-apimodule was split. The builtin_BUILTIN_/update_go_modules.shhook resets allgo.modfiles to upstream versions and runsgo mod tidyon every module in the repo, including./hack/tools.This cannot be fixed with the builtin because it wipes any downstream pins before running
go mod tidy. The custom hook avoids this entirely by runningmake merge-bot, which uses the fork's own vendoring logic with pinned dependencies.What this PR does:
--update-go-moduleswith--post-rebase-hook git:dest/main:hack/rebasebot-helpers/post-rebase.shacross all 8 CAPO periodic rebasebot configs (main + release-4.16 through 4.22)update_go_modules.shhook resetsgo.modto upstream and runsgo mod tidyunconstrained, which resolvessigs.k8s.io/cluster-api/api@latesttov1.14.0-rc.0— an incompatible pre-release that no longer contains thev1beta1package
make merge-botinstead, which handles downstream vendoring with pinned dependenciesDepends on openshift/cluster-api-provider-openstack#428.
Summary by CodeRabbit
This PR updates the CAPO periodic rebasebot jobs for
mainand release branches 4.16 through 4.22.It replaces the built-in
--update-go-modulesstep with--post-rebase-hook git:dest/main:hack/rebasebot-helpers/post-rebase.sh.This change makes the rebase flow run
make merge-botafter each rebase. That keeps downstream dependency pins intact and avoids an incompatible resolution ofsigs.k8s.io/cluster-api/api.The change depends on
openshift/cluster-api-provider-openstack#428.