[SANDBOX-1702] Upgrade to OCP 4.21#1250
[SANDBOX-1702] Upgrade to OCP 4.21#1250metlos wants to merge 4 commits intocodeready-toolchain:masterfrom
Conversation
Update openshift/api to release-4.21, openshift/library-go to release-4.21, k8s.io dependencies to v0.34.3, and controller-runtime to v0.22.5. Fix test assertion for changed k8s validation error message format that now includes the resource type in the error string. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
WalkthroughThis change updates Kubebuilder controller-gen version annotations in CRD manifests from v0.18.0 to v0.19.0, adjusts a test error message expectation, and bumps multiple Go module dependencies to newer versions including Kubernetes libraries and OpenShift releases, with replace directives redirecting codeready-toolchain modules to metlos alternatives. Changes
Estimated code review effort🎯 2 (Simple) | ⏱️ ~12 minutes 🚥 Pre-merge checks | ✅ 2 | ❌ 1❌ Failed checks (1 warning)
✅ Passed checks (2 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. ✨ Finishing Touches🧪 Generate unit tests (beta)
📝 Coding Plan
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 |
|
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
There was a problem hiding this comment.
Actionable comments posted: 1
🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.
Inline comments:
In `@go.mod`:
- Around line 160-162: Remove the two replace directives that point
github.com/codeready-toolchain/api and
github.com/codeready-toolchain/toolchain-common to your personal fork
(github.com/metlos/*); specifically delete the replace lines referencing
github.com/metlos/api and github.com/metlos/toolchain-common from go.mod so the
project uses the upstream modules again, and if the fork is required only for
temporary local development, move those replaces into a local branch or
developer-specific go.mod/go.work and add a comment or README entry describing
the temporary nature and cleanup plan.
ℹ️ Review info
⚙️ Run configuration
Configuration used: Organization UI
Review profile: CHILL
Plan: Pro
Run ID: 622badbb-6de9-47e6-b574-d8021dc2183e
⛔ Files ignored due to path filters (1)
go.sumis excluded by!**/*.sum
📒 Files selected for processing (20)
config/crd/bases/toolchain.dev.openshift.com_bannedusers.yamlconfig/crd/bases/toolchain.dev.openshift.com_masteruserrecords.yamlconfig/crd/bases/toolchain.dev.openshift.com_notifications.yamlconfig/crd/bases/toolchain.dev.openshift.com_nstemplatetiers.yamlconfig/crd/bases/toolchain.dev.openshift.com_proxyplugins.yamlconfig/crd/bases/toolchain.dev.openshift.com_socialevents.yamlconfig/crd/bases/toolchain.dev.openshift.com_spacebindingrequests.yamlconfig/crd/bases/toolchain.dev.openshift.com_spacebindings.yamlconfig/crd/bases/toolchain.dev.openshift.com_spaceprovisionerconfigs.yamlconfig/crd/bases/toolchain.dev.openshift.com_spacerequests.yamlconfig/crd/bases/toolchain.dev.openshift.com_spaces.yamlconfig/crd/bases/toolchain.dev.openshift.com_tiertemplaterevisions.yamlconfig/crd/bases/toolchain.dev.openshift.com_tiertemplates.yamlconfig/crd/bases/toolchain.dev.openshift.com_toolchainclusters.yamlconfig/crd/bases/toolchain.dev.openshift.com_toolchainconfigs.yamlconfig/crd/bases/toolchain.dev.openshift.com_toolchainstatuses.yamlconfig/crd/bases/toolchain.dev.openshift.com_usersignups.yamlconfig/crd/bases/toolchain.dev.openshift.com_usertiers.yamlcontrollers/usersignup/status_updater_test.gogo.mod
| replace github.com/codeready-toolchain/api => github.com/metlos/api v0.0.0-20260318102359-237e681a639a | ||
|
|
||
| replace github.com/codeready-toolchain/toolchain-common => github.com/metlos/toolchain-common v0.0.0-20260318113116-fbd4bba9beb1 |
There was a problem hiding this comment.
🧩 Analysis chain
🏁 Script executed:
#!/bin/bash
# Verify fork replacements and whether they are documented as temporary.
set -euo pipefail
echo "== Active replace directives in go.mod =="
rg -n '^\s*replace\s+github\.com/codeready-toolchain/(api|toolchain-common)\s*=>\s*github\.com/metlos/' go.mod
echo
echo "== Any other metlos module pinning in go.mod/go.sum =="
rg -n 'github\.com/metlos/(api|toolchain-common)' go.mod go.sum
echo
echo "== Documentation mentioning temporary fork overrides =="
rg -n 'metlos/(api|toolchain-common)|replace github\.com/codeready-toolchain/(api|toolchain-common)|temporary replace' -g '*.md'Repository: codeready-toolchain/host-operator
Length of output: 1395
Remove personal fork overrides from root go.mod.
Lines 160 and 162 redirect core modules to github.com/metlos/* without documentation of temporary status or cleanup plan. This changes the dependency trust boundary and can hide upstream integration regressions. Fork overrides belong in local development environments or feature branches with explicit cleanup guidance, not in merged code.
Suggested fix
-replace github.com/codeready-toolchain/api => github.com/metlos/api v0.0.0-20260318102359-237e681a639a
-
-replace github.com/codeready-toolchain/toolchain-common => github.com/metlos/toolchain-common v0.0.0-20260318113116-fbd4bba9beb1📝 Committable suggestion
‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.
| replace github.com/codeready-toolchain/api => github.com/metlos/api v0.0.0-20260318102359-237e681a639a | |
| replace github.com/codeready-toolchain/toolchain-common => github.com/metlos/toolchain-common v0.0.0-20260318113116-fbd4bba9beb1 |
🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed.
In `@go.mod` around lines 160 - 162, Remove the two replace directives that point
github.com/codeready-toolchain/api and
github.com/codeready-toolchain/toolchain-common to your personal fork
(github.com/metlos/*); specifically delete the replace lines referencing
github.com/metlos/api and github.com/metlos/toolchain-common from go.mod so the
project uses the upstream modules again, and if the fork is required only for
temporary local development, move those replaces into a local branch or
developer-specific go.mod/go.work and add a comment or README entry describing
the temporary nature and cleanup plan.
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: alexeykazakov, MatousJobanek, metlos 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 |
|
/retest |
|
@metlos: The following test 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. |
|
PR needs rebase. 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. |
3 participants
Related PRs:
Summary by CodeRabbit
Chores
Tests