-
Notifications
You must be signed in to change notification settings - Fork 587
WIP: Rebase 1.35 #2578
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: master
Are you sure you want to change the base?
WIP: Rebase 1.35 #2578
Conversation
|
Pipeline controller notification For optional jobs, comment |
|
Skipping CI for Draft Pull Request. |
|
Hello @jacobsee! Some important instructions when contributing to openshift/api: |
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: 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 |
|
/test all |
766c5eb to
ab9d438
Compare
ab9d438 to
1e4d8ce
Compare
📝 WalkthroughWalkthroughThis pull request updates the Go toolchain and build images from Go 1.24 to 1.25, bumps numerous module versions (including Kubernetes modules to v0.35.0 and multiple golang.org/x packages), and updates container base images to use golang-1.25. Several CRD OpenAPI descriptions are edited to add toleration operators Lt and Gt (noting they perform numeric comparisons and require the TaintTolerationComparisonOperators feature gate) and to remove RecoverVolumeExpansionFailure feature-gate wording from PVC/resource descriptions. Codegen now loads boilerplate via gengo with error handling. 🚥 Pre-merge checks | ✅ 1 | ❌ 2❌ Failed checks (2 inconclusive)
✅ Passed checks (1 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. ✨ Finishing touches
Warning There were issues while running some tools. Please review the errors and either fix the tool's configuration or disable the tool if it's a critical failure. 🔧 golangci-lint (2.5.0)Error: build linters: unable to load custom analyzer "kubeapilinter": tools/_output/bin/kube-api-linter.so, plugin: not implemented Comment |
|
/test all |
ae1d8fc to
9a02b63
Compare
fef37d6 to
e980854
Compare
e980854 to
a018c47
Compare
a018c47 to
54c7f8e
Compare
bb49d46 to
e5e4e13
Compare
…targets for codegen New function was introduced in kubernetes/kube-openapi@24f99be
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Actionable comments posted: 1
🤖 Fix all issues with AI agents
In `@tools/go.mod`:
- Line 36: The replace directive for sigs.k8s.io/controller-tools in go.mod
points to an OpenShift fork at v0.12.1-0.20260129094627-81028d02e14a which is
incompatible with Kubernetes v0.35.0 dependencies; update the replace or module
target referenced in the replace line to a fork/version of controller-tools that
matches or is compatible with upstream v0.18.0 (or remove the replace to use
sigs.k8s.io/controller-tools v0.18.0), ensuring k8s.io/apiextensions-apiserver,
k8s.io/apimachinery, k8s.io/code-generator and k8s.io/kube-openapi versions
align with Kubernetes v0.35.0; if the downgrade is intentional, add a clear
comment in go.mod and the PR explaining why this specific OpenShift fork/version
is required and which downstream compatibility constraints were validated.
🧹 Nitpick comments (1)
tools/go.mod (1)
21-21: Note: golang.org/x/tools version differs from root go.mod.The tools module uses
golang.org/x/tools v0.41.0while the root module usesv0.38.0. This version difference may be intentional if the tools module has different requirements, but worth confirming this is expected.
| ) | ||
|
|
||
| replace sigs.k8s.io/controller-tools => github.com/openshift/controller-tools v0.12.1-0.20260120141914-b0865777b142 | ||
| replace sigs.k8s.io/controller-tools => github.com/openshift/controller-tools v0.12.1-0.20260129094627-81028d02e14a |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🧩 Analysis chain
🏁 Script executed:
# Check if the pseudo-version resolves via Go proxy
curl -s "https://proxy.golang.org/github.com/openshift/controller-tools/@v/v0.12.1-0.20260129094627-81028d02e14a.info" | jq . 2>/dev/null || curl -s "https://proxy.golang.org/github.com/openshift/controller-tools/@v/v0.12.1-0.20260129094627-81028d02e14a.info"Repository: openshift/api
Length of output: 299
🏁 Script executed:
# Check the format of the pseudo-version (date part: 20260129 = Jan 29, 2026)
# This appears to be a future date; let's check what's actually available
echo "Pseudo-version breakdown:"
echo "- Base version: v0.12.1"
echo "- Timestamp: 20260129 (January 29, 2026)"
echo "- Short commit: 81028d02e14a"
echo ""
echo "Checking Go module proxy for available versions:"
curl -s "https://proxy.golang.org/github.com/openshift/controller-tools/@v/list" | head -20Repository: openshift/api
Length of output: 384
🏁 Script executed:
# Also check the base module that's being replaced
echo "Checking upstream controller-tools available versions:"
curl -s "https://proxy.golang.org/sigs.k8s.io/controller-tools/@v/list" | head -20Repository: openshift/api
Length of output: 280
🏁 Script executed:
cat -n tools/go.mod | head -60Repository: openshift/api
Length of output: 2834
Address critical version mismatch: controller-tools fork v0.12.1 is incompatible with Kubernetes v0.35.0 dependencies.
The go.mod requires sigs.k8s.io/controller-tools v0.18.0 (upstream) but replaces it with the OpenShift fork at v0.12.1-0.20260129094627-81028d02e14a. This is a 6 minor version downgrade applied to Kubernetes v0.35.0 dependencies (k8s.io/apiextensions-apiserver, k8s.io/apimachinery, k8s.io/code-generator, k8s.io/kube-openapi). The fork version is significantly older than what the upstream K8s libraries expect and will cause API incompatibilities. Upgrade the OpenShift fork to a version compatible with K8s v0.35.0, or document why this downgrade is intentional.
🤖 Prompt for AI Agents
In `@tools/go.mod` at line 36, The replace directive for
sigs.k8s.io/controller-tools in go.mod points to an OpenShift fork at
v0.12.1-0.20260129094627-81028d02e14a which is incompatible with Kubernetes
v0.35.0 dependencies; update the replace or module target referenced in the
replace line to a fork/version of controller-tools that matches or is compatible
with upstream v0.18.0 (or remove the replace to use sigs.k8s.io/controller-tools
v0.18.0), ensuring k8s.io/apiextensions-apiserver, k8s.io/apimachinery,
k8s.io/code-generator and k8s.io/kube-openapi versions align with Kubernetes
v0.35.0; if the downgrade is intentional, add a clear comment in go.mod and the
PR explaining why this specific OpenShift fork/version is required and which
downstream compatibility constraints were validated.
|
@jacobsee: 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. |
No description provided.