Skip to content

Conversation

@bsquizz
Copy link
Contributor

@bsquizz bsquizz commented Dec 22, 2025

Summary

This PR combines 24 dependency update PRs from the red-hat-konflux bot into a single consolidated update (batch 3).

Note: After running go mod tidy, many of the major version updates were reverted because they were attempting to update indirect dependencies that are controlled by their parent packages. Only the updates that are actually compatible with the codebase were retained.

Dependency Updates Successfully Applied

Digest Updates:

  • golang.org/x/crypto/x509roots/fallback: updated digest to 7dacc38
  • github.com/tailscale/tscert: updated digest to aea342f
  • github.com/google/pprof: updated digest to b05bdac
  • knative.dev/pkg: updated digest to 80c8bc4
  • sigs.k8s.io/controller-runtime/tools/setup-envtest: updated digest to f28fd58

Package Version Updates:

  • k8s.io/apimachinery: v0.35.0-beta.0 → v0.35.0 (stable release, required by controller-runtime)
  • github.com/quic-go/quic-go: updated to v0.58.0
  • sigs.k8s.io/controller-runtime: updated to v0.22.4
  • github.com/prometheus/common: updated to v0.67.4
  • sigs.k8s.io/structured-merge-diff/v6: updated to v6.3.1
  • github.com/KimMachineGun/automemlimit: updated to v0.7.5

Docker Base Images:

  • registry.access.redhat.com/ubi8/ubi: updated to v8.10-1766090767

Konflux References:

  • Updated Konflux pipeline references in .tekton files

Go Version:

  • Go: updated to 1.25.3 with matching Docker image (ubi9/go-toolset:1.25.3-1763633888)

Major Version Updates That Were Reverted

The following PRs attempted to update indirect dependencies to newer major versions, but go mod tidy reverted them because the parent packages still require the older versions:

  • gopkg.in/yaml.v2 → v3 ❌ (indirect dependency, controlled by parent packages)
  • gopkg.in/evanphx/json-patch.v4 → v5 ❌ (indirect dependency)
  • gomodules.xyz/jsonpatch/v2 → v3 ❌ (indirect dependency)
  • go.yaml.in/yaml/v2 → v3 ❌ (indirect dependency)
  • github.com/urfave/cli v1 → v3 ❌ (indirect dependency)
  • github.com/golang-jwt/jwt/v4 → v5 ❌ (indirect dependency)
  • github.com/go-jose/go-jose/v3 → v4 ❌ (indirect dependency)
  • github.com/dgraph-io packages ❌ (indirect dependencies)
  • github.com/cespare/xxhash v1 → v2 ❌ (indirect dependency)
  • github.com/redhatinsights/platform-go-middlewares v1 → v2 ❌ (indirect dependency)

These updates would only be applicable if the direct dependencies that use them are also updated to versions that support the newer major versions.

Important Notes

  • ✅ rhc-osdk-utils version preserved at v0.14.0 (critical dependency)
  • ✅ Go version 1.25.3 matches Docker image version
  • ✅ All merge conflicts resolved by choosing newer versions
  • go mod tidy run to ensure consistency
  • ✅ Fixed golangci-lint error by using stable k8s.io/apimachinery v0.35.0 instead of beta
  • ✅ All 24 individual PRs will be auto-closed after this is merged

Individual PRs Combined

🤖 Generated with Claude Code

red-hat-konflux bot and others added 30 commits November 22, 2025 00:38
…0.7.5

Signed-off-by: red-hat-konflux <126015336+red-hat-konflux[bot]@users.noreply.github.com>
….3.1

Signed-off-by: red-hat-konflux <126015336+red-hat-konflux[bot]@users.noreply.github.com>
Signed-off-by: red-hat-konflux <126015336+red-hat-konflux[bot]@users.noreply.github.com>
Signed-off-by: red-hat-konflux <126015336+red-hat-konflux[bot]@users.noreply.github.com>
Signed-off-by: red-hat-konflux <126015336+red-hat-konflux[bot]@users.noreply.github.com>
…lewares to v2

Signed-off-by: red-hat-konflux <126015336+red-hat-konflux[bot]@users.noreply.github.com>
Signed-off-by: red-hat-konflux <126015336+red-hat-konflux[bot]@users.noreply.github.com>
Signed-off-by: red-hat-konflux <126015336+red-hat-konflux[bot]@users.noreply.github.com>
Signed-off-by: red-hat-konflux <126015336+red-hat-konflux[bot]@users.noreply.github.com>
Signed-off-by: red-hat-konflux <126015336+red-hat-konflux[bot]@users.noreply.github.com>
Signed-off-by: red-hat-konflux <126015336+red-hat-konflux[bot]@users.noreply.github.com>
Signed-off-by: red-hat-konflux <126015336+red-hat-konflux[bot]@users.noreply.github.com>
Signed-off-by: red-hat-konflux <126015336+red-hat-konflux[bot]@users.noreply.github.com>
…7dacc38

Signed-off-by: red-hat-konflux <126015336+red-hat-konflux[bot]@users.noreply.github.com>
Signed-off-by: red-hat-konflux <126015336+red-hat-konflux[bot]@users.noreply.github.com>
Signed-off-by: red-hat-konflux <126015336+red-hat-konflux[bot]@users.noreply.github.com>
Signed-off-by: red-hat-konflux <126015336+red-hat-konflux[bot]@users.noreply.github.com>
Signed-off-by: red-hat-konflux <126015336+red-hat-konflux[bot]@users.noreply.github.com>
Signed-off-by: red-hat-konflux <126015336+red-hat-konflux[bot]@users.noreply.github.com>
…t digest to f28fd58

Signed-off-by: red-hat-konflux <126015336+red-hat-konflux[bot]@users.noreply.github.com>
Signed-off-by: red-hat-konflux <126015336+red-hat-konflux[bot]@users.noreply.github.com>
… v8.10-1766090767

Signed-off-by: red-hat-konflux <126015336+red-hat-konflux[bot]@users.noreply.github.com>
Signed-off-by: red-hat-konflux <126015336+red-hat-konflux[bot]@users.noreply.github.com>
Signed-off-by: red-hat-konflux <126015336+red-hat-konflux[bot]@users.noreply.github.com>
…org-x-crypto-x509roots-fallback-digest' into combined-konflux-dependency-updates-batch3
…com-tailscale-tscert-digest' into combined-konflux-dependency-updates-batch3
…com-google-pprof-digest' into combined-konflux-dependency-updates-batch3
…n-yaml.v2-3.x' into combined-konflux-dependency-updates-batch3
…n-evanphx-json-patch.v4-5.x' into combined-konflux-dependency-updates-batch3
….in-yaml-v2-3.x' into combined-konflux-dependency-updates-batch3
…com-redhatinsights-platform-go-middlewares-2.x' into combined-konflux-dependency-updates-batch3
…com-golang-jwt-jwt-v4-5.x' into combined-konflux-dependency-updates-batch3
…com-go-jose-go-jose-v3-4.x' into combined-konflux-dependency-updates-batch3
…com-dgraph-io-ristretto-2.x' into combined-konflux-dependency-updates-batch3
…com-cespare-xxhash-2.x' into combined-konflux-dependency-updates-batch3
…y.access.redhat.com-ubi8-ubi-8.x' into combined-konflux-dependency-updates-batch3
…s.io-controller-runtime-0.x' into combined-konflux-dependency-updates-batch3
…s.io-structured-merge-diff-v6-6.x' into combined-konflux-dependency-updates-batch3
…com-kimmachinegun-automemlimit-0.x' into combined-konflux-dependency-updates-batch3
- Changed from v0.35.0-beta.0 to v0.35.0 to fix golangci-lint error
- Ran go mod tidy which reverted some indirect major version updates that aren't actually used
- The konflux PRs updated indirect dependencies that are controlled by direct dependencies
@bsquizz
Copy link
Contributor Author

bsquizz commented Dec 22, 2025

All kuttl tests are passing locally, merging

@bsquizz bsquizz merged commit 419d706 into master Dec 22, 2025
5 of 7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant