Skip to content

NO-JIRA: fix(deps): update k8s.io/utils digest to 914a6e7#7450

Merged
openshift-merge-bot[bot] merged 4 commits intoopenshift:mainfrom
bryan-cox:fix/konflux/mintmaker/main-main/k8s.io-utils-digest
Jan 12, 2026
Merged

NO-JIRA: fix(deps): update k8s.io/utils digest to 914a6e7#7450
openshift-merge-bot[bot] merged 4 commits intoopenshift:mainfrom
bryan-cox:fix/konflux/mintmaker/main-main/k8s.io-utils-digest

Conversation

@bryan-cox
Copy link
Copy Markdown
Member

Summary

This PR supersedes #7177 (authored by app/red-hat-konflux).

The original bot PR required additional fixes to pass CI verification:

  • Fixed deprecated slices.Contains from k8s.io/utils/strings/slices by switching to stdlib slices package
  • Updated vendored dependencies to remove unused deprecated package

Commits

This PR organizes changes into logical commits:

  1. Original dependency update from bot PR (k8s.io/utils digest update)
  2. Fix for deprecated slices.Contains usage
  3. Vendored dependency updates

Original PR Description

This PR contains the following updates:

Package Type Update Change
k8s.io/utils require digest 4c0f3b2 -> 914a6e7
k8s.io/utils replace digest 3ea5e8c -> 914a6e7
k8s.io/utils indirect digest 3ea5e8c -> 914a6e7
k8s.io/utils indirect digest e7106e6 -> 914a6e7
k8s.io/utils indirect digest 4c0f3b2 -> 914a6e7

Original PR: #7177
Bot Author: app/red-hat-konflux


Assisted-by: Claude (via Claude Code)

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Jan 9, 2026
@openshift-ci-robot
Copy link
Copy Markdown

@bryan-cox: This pull request explicitly references no jira issue.

Details

In response to this:

Summary

This PR supersedes #7177 (authored by app/red-hat-konflux).

The original bot PR required additional fixes to pass CI verification:

  • Fixed deprecated slices.Contains from k8s.io/utils/strings/slices by switching to stdlib slices package
  • Updated vendored dependencies to remove unused deprecated package

Commits

This PR organizes changes into logical commits:

  1. Original dependency update from bot PR (k8s.io/utils digest update)
  2. Fix for deprecated slices.Contains usage
  3. Vendored dependency updates

Original PR Description

This PR contains the following updates:

Package Type Update Change
k8s.io/utils require digest 4c0f3b2 -> 914a6e7
k8s.io/utils replace digest 3ea5e8c -> 914a6e7
k8s.io/utils indirect digest 3ea5e8c -> 914a6e7
k8s.io/utils indirect digest e7106e6 -> 914a6e7
k8s.io/utils indirect digest 4c0f3b2 -> 914a6e7

Original PR: #7177
Bot Author: app/red-hat-konflux


Assisted-by: Claude (via Claude Code)

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.

@coderabbitai
Copy link
Copy Markdown
Contributor

coderabbitai Bot commented Jan 9, 2026

Walkthrough

Updates indirect dependency k8s.io/utils to v0.0.0-20260108192941-914a6e750570 across multiple go.mod files, upgrades one module's Go directive to 1.23, removes a replace for k8s.io/utils in root go.mod, and replaces an import of k8s.io/utils/strings/slices with the standard library slices in one source file.

Changes

Cohort / File(s) Summary
Dependency version updates
api/go.mod, contrib/gomaxprocs-webhook/go.mod, go.mod, hack/tools/go.mod
Bumps indirect k8s.io/utils requirement to v0.0.0-20260108192941-914a6e750570. Removes the replace pin for k8s.io/utils in the root go.mod.
Go version and dependency upgrade
contrib/aws-tag-lb-service-webhook/go.mod
Updates go directive from 1.21 to 1.23, removes toolchain specification, and bumps indirect k8s.io/utils to v0.0.0-20260108192941-914a6e750570.
Import source migration
control-plane-operator/controllers/.../envreplace.go
Replaces import k8s.io/utils/strings/slices with the standard library slices while keeping slices.Contains usage unchanged.

Estimated code review effort

🎯 3 (Moderate) | ⏱️ ~20 minutes

✨ Finishing touches
  • 📝 Generate docstrings

📜 Recent review details

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro

Cache: Disabled due to data retention organization setting

Knowledge base: Disabled due to Reviews -> Disable Knowledge Base setting

📥 Commits

Reviewing files that changed from the base of the PR and between fb3ec37 and 9d3a0c2.

⛔ Files ignored due to path filters (13)
  • api/go.sum is excluded by !**/*.sum
  • api/vendor/k8s.io/utils/buffer/ring_fixed.go is excluded by !**/vendor/**
  • api/vendor/k8s.io/utils/net/multi_listen.go is excluded by !**/vendor/**
  • api/vendor/modules.txt is excluded by !**/vendor/**
  • contrib/aws-tag-lb-service-webhook/go.sum is excluded by !**/*.sum
  • contrib/gomaxprocs-webhook/go.sum is excluded by !**/*.sum
  • go.sum is excluded by !**/*.sum
  • hack/tools/go.sum is excluded by !**/*.sum
  • hack/tools/vendor/k8s.io/utils/net/multi_listen.go is excluded by !**/vendor/**
  • hack/tools/vendor/k8s.io/utils/set/set.go is excluded by !**/vendor/**
  • hack/tools/vendor/k8s.io/utils/set/set_go_1.20.go is excluded by !**/vendor/**
  • hack/tools/vendor/k8s.io/utils/set/set_go_1.21.go is excluded by !**/vendor/**
  • hack/tools/vendor/modules.txt is excluded by !**/vendor/**
📒 Files selected for processing (6)
  • api/go.mod
  • contrib/aws-tag-lb-service-webhook/go.mod
  • contrib/gomaxprocs-webhook/go.mod
  • control-plane-operator/controllers/hostedcontrolplane/v2/storage/envreplace.go
  • go.mod
  • hack/tools/go.mod
🚧 Files skipped from review as they are similar to previous changes (3)
  • contrib/gomaxprocs-webhook/go.mod
  • hack/tools/go.mod
  • contrib/aws-tag-lb-service-webhook/go.mod
🧰 Additional context used
📓 Path-based instructions (1)
**

⚙️ CodeRabbit configuration file

-Focus on major issues impacting performance, readability, maintainability and security. Avoid nitpicks and avoid verbosity.

Files:

  • control-plane-operator/controllers/hostedcontrolplane/v2/storage/envreplace.go
  • go.mod
  • api/go.mod
⏰ Context from checks skipped due to timeout of 90000ms. You can increase the timeout in your CodeRabbit configuration to a maximum of 15 minutes (900000ms). (5)
  • GitHub Check: Red Hat Konflux / hypershift-operator-main-on-pull-request
  • GitHub Check: Red Hat Konflux / control-plane-operator-main-on-pull-request
  • GitHub Check: Red Hat Konflux / hypershift-gomaxprocs-webhook-on-pull-request
  • GitHub Check: Red Hat Konflux / hypershift-cli-mce-211-on-pull-request
  • GitHub Check: Red Hat Konflux / hypershift-release-mce-211-on-pull-request
🔇 Additional comments (3)
go.mod (1)

102-102: LGTM! Dependency update aligns with replace directive removal.

The k8s.io/utils version bump to v0.0.0-20260108192941-914a6e750570 is consistent across all modules. The removal of the replace directive (mentioned in the PR summary) makes sense since the required and replaced versions now match.

Please run the verification script from the api/go.mod review to confirm the version validity and check for security advisories.

control-plane-operator/controllers/hostedcontrolplane/v2/storage/envreplace.go (1)

4-4: LGTM! Correct migration to standard library.

The migration from deprecated k8s.io/utils/strings/slices to the standard library slices package is appropriate for Go 1.21+. The slices.Contains function at line 93 has identical behavior.

Verify that no other files in the codebase still import the deprecated package:

#!/bin/bash
# Description: Check for remaining imports of deprecated k8s.io/utils/strings/slices

# Search for imports of the deprecated package
rg -n --type=go 'k8s\.io/utils/strings/slices'
api/go.mod (1)

82-82: Verify the dependency version before merging.

The k8s.io/utils pseudo-version v0.0.0-20260108192941-914a6e750570 does not appear in the available versions list and points to a commit dated January 8, 2026. Confirm this version resolves correctly and validates against the module's go.sum. While no security advisories were found for k8s.io/utils itself, ensure the specific commit is legitimate and reviewed before accepting this indirect dependency.


Comment @coderabbitai help to get the list of available commands and usage tips.

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Jan 9, 2026

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: bryan-cox

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci Bot added area/api Indicates the PR includes changes for the API area/ci-tooling Indicates the PR includes changes for CI or tooling approved Indicates a PR has been approved by an approver from all required OWNERS files. area/control-plane-operator Indicates the PR includes changes for the control plane operator - in an OCP release and removed do-not-merge/needs-area labels Jan 9, 2026
@bryan-cox
Copy link
Copy Markdown
Member Author

/retest

1 similar comment
@bryan-cox
Copy link
Copy Markdown
Member Author

/retest

red-hat-konflux Bot and others added 4 commits January 10, 2026 15:31
Signed-off-by: red-hat-konflux <126015336+red-hat-konflux[bot]@users.noreply.github.com>
…rsion

The k8s.io/utils/strings/slices package is deprecated in favor of the
Go standard library slices package.

Signed-off-by: Bryan Cox <brcox@redhat.com>
Commit-Message-Assisted-by: Claude (via Claude Code)
Remove k8s.io/utils/strings/slices from vendor since it is no longer
imported after switching to the stdlib slices package.

Signed-off-by: Bryan Cox <brcox@redhat.com>
Commit-Message-Assisted-by: Claude (via Claude Code)
The replace directive was pinning k8s.io/utils to a specific version for
Kubernetes v1.32.3 compatibility. Since the require and replace now point
to the same version (914a6e7), the replace is no longer necessary.

Signed-off-by: Bryan Cox <brcox@redhat.com>
Commit-Message-Assisted-by: Claude (via Claude Code)
@bryan-cox bryan-cox force-pushed the fix/konflux/mintmaker/main-main/k8s.io-utils-digest branch from fb3ec37 to 9d3a0c2 Compare January 10, 2026 20:40
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Jan 10, 2026

@bryan-cox: The specified target(s) for /test were not found.
The following commands are available to trigger required jobs:

/test e2e-aks
/test e2e-aks-4-21
/test e2e-aks-override
/test e2e-aws
/test e2e-aws-4-21
/test e2e-aws-override
/test e2e-aws-upgrade-hypershift-operator
/test e2e-kubevirt-aws-ovn-reduced
/test images
/test okd-scos-images
/test security
/test unit
/test verify
/test verify-deps

The following commands are available to trigger optional jobs:

/test e2e-aws-autonode
/test e2e-aws-metrics
/test e2e-aws-minimal
/test e2e-aws-techpreview
/test e2e-azure-aks-ovn-conformance
/test e2e-conformance
/test e2e-kubevirt-aws-ovn
/test e2e-kubevirt-azure-ovn
/test e2e-kubevirt-metal-conformance
/test e2e-openstack-aws
/test e2e-openstack-aws-conformance
/test e2e-openstack-aws-csi-cinder
/test e2e-openstack-aws-csi-manila
/test e2e-openstack-aws-nfv
/test okd-scos-e2e-aws-ovn
/test reqserving-e2e-aws

Use /test all to run the following jobs that were automatically triggered:

pull-ci-openshift-hypershift-main-e2e-aks
pull-ci-openshift-hypershift-main-e2e-aks-4-21
pull-ci-openshift-hypershift-main-e2e-aws
pull-ci-openshift-hypershift-main-e2e-aws-upgrade-hypershift-operator
pull-ci-openshift-hypershift-main-e2e-kubevirt-aws-ovn-reduced
pull-ci-openshift-hypershift-main-images
pull-ci-openshift-hypershift-main-okd-scos-images
pull-ci-openshift-hypershift-main-security
pull-ci-openshift-hypershift-main-unit
pull-ci-openshift-hypershift-main-verify
Details

In response to this:

/test e2e-AKS

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.

@bryan-cox
Copy link
Copy Markdown
Member Author

/test e2e-aks

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Jan 11, 2026

@bryan-cox: all tests passed!

Full PR test history. Your PR dashboard.

Details

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. I understand the commands that are listed here.

@bryan-cox
Copy link
Copy Markdown
Member Author

/verified by e2e

@openshift-ci-robot openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Jan 11, 2026
@openshift-ci-robot
Copy link
Copy Markdown

@bryan-cox: This PR has been marked as verified by e2e.

Details

In response to this:

/verified by e2e

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.

Copy link
Copy Markdown
Contributor

@jparrill jparrill left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Jan 12, 2026
@openshift-merge-bot openshift-merge-bot Bot merged commit 243e288 into openshift:main Jan 12, 2026
23 checks passed
@bryan-cox bryan-cox deleted the fix/konflux/mintmaker/main-main/k8s.io-utils-digest branch January 12, 2026 11:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. area/api Indicates the PR includes changes for the API area/ci-tooling Indicates the PR includes changes for CI or tooling area/control-plane-operator Indicates the PR includes changes for the control plane operator - in an OCP release jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged. verified Signifies that the PR passed pre-merge verification criteria

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants