Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rebase: bump golang.org/x/crypto from 0.29.0 to 0.31.0 (backport #5014) #5017

Merged
merged 2 commits into from
Dec 12, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Dec 12, 2024

Bumps golang.org/x/crypto from 0.29.0 to 0.31.0.

Commits
  • b4f1988 ssh: make the public key cache a 1-entry FIFO cache
  • 7042ebc openpgp/clearsign: just use rand.Reader in tests
  • 3e90321 go.mod: update golang.org/x dependencies
  • 8c4e668 x509roots/fallback: update bundle
  • See full diff in compare view

Dependabot compatibility score

You can trigger a rebase of this PR by commenting @dependabot rebase.


Dependabot commands and options

You can trigger Dependabot actions by commenting on this PR:

  • @dependabot rebase will rebase this PR
  • @dependabot recreate will recreate this PR, overwriting any edits that have been made to it
  • @dependabot merge will merge this PR after your CI passes on it
  • @dependabot squash and merge will squash and merge this PR after your CI passes on it
  • @dependabot cancel merge will cancel a previously requested merge and block automerging
  • @dependabot reopen will reopen this PR if it is closed
  • @dependabot close will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
  • @dependabot show <dependency name> ignore conditions will show all of the ignore conditions of the specified dependency
  • @dependabot ignore this major version will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this minor version will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
  • @dependabot ignore this dependency will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
    You can disable automated security fix PRs for this repo from the Security Alerts page.

This is an automatic backport of pull request #5014 done by [Mergify](https://mergify.com).

@mergify mergify bot added the conflicts label Dec 12, 2024
Copy link
Contributor Author

mergify bot commented Dec 12, 2024

Cherry-pick of 53d5eda has failed:

On branch mergify/bp/release-v3.12/pr-5014
Your branch is up to date with 'origin/release-v3.12'.

You are currently cherry-picking commit 53d5eda0.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   vendor/golang.org/x/crypto/ssh/server.go
	modified:   vendor/golang.org/x/sys/unix/zerrors_linux_386.go
	modified:   vendor/golang.org/x/sys/unix/zerrors_linux_amd64.go
	modified:   vendor/golang.org/x/sys/unix/zerrors_linux_arm.go
	modified:   vendor/golang.org/x/sys/unix/zerrors_linux_arm64.go
	modified:   vendor/golang.org/x/sys/unix/zerrors_linux_loong64.go
	modified:   vendor/golang.org/x/sys/unix/zerrors_linux_mips.go
	modified:   vendor/golang.org/x/sys/unix/zerrors_linux_mips64.go
	modified:   vendor/golang.org/x/sys/unix/zerrors_linux_mips64le.go
	modified:   vendor/golang.org/x/sys/unix/zerrors_linux_mipsle.go
	modified:   vendor/golang.org/x/sys/unix/zerrors_linux_ppc.go
	modified:   vendor/golang.org/x/sys/unix/zerrors_linux_ppc64.go
	modified:   vendor/golang.org/x/sys/unix/zerrors_linux_ppc64le.go
	modified:   vendor/golang.org/x/sys/unix/zerrors_linux_riscv64.go
	modified:   vendor/golang.org/x/sys/unix/zerrors_linux_s390x.go
	modified:   vendor/golang.org/x/sys/unix/zerrors_linux_sparc64.go
	modified:   vendor/golang.org/x/sys/unix/ztypes_darwin_amd64.go
	modified:   vendor/golang.org/x/sys/unix/ztypes_darwin_arm64.go
	modified:   vendor/golang.org/x/sys/windows/syscall_windows.go
	modified:   vendor/golang.org/x/sys/windows/types_windows.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   go.mod
	both modified:   go.sum
	both modified:   vendor/golang.org/x/sys/unix/zerrors_linux.go
	both modified:   vendor/golang.org/x/sys/unix/ztypes_linux.go
	both modified:   vendor/golang.org/x/sys/windows/zsyscall_windows.go
	both modified:   vendor/modules.txt

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@mergify mergify bot added the rebase update the version of an external component label Dec 12, 2024
@black-dragon74
Copy link
Member

Rebased PR at: #5020

@nixpanic nixpanic force-pushed the mergify/bp/release-v3.12/pr-5014 branch 2 times, most recently from 607a528 to 054c2bb Compare December 12, 2024 15:58
Bumps [golang.org/x/crypto](https://github.com/golang/crypto) from 0.29.0 to 0.31.0.
- [Commits](golang/crypto@v0.29.0...v0.31.0)

---
updated-dependencies:
- dependency-name: golang.org/x/crypto
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <[email protected]>
(cherry picked from commit 53d5eda)
@nixpanic nixpanic force-pushed the mergify/bp/release-v3.12/pr-5014 branch from 054c2bb to 98ab080 Compare December 12, 2024 16:14
On occasion there are inconsistencies in the CentOS or Ceph RPM
repositories. This can cause `dnf update` to fail when there are
conflicting versions of a package. By adding the `--nobest` option,
packages can get upgraded to an older version, but not the latest.

Signed-off-by: Niels de Vos <[email protected]>
(cherry picked from commit d8a0407)
@nixpanic nixpanic requested a review from a team December 12, 2024 16:33
@mergify mergify bot added the ok-to-test Label to trigger E2E tests label Dec 12, 2024
@ceph-csi-bot
Copy link
Collaborator

/test ci/centos/upgrade-tests-cephfs

@ceph-csi-bot
Copy link
Collaborator

/test ci/centos/k8s-e2e-external-storage/1.31

@ceph-csi-bot
Copy link
Collaborator

/test ci/centos/upgrade-tests-rbd

@ceph-csi-bot
Copy link
Collaborator

/test ci/centos/mini-e2e-helm/k8s-1.31

@ceph-csi-bot
Copy link
Collaborator

/test ci/centos/k8s-e2e-external-storage/1.30

@ceph-csi-bot
Copy link
Collaborator

/test ci/centos/mini-e2e/k8s-1.31

@ceph-csi-bot
Copy link
Collaborator

/test ci/centos/mini-e2e-helm/k8s-1.30

@ceph-csi-bot
Copy link
Collaborator

/test ci/centos/k8s-e2e-external-storage/1.29

@ceph-csi-bot
Copy link
Collaborator

/test ci/centos/mini-e2e/k8s-1.30

@ceph-csi-bot
Copy link
Collaborator

/test ci/centos/mini-e2e-helm/k8s-1.29

@ceph-csi-bot
Copy link
Collaborator

/test ci/centos/mini-e2e/k8s-1.29

@ceph-csi-bot ceph-csi-bot removed the ok-to-test Label to trigger E2E tests label Dec 12, 2024
@nixpanic
Copy link
Member

/retest ci/centos/mini-e2e-helm/k8s-1.31

@nixpanic
Copy link
Member

@Mergifyio requeue

Copy link
Contributor Author

mergify bot commented Dec 12, 2024

requeue

❌ This pull request head commit has not been previously disembarked from queue.

@mergify mergify bot merged commit bc203c3 into release-v3.12 Dec 12, 2024
38 checks passed
@mergify mergify bot deleted the mergify/bp/release-v3.12/pr-5014 branch December 12, 2024 21:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
rebase update the version of an external component
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants