Skip to content

Conversation

@aroyoredhat
Copy link
Contributor

@aroyoredhat aroyoredhat commented Oct 9, 2025

Bumping crypto library to v0.32.0 and x/net library to v0.34.0

List of commands:
$ go get -u golang.org/x/crypto@v0.32.0
$ go get -u golang.org/x/net@v0.34.0
$ go mod tidy
$ go mod vendor

Summary by Sourcery

Bump several golang.org/x dependencies to newer versions and refresh the vendored modules accordingly.

Build:

  • Update golang.org/x/net from v0.24.0 to v0.34.0
  • Update golang.org/x/text from v0.14.0 to v0.21.0
  • Update golang.org/x/crypto from v0.22.0 to v0.32.0
  • Update golang.org/x/sync from v0.7.0 to v0.10.0
  • Update golang.org/x/sys from v0.19.0 to v0.29.0
  • Update golang.org/x/term from v0.19.0 to v0.28.0
  • Update golang.org/x/tools to v0.21.1-0.20240508182429-e35e4ccd0d2d
  • Regenerate go.sum and refresh vendor directory after dependency bumps

Copy link

@sourcery-ai sourcery-ai bot left a comment

Choose a reason for hiding this comment

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

We've reviewed this pull request using the Sourcery rules engine

@aroyoredhat
Copy link
Contributor Author

/cherry-pick redhat-3.15

@openshift-cherrypick-robot

@aroyoredhat: once the present PR merges, I will cherry-pick it on top of redhat-3.15 in a new PR and assign it to you.

In response to this:

/cherry-pick redhat-3.15

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.

@aroyoredhat
Copy link
Contributor Author

/cherry-pick redhat-3.14

@openshift-cherrypick-robot

@aroyoredhat: once the present PR merges, I will cherry-pick it on top of redhat-3.14 in a new PR and assign it to you.

In response to this:

/cherry-pick redhat-3.14

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.

@bcaton85 bcaton85 merged commit 0db29ec into quay:master Oct 14, 2025
13 of 14 checks passed
@openshift-cherrypick-robot

@aroyoredhat: #1072 failed to apply on top of branch "redhat-3.15":

Applying: Bump crypto and net libraries
.git/rebase-apply/patch:16711: trailing whitespace.
	
.git/rebase-apply/patch:16711: new blank line at EOF.
+
warning: 2 lines add whitespace errors.
Using index info to reconstruct a base tree...
M	go.mod
Falling back to patching base and 3-way merge...
Removing vendor/golang.org/x/tools/internal/event/tag/tag.go
Removing vendor/golang.org/x/sys/windows/empty.s
Removing vendor/golang.org/x/sys/unix/fstatfs_zos.go
Removing vendor/golang.org/x/sys/unix/epoll_zos.go
Removing vendor/golang.org/x/net/http2/testsync.go
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 Bump crypto and net libraries

In response to this:

/cherry-pick redhat-3.15

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.

@openshift-cherrypick-robot

@aroyoredhat: #1072 failed to apply on top of branch "redhat-3.14":

Applying: Bump crypto and net libraries
.git/rebase-apply/patch:16711: trailing whitespace.
	
.git/rebase-apply/patch:16711: new blank line at EOF.
+
warning: 2 lines add whitespace errors.
Using index info to reconstruct a base tree...
M	go.mod
Falling back to patching base and 3-way merge...
Removing vendor/golang.org/x/tools/internal/event/tag/tag.go
Removing vendor/golang.org/x/sys/windows/empty.s
Removing vendor/golang.org/x/sys/unix/fstatfs_zos.go
Removing vendor/golang.org/x/sys/unix/epoll_zos.go
Removing vendor/golang.org/x/net/http2/testsync.go
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 Bump crypto and net libraries

In response to this:

/cherry-pick redhat-3.14

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Development

Successfully merging this pull request may close these issues.

3 participants