OPNET-781: vendor: bump github.com/openshift/api, pin k8s.io modules at 0.35#10710
OPNET-781: vendor: bump github.com/openshift/api, pin k8s.io modules at 0.35#10710mkowalski wants to merge 1 commit into
Conversation
|
Pipeline controller notification For optional jobs, comment This repository is configured in: LGTM mode |
openshift-ci-robot
added
the
jira/valid-reference
|
@mkowalski: This pull request references OPNET-781 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 story 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. |
|
Note Reviews pausedIt looks like this branch is under active development. To avoid overwhelming you with review comments due to an influx of new commits, CodeRabbit has automatically paused this review. You can configure this behavior by changing the Use the following commands to manage reviews:
Use the checkboxes below for quick actions:
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: Enterprise Run ID: ⛔ Files ignored due to path filters (38)
📒 Files selected for processing (4)
🚧 Files skipped from review as they are similar to previous changes (4)
📝 WalkthroughWalkthroughChangesToolchain alignment
Estimated code review effort: 2 (Simple) | ~10 minutes 🚥 Pre-merge checks | ✅ 15✅ Passed checks (15 passed)
✨ Finishing Touches🧪 Generate unit tests (beta)
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.12.2)Error: can't load config: unsupported version of the configuration: "" See https://golangci-lint.run/docs/product/migration-guide for migration instructions Comment |
|
[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 |
9bcc0fc to
ae633de
Compare
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
There was a problem hiding this comment.
Actionable comments posted: 3
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Inline comments:
In @.idea/installer.iml:
- Around line 4-7: Update the NewModuleRootManager content entry in
installer.iml to use the repository-root variable $PROJECT_DIR$ instead of
$MODULE_DIR$, while leaving the inherited JDK and source-folder entries
unchanged.
In `@go.mod`:
- Line 344: Replace the pseudo-version of google.golang.org/protobuf in go.mod
with the appropriate stable release, update go.sum to match, and ensure no
references to the pre-release pseudo-version remain.
- Line 73: Remove the replacement redirect for github.com/openshift/api so the
declared upstream module version is used directly. If the fork is required,
document and review its diff, licensing, checksums, and signing before retaining
the replacement.
🪄 Autofix (Beta)
Fix all unresolved CodeRabbit comments on this PR:
- Push a commit to this branch (recommended)
- Create a new PR with the fixes
ℹ️ Review info
⚙️ Run configuration
Configuration used: Repository YAML (base), Central YAML (inherited)
Review profile: CHILL
Plan: Enterprise
Run ID: 2f5f0cec-6c5c-42c9-8d77-6164d18c2da6
⛔ Files ignored due to path filters (38)
go.sumis excluded by!**/*.sumvendor/github.com/openshift/api/config/v1/register.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/openshift/api/config/v1/types_crio_credential_provider_config.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/openshift/api/config/v1/types_infrastructure.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/openshift/api/config/v1/types_ingress.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/openshift/api/config/v1/types_kmsencryption.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/openshift/api/config/v1/types_network.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/openshift/api/config/v1/zz_generated.deepcopy.gois excluded by!vendor/**,!**/vendor/**,!**/zz_generated*vendor/github.com/openshift/api/config/v1/zz_generated.featuregated-crd-manifests.yamlis excluded by!vendor/**,!**/vendor/**,!**/zz_generated*vendor/github.com/openshift/api/config/v1/zz_generated.model_name.gois excluded by!vendor/**,!**/vendor/**,!**/zz_generated*vendor/github.com/openshift/api/config/v1/zz_generated.swagger_doc_generated.gois excluded by!vendor/**,!**/vendor/**,!**/zz_generated*vendor/github.com/openshift/api/config/v1alpha1/types_cluster_monitoring.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/openshift/api/config/v1alpha1/zz_generated.deepcopy.gois excluded by!vendor/**,!**/vendor/**,!**/zz_generated*vendor/github.com/openshift/api/config/v1alpha1/zz_generated.swagger_doc_generated.gois excluded by!vendor/**,!**/vendor/**,!**/zz_generated*vendor/github.com/openshift/api/features/features.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/openshift/api/machineconfiguration/v1/register.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/openshift/api/machineconfiguration/v1/types.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/openshift/api/machineconfiguration/v1/types_internalreleaseimage.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/openshift/api/machineconfiguration/v1/zz_generated.deepcopy.gois excluded by!vendor/**,!**/vendor/**,!**/zz_generated*vendor/github.com/openshift/api/machineconfiguration/v1/zz_generated.featuregated-crd-manifests.yamlis excluded by!vendor/**,!**/vendor/**,!**/zz_generated*vendor/github.com/openshift/api/machineconfiguration/v1/zz_generated.model_name.gois excluded by!vendor/**,!**/vendor/**,!**/zz_generated*vendor/github.com/openshift/api/machineconfiguration/v1/zz_generated.swagger_doc_generated.gois excluded by!vendor/**,!**/vendor/**,!**/zz_generated*vendor/github.com/openshift/api/operator/v1/types_authentication.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/openshift/api/operator/v1/types_csi_cluster_driver.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/openshift/api/operator/v1/types_ingresscontroller.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/openshift/api/operator/v1/types_kmsencryption.gois excluded by!vendor/**,!**/vendor/**vendor/github.com/openshift/api/operator/v1/zz_generated.deepcopy.gois excluded by!vendor/**,!**/vendor/**,!**/zz_generated*vendor/github.com/openshift/api/operator/v1/zz_generated.featuregated-crd-manifests.yamlis excluded by!vendor/**,!**/vendor/**,!**/zz_generated*vendor/github.com/openshift/api/operator/v1/zz_generated.model_name.gois excluded by!vendor/**,!**/vendor/**,!**/zz_generated*vendor/github.com/openshift/api/operator/v1/zz_generated.swagger_doc_generated.gois excluded by!vendor/**,!**/vendor/**,!**/zz_generated*vendor/github.com/openshift/api/operator/v1alpha1/types_clusterapi.gois excluded by!vendor/**,!**/vendor/**vendor/google.golang.org/protobuf/encoding/protodelim/protodelim.gois excluded by!vendor/**,!**/vendor/**vendor/google.golang.org/protobuf/encoding/protojson/decode.gois excluded by!vendor/**,!**/vendor/**vendor/google.golang.org/protobuf/encoding/protojson/well_known_types.gois excluded by!vendor/**,!**/vendor/**vendor/google.golang.org/protobuf/encoding/prototext/decode.gois excluded by!vendor/**,!**/vendor/**vendor/google.golang.org/protobuf/internal/descfmt/stringer.gois excluded by!vendor/**,!**/vendor/**vendor/google.golang.org/protobuf/internal/version/version.gois excluded by!vendor/**,!**/vendor/**vendor/modules.txtis excluded by!vendor/**,!**/vendor/**
📒 Files selected for processing (8)
.idea/.gitignore.idea/git_toolbox_prj.xml.idea/golinter.xml.idea/inspectionProfiles/profiles_settings.xml.idea/installer.iml.idea/modules.xml.idea/vcs.xmlgo.mod
ae633de to
d921a90
Compare
|
@CodeRabbit full review |
✅ Action performedFull review finished. |
d921a90 to
eab0c60
Compare
openshift/api master has moved to the Kubernetes 1.36 libraries and a
go 1.26 directive, while this repository is still on the 0.35 stack.
Two accompanying measures make the current API vendorable without the
full 1.36 rebase:
- replace directives pinning k8s.io/{api,apimachinery,client-go} at
v0.35.1 (client-go 0.35 imports k8s.io/api/scheduling/v1alpha1 which
0.36 removed, and the vendored controller-runtime predates the 0.36
client-go interfaces); same mechanism as the existing
controller-runtime pin, dropped when the 1.36 rebase happens
- the upi/libvirt/openstack CI Dockerfiles move from the
rhel-9-golang-1.25-openshift-4.22 builder to the same
rhel-9-golang-1.26-openshift-5.0 builder the main Dockerfile.ci
already uses, since the api module's go 1.26 directive now applies
Assisted-By: Claude Fable 5
Signed-off-by: Mat Kowalski <mko@redhat.com>
eab0c60 to
f3e16fa
Compare
|
/lgtm |
|
Scheduling required tests: Scheduling tests matching the |
|
/label approved |
|
/verified by CI |
openshift-ci-robot
added
the
verified
|
@mkowalski: This PR has been marked as verified by 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
approved
|
/close We will get API bump in #10713 |
|
@mkowalski: Closed this PR. 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. |
|
@mkowalski: 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. |
4 participants
Vendors current openshift/api master (356624ff, which includes the merged openshift/api#2923 BGPBasedVIPManagement API this is needed for) with the minimal set of changes possible today:
go get github.com/openshift/api@356624ff && go mod tidy && go mod vendorreplacedirectives pinningk8s.io/{api,apimachinery,client-go}at v0.35.1Why the pins
openshift/api master moved to the Kubernetes 1.36 libraries; this repo is on the 0.35 stack. Without the pins the module graph is unsatisfiable: client-go/kubectl 0.35 import
k8s.io/api/scheduling/v1alpha1(removed in 0.36), and bumping the trio breaks the vendored controller-runtime against client-go 0.36's newResourceEventHandlerRegistrationinterface — i.e. the full 1.36 rebase, which is its own effort. The replace-pin approach matches the existingsigs.k8s.io/controller-runtimepin in this go.mod and is trivially dropped when the 1.36 rebase lands.No code changes. Build passes;
./pkg/types/...and./pkg/asset/...test suites pass.This PR was prepared with AI assistance. Please verify before acting on it.
Summary by CodeRabbit