search

openshift / jenkins

Apache License 2.0
260 stars 446 forks source link

OCPTOOLS-280: Bump golang.org/x/crypto from 0.18.0 to 0.22.0 #1788

Closed sayan-biswas closed 2 months ago

sayan-biswas commented 2 months ago

Fixes the following CVE(s):

openshift-ci-robot commented 2 months ago

@sayan-biswas: This pull request references OCPTOOLS-280 which is a valid jira issue.

In response to [this](https://github.com/openshift/jenkins/pull/1788): >Fixes the following CVE(s): >* CVE-2023-48795 Instructions for interacting with me using PR comments are available [here](https://prow.ci.openshift.org/command-help?repo=openshift%2Fjenkins). If you have questions or suggestions related to my behavior, please file an issue against the [openshift-eng/jira-lifecycle-plugin](https://github.com/openshift-eng/jira-lifecycle-plugin/issues/new) repository.
sayan-biswas commented 2 months ago

/test images

openshift-ci[bot] commented 2 months ago

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ramessesii2, sayan-biswas

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

The pull request process is described here

Needs approval from an approver in each of these files: - ~~[OWNERS](https://github.com/openshift/jenkins/blob/master/OWNERS)~~ [ramessesii2,sayan-biswas] Approvers can indicate their approval by writing `/approve` in a comment Approvers can cancel approval by writing `/approve cancel` in a comment
openshift-ci[bot] commented 2 months ago

@sayan-biswas: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/security 52dd35c50d34edaca526629fe4e41272da8df535 link false /test security

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository. I understand the commands that are listed [here](https://go.k8s.io/bot-commands).
ramessesii2 commented 2 months ago

/cherry-pick release-4.12

openshift-cherrypick-robot commented 2 months ago

@ramessesii2: #1788 failed to apply on top of branch "release-4.12":

Applying: OCPTOOLS-280: Bump golang.org/x/crypto from 0.18.0 to 0.22.0
Using index info to reconstruct a base tree...
M   go.mod
M   go.sum
M   vendor/golang.org/x/crypto/chacha20/chacha_ppc64le.s
M   vendor/golang.org/x/crypto/internal/poly1305/sum_ppc64le.s
M   vendor/golang.org/x/crypto/ssh/server.go
M   vendor/golang.org/x/sys/unix/aliases.go
M   vendor/golang.org/x/sys/unix/mkerrors.sh
M   vendor/golang.org/x/sys/unix/mmap_nomremap.go
M   vendor/golang.org/x/sys/unix/syscall_darwin_libSystem.go
M   vendor/golang.org/x/sys/unix/syscall_linux.go
M   vendor/golang.org/x/sys/unix/syscall_zos_s390x.go
M   vendor/golang.org/x/sys/unix/zerrors_linux.go
M   vendor/golang.org/x/sys/unix/zerrors_linux_386.go
M   vendor/golang.org/x/sys/unix/zerrors_linux_amd64.go
M   vendor/golang.org/x/sys/unix/zerrors_linux_arm.go
M   vendor/golang.org/x/sys/unix/zerrors_linux_arm64.go
M   vendor/golang.org/x/sys/unix/zerrors_linux_loong64.go
M   vendor/golang.org/x/sys/unix/zerrors_linux_mips.go
M   vendor/golang.org/x/sys/unix/zerrors_linux_mips64.go
M   vendor/golang.org/x/sys/unix/zerrors_linux_mips64le.go
M   vendor/golang.org/x/sys/unix/zerrors_linux_mipsle.go
M   vendor/golang.org/x/sys/unix/zerrors_linux_ppc.go
M   vendor/golang.org/x/sys/unix/zerrors_linux_ppc64.go
M   vendor/golang.org/x/sys/unix/zerrors_linux_ppc64le.go
M   vendor/golang.org/x/sys/unix/zerrors_linux_riscv64.go
M   vendor/golang.org/x/sys/unix/zerrors_linux_s390x.go
M   vendor/golang.org/x/sys/unix/zerrors_linux_sparc64.go
M   vendor/golang.org/x/sys/unix/zsyscall_linux.go
M   vendor/golang.org/x/sys/unix/zsysnum_linux_386.go
M   vendor/golang.org/x/sys/unix/zsysnum_linux_amd64.go
M   vendor/golang.org/x/sys/unix/zsysnum_linux_arm.go
M   vendor/golang.org/x/sys/unix/zsysnum_linux_arm64.go
M   vendor/golang.org/x/sys/unix/zsysnum_linux_loong64.go
M   vendor/golang.org/x/sys/unix/zsysnum_linux_mips.go
M   vendor/golang.org/x/sys/unix/zsysnum_linux_mips64.go
M   vendor/golang.org/x/sys/unix/zsysnum_linux_mips64le.go
M   vendor/golang.org/x/sys/unix/zsysnum_linux_mipsle.go
M   vendor/golang.org/x/sys/unix/zsysnum_linux_ppc.go
M   vendor/golang.org/x/sys/unix/zsysnum_linux_ppc64.go
M   vendor/golang.org/x/sys/unix/zsysnum_linux_ppc64le.go
M   vendor/golang.org/x/sys/unix/zsysnum_linux_riscv64.go
M   vendor/golang.org/x/sys/unix/zsysnum_linux_s390x.go
M   vendor/golang.org/x/sys/unix/zsysnum_linux_sparc64.go
M   vendor/golang.org/x/sys/unix/ztypes_linux.go
M   vendor/golang.org/x/sys/windows/syscall_windows.go
M   vendor/golang.org/x/sys/windows/types_windows.go
M   vendor/golang.org/x/sys/windows/zsyscall_windows.go
M   vendor/modules.txt
Falling back to patching base and 3-way merge...
Auto-merging vendor/modules.txt
CONFLICT (content): Merge conflict in vendor/modules.txt
Auto-merging vendor/golang.org/x/sys/windows/zsyscall_windows.go
Auto-merging vendor/golang.org/x/sys/windows/types_windows.go
Auto-merging vendor/golang.org/x/sys/windows/syscall_windows.go
Auto-merging vendor/golang.org/x/sys/unix/ztypes_linux.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_sparc64.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsysnum_linux_sparc64.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_s390x.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsysnum_linux_s390x.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_riscv64.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsysnum_linux_riscv64.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_ppc64le.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsysnum_linux_ppc64le.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_ppc64.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsysnum_linux_ppc64.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_ppc.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsysnum_linux_ppc.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_mipsle.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsysnum_linux_mipsle.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_mips64le.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsysnum_linux_mips64le.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_mips64.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsysnum_linux_mips64.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_mips.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsysnum_linux_mips.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_loong64.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsysnum_linux_loong64.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_arm64.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsysnum_linux_arm64.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_arm.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsysnum_linux_arm.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_amd64.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsysnum_linux_amd64.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_386.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsysnum_linux_386.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_linux.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_sparc64.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_s390x.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_riscv64.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_ppc64le.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_ppc64.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_ppc.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_mipsle.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_mips64le.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_mips64.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_mips.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_loong64.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_arm64.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_arm.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_amd64.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_386.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux.go
Auto-merging vendor/golang.org/x/sys/unix/syscall_zos_s390x.go
Auto-merging vendor/golang.org/x/sys/unix/syscall_linux.go
Auto-merging vendor/golang.org/x/sys/unix/syscall_darwin_libSystem.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/syscall_darwin_libSystem.go
Auto-merging vendor/golang.org/x/sys/unix/mmap_nomremap.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/mmap_nomremap.go
Auto-merging vendor/golang.org/x/sys/unix/mkerrors.sh
Auto-merging vendor/golang.org/x/sys/unix/aliases.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/aliases.go
Auto-merging vendor/golang.org/x/crypto/ssh/server.go
Auto-merging vendor/golang.org/x/crypto/internal/poly1305/sum_ppc64le.s
Auto-merging vendor/golang.org/x/crypto/chacha20/chacha_ppc64le.s
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
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
Patch failed at 0001 OCPTOOLS-280: Bump golang.org/x/crypto from 0.18.0 to 0.22.0
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
In response to [this](https://github.com/openshift/jenkins/pull/1788#issuecomment-2099747683): >/cherry-pick release-4.12 Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository.
ramessesii2 commented 2 months ago

/cherry-pick release-4.15

openshift-cherrypick-robot commented 2 months ago

@ramessesii2: #1788 failed to apply on top of branch "release-4.15":

Applying: OCPTOOLS-280: Bump golang.org/x/crypto from 0.18.0 to 0.22.0
Using index info to reconstruct a base tree...
M   go.mod
M   go.sum
M   vendor/golang.org/x/crypto/chacha20/chacha_ppc64le.s
M   vendor/golang.org/x/crypto/internal/poly1305/sum_ppc64le.s
M   vendor/golang.org/x/crypto/ssh/server.go
M   vendor/golang.org/x/sys/unix/aliases.go
M   vendor/golang.org/x/sys/unix/mkerrors.sh
M   vendor/golang.org/x/sys/unix/mmap_nomremap.go
M   vendor/golang.org/x/sys/unix/syscall_darwin_libSystem.go
M   vendor/golang.org/x/sys/unix/syscall_freebsd.go
M   vendor/golang.org/x/sys/unix/syscall_linux.go
M   vendor/golang.org/x/sys/unix/syscall_zos_s390x.go
M   vendor/golang.org/x/sys/unix/zerrors_linux.go
M   vendor/golang.org/x/sys/unix/zerrors_linux_386.go
M   vendor/golang.org/x/sys/unix/zerrors_linux_amd64.go
M   vendor/golang.org/x/sys/unix/zerrors_linux_arm.go
M   vendor/golang.org/x/sys/unix/zerrors_linux_arm64.go
M   vendor/golang.org/x/sys/unix/zerrors_linux_loong64.go
M   vendor/golang.org/x/sys/unix/zerrors_linux_mips.go
M   vendor/golang.org/x/sys/unix/zerrors_linux_mips64.go
M   vendor/golang.org/x/sys/unix/zerrors_linux_mips64le.go
M   vendor/golang.org/x/sys/unix/zerrors_linux_mipsle.go
M   vendor/golang.org/x/sys/unix/zerrors_linux_ppc.go
M   vendor/golang.org/x/sys/unix/zerrors_linux_ppc64.go
M   vendor/golang.org/x/sys/unix/zerrors_linux_ppc64le.go
M   vendor/golang.org/x/sys/unix/zerrors_linux_riscv64.go
M   vendor/golang.org/x/sys/unix/zerrors_linux_s390x.go
M   vendor/golang.org/x/sys/unix/zerrors_linux_sparc64.go
M   vendor/golang.org/x/sys/unix/zsyscall_linux.go
M   vendor/golang.org/x/sys/unix/zsysnum_linux_386.go
M   vendor/golang.org/x/sys/unix/zsysnum_linux_amd64.go
M   vendor/golang.org/x/sys/unix/zsysnum_linux_arm.go
M   vendor/golang.org/x/sys/unix/zsysnum_linux_arm64.go
M   vendor/golang.org/x/sys/unix/zsysnum_linux_loong64.go
M   vendor/golang.org/x/sys/unix/zsysnum_linux_mips.go
M   vendor/golang.org/x/sys/unix/zsysnum_linux_mips64.go
M   vendor/golang.org/x/sys/unix/zsysnum_linux_mips64le.go
M   vendor/golang.org/x/sys/unix/zsysnum_linux_mipsle.go
M   vendor/golang.org/x/sys/unix/zsysnum_linux_ppc.go
M   vendor/golang.org/x/sys/unix/zsysnum_linux_ppc64.go
M   vendor/golang.org/x/sys/unix/zsysnum_linux_ppc64le.go
M   vendor/golang.org/x/sys/unix/zsysnum_linux_riscv64.go
M   vendor/golang.org/x/sys/unix/zsysnum_linux_s390x.go
M   vendor/golang.org/x/sys/unix/zsysnum_linux_sparc64.go
M   vendor/golang.org/x/sys/unix/ztypes_linux.go
M   vendor/golang.org/x/sys/windows/syscall_windows.go
M   vendor/golang.org/x/sys/windows/types_windows.go
M   vendor/golang.org/x/sys/windows/zsyscall_windows.go
M   vendor/modules.txt
Falling back to patching base and 3-way merge...
Auto-merging vendor/modules.txt
CONFLICT (content): Merge conflict in vendor/modules.txt
Auto-merging vendor/golang.org/x/sys/windows/zsyscall_windows.go
Auto-merging vendor/golang.org/x/sys/windows/types_windows.go
Auto-merging vendor/golang.org/x/sys/windows/syscall_windows.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/windows/syscall_windows.go
Auto-merging vendor/golang.org/x/sys/unix/ztypes_linux.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_sparc64.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsysnum_linux_sparc64.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_s390x.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsysnum_linux_s390x.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_riscv64.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsysnum_linux_riscv64.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_ppc64le.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsysnum_linux_ppc64le.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_ppc64.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsysnum_linux_ppc64.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_ppc.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsysnum_linux_ppc.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_mipsle.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsysnum_linux_mipsle.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_mips64le.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsysnum_linux_mips64le.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_mips64.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsysnum_linux_mips64.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_mips.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsysnum_linux_mips.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_loong64.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsysnum_linux_loong64.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_arm64.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsysnum_linux_arm64.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_arm.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsysnum_linux_arm.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_amd64.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsysnum_linux_amd64.go
Auto-merging vendor/golang.org/x/sys/unix/zsysnum_linux_386.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zsysnum_linux_386.go
Auto-merging vendor/golang.org/x/sys/unix/zsyscall_linux.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_sparc64.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_s390x.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_riscv64.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_ppc64le.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_ppc64.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_ppc.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_mipsle.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_mips64le.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_mips64.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_mips.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_loong64.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_arm64.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_arm.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_amd64.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux_386.go
Auto-merging vendor/golang.org/x/sys/unix/zerrors_linux.go
Auto-merging vendor/golang.org/x/sys/unix/syscall_zos_s390x.go
Auto-merging vendor/golang.org/x/sys/unix/syscall_linux.go
Auto-merging vendor/golang.org/x/sys/unix/syscall_freebsd.go
Auto-merging vendor/golang.org/x/sys/unix/syscall_darwin_libSystem.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/syscall_darwin_libSystem.go
Auto-merging vendor/golang.org/x/sys/unix/mmap_nomremap.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/mmap_nomremap.go
Auto-merging vendor/golang.org/x/sys/unix/mkerrors.sh
Auto-merging vendor/golang.org/x/sys/unix/aliases.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/aliases.go
Auto-merging vendor/golang.org/x/crypto/ssh/server.go
Auto-merging vendor/golang.org/x/crypto/internal/poly1305/sum_ppc64le.s
Auto-merging vendor/golang.org/x/crypto/chacha20/chacha_ppc64le.s
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
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
Patch failed at 0001 OCPTOOLS-280: Bump golang.org/x/crypto from 0.18.0 to 0.22.0
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
In response to [this](https://github.com/openshift/jenkins/pull/1788#issuecomment-2099750702): >/cherry-pick release-4.15 Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository.
sayan-biswas commented 2 months ago

/label backport-risk-assessed /label cherry-pick-approved /label px-approved /label docs-approved /label qe-approved