LOG-8992: update dependencies to match OCP v4.22#3275
Merged
openshift-merge-bot[bot] merged 2 commits intoMay 15, 2026
Conversation
openshift-ci-robot
added
the
jira/valid-reference
|
@jcantrill: This pull request references LOG-8992 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 sub-task to target the "4.8.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:
📝 WalkthroughWalkthroughBump Go toolchain to 1.25, refresh dependency pins, adjust build wiring/Makefile, update CSV/CRD docs and operator env var, migrate several tests to controller-runtime fake clients with scheme normalization, and change a REST client construction call in the test client. ChangesBuild image, toolchain, and dependency pins
Manifests and CRD schema docs
Tests and client changes
Estimated code review effort🎯 4 (Complex) | ⏱️ ~45 minutes 🚥 Pre-merge checks | ✅ 10 | ❌ 2❌ Failed checks (2 warnings)
✅ Passed checks (10 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. ✨ Finishing Touches🧪 Generate unit tests (beta)
Comment |
openshift-ci
Bot
added
the
midstream/Dockerfile
Contributor
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: jcantrill 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 |
openshift-ci
Bot
added
the
approved
![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 `@Dockerfile`:
- Line 9: The RUN conditional in the Dockerfile uses an unquoted variable in the
shell test ([ -n $CACHE_DEPS ]), which can mis-evaluate when CACHE_DEPS is
empty; update the test to quote the variable (e.g. [ -n "$CACHE_DEPS" ]) so the
condition is evaluated correctly and the go mod download step only runs when
CACHE_DEPS is set.
In `@go.mod`:
- Line 124: The go.mod currently pins google.golang.org/grpc to v1.72.2 which
contains a critical auth bypass; update the grpc module requirement to v1.79.3
or later (replace the line referencing google.golang.org/grpc v1.72.2) and then
run go get google.golang.org/grpc@v1.79.3 (or newer) followed by go mod tidy to
refresh indirect dependencies; ensure the module entry for
google.golang.org/grpc in go.mod and go.sum are updated accordingly and run
tests to validate no breakage.
- Line 107: Update the vulnerable dependency go.opentelemetry.io/otel/sdk from
v1.36.0 to v1.40.0 or later in go.mod (the module name is
go.opentelemetry.io/otel/sdk) and re-resolve the module graph so transitive OTel
modules are upgraded as well; after changing the version run your project’s Go
module resolution (e.g., re-fetch and tidy modules) to ensure the new version is
recorded and the lockfile / go.sum are updated.
🪄 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: openshift/coderabbit/.coderabbit.yaml
Review profile: CHILL
Plan: Enterprise
Run ID: cd1b40f5-1409-45d6-9370-44bab0de27fe
⛔ Files ignored due to path filters (1)
go.sumis excluded by!**/*.sum
📒 Files selected for processing (3)
Dockerfilecmd/main.gogo.mod
💤 Files with no reviewable changes (1)
- cmd/main.go
Contributor
Author
|
/label tide/merge-method-squash |
openshift-ci
Bot
added
the
tide/merge-method-squash
There was a problem hiding this comment.
Actionable comments posted: 2
🤖 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 `@Dockerfile`:
- Line 9: The RUN conditional currently tests only for a non-empty CACHE_DEPS
which treats "false" as true; change the test to an explicit boolean equality
check against the intended truthy value (e.g., test CACHE_DEPS = "true" or =
"1") so go mod download only runs when CACHE_DEPS is explicitly enabled; update
the RUN line that references CACHE_DEPS and runs go mod download accordingly and
ensure any documentation or CI that sets CACHE_DEPS uses the chosen true value.
In `@go.mod`:
- Around line 103-108: The go.mod pins vulnerable OpenTelemetry modules
(go.opentelemetry.io/otel, go.opentelemetry.io/otel/sdk and related packages) at
v1.40.0; update the affected module versions in go.mod so they use patched
releases (e.g., set go.opentelemetry.io/otel to v1.41.0 and
go.opentelemetry.io/otel/sdk to v1.43.0, and align related
exporters/metric/trace modules to compatible patched versions such as v1.41.0+
or v1.43.0+), then run `go get`/`go mod tidy` to resolve and verify the
dependency graph and ensure no breakages in functions that initialize or use
OpenTelemetry components (look for code referencing go.opentelemetry.io/otel,
go.opentelemetry.io/otel/sdk, go.opentelemetry.io/otel/metric,
go.opentelemetry.io/otel/trace, and
go.opentelemetry.io/otel/exporters/otlp/otlptrace).
🪄 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: openshift/coderabbit/.coderabbit.yaml
Review profile: CHILL
Plan: Enterprise
Run ID: e366fcf3-7137-43a7-9d81-d72e86a781ce
⛔ Files ignored due to path filters (1)
go.sumis excluded by!**/*.sum
📒 Files selected for processing (4)
Dockerfilego.modinternal/auth/rbac_test.gotest/helpers_test.go
💤 Files with no reviewable changes (1)
- internal/auth/rbac_test.go
Contributor
Author
|
/test e2e-target |
vparfonov
reviewed
May 14, 2026
Contributor
Author
|
/test functional-target |
openshift-ci
Bot
added
the
needs-rebase
LOG-8991: update golang builder LOG-8992: update k8s dependencies LOG-9001: update the operator-sdk, controller-runtime, bingo and tools fix(cve): update golang.org/x/image to fix CVE-2026-33813
openshift-ci
Bot
removed
the
needs-rebase
There was a problem hiding this comment.
Actionable comments posted: 1
🧹 Nitpick comments (1)
bundle/manifests/cluster-logging.clusterserviceversion.yaml (1)
2554-2555: 💤 Low valueAdd a comment explaining why WatchListClient is disabled.
The environment variable
KUBE_FEATURE_WatchListClient=falsedisables a Kubernetes 1.35+ feature for efficient list-watch operations. Since the commit only states "fix unit tests," clarify in a code comment or commit message whether this is a temporary workaround for test compatibility or a permanent stability measure, and reference any related issues.🤖 Prompt for 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. In `@bundle/manifests/cluster-logging.clusterserviceversion.yaml` around lines 2554 - 2555, Add a concise code comment next to the KUBE_FEATURE_WatchListClient environment variable explaining why WatchListClient is disabled (e.g., "disabled for Kubernetes 1.35+ list-watch incompatibility; temporary workaround for unit test failures" or "disabled for stability — permanent"), reference any related issue/PR number if available, and update the commit message to mirror that rationale; locate the env var named KUBE_FEATURE_WatchListClient in the cluster-logging.clusterserviceversion.yaml manifest and insert the explanatory comment immediately above or beside the "- name: KUBE_FEATURE_WatchListClient" entry so future readers know whether this is a temporary test compatibility fix or an intentional product decision.
🤖 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 `@go.mod`:
- Line 90: The go.mod currently pins github.com/moby/spdystream at v0.5.0 which
has a HIGH-severity DOS vulnerability; update the dependency to v0.5.1 by either
changing the module version entry for github.com/moby/spdystream to v0.5.1 or,
if k8s.io/client-go@v0.35.1 prevents a direct upgrade, add an explicit replace
directive in go.mod forcing github.com/moby/spdystream =>
github.com/moby/spdystream v0.5.1 and run go mod tidy to refresh the lockfile
and verify the indirect dependency is resolved.
---
Nitpick comments:
In `@bundle/manifests/cluster-logging.clusterserviceversion.yaml`:
- Around line 2554-2555: Add a concise code comment next to the
KUBE_FEATURE_WatchListClient environment variable explaining why WatchListClient
is disabled (e.g., "disabled for Kubernetes 1.35+ list-watch incompatibility;
temporary workaround for unit test failures" or "disabled for stability —
permanent"), reference any related issue/PR number if available, and update the
commit message to mirror that rationale; locate the env var named
KUBE_FEATURE_WatchListClient in the cluster-logging.clusterserviceversion.yaml
manifest and insert the explanatory comment immediately above or beside the "-
name: KUBE_FEATURE_WatchListClient" entry so future readers know whether this is
a temporary test compatibility fix or an intentional product decision.
🪄 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: openshift/coderabbit/.coderabbit.yaml
Review profile: CHILL
Plan: Enterprise
Run ID: bf704667-6dbe-47fe-8da6-0364c410d642
⛔ Files ignored due to path filters (1)
go.sumis excluded by!**/*.sum
📒 Files selected for processing (18)
.bingo/bingo.mod.bingo/controller-gen.mod.bingo/gen-crd-api-reference-docs.mod.bingo/go.mod.bingo/golangci-lint.mod.bingo/junitreport.mod.bingo/kustomize.mod.bingo/operator-sdk.mod.bingo/opm.modMakefilebundle/manifests/cluster-logging.clusterserviceversion.yamlbundle/manifests/logging.openshift.io_logfilemetricexporters.yamlconfig/crd/bases/logging.openshift.io_logfilemetricexporters.yamlconfig/manager/manager.yamlgo.modinternal/metrics/dashboard/dashboards_test.gointernal/reconcile/scc_test.gotest/client/client.go
✅ Files skipped from review due to trivial changes (9)
- .bingo/controller-gen.mod
- .bingo/kustomize.mod
- .bingo/operator-sdk.mod
- .bingo/golangci-lint.mod
- .bingo/bingo.mod
- .bingo/go.mod
- .bingo/gen-crd-api-reference-docs.mod
- config/manager/manager.yaml
- .bingo/opm.mod
Contributor
|
/lgtm |
Contributor
|
@jcantrill: 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. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
This PR:
Links
cc @vparfonov @Clee2691
Summary by CodeRabbit
Chores
Behavioral Change
API/Schema
Tests