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.

Sign up for GitHub

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

Jump to bottom

DFBUGS-1281: [release-4.18] Upgrade golang.org/x/net to v0.33.0 to address CVE-2024-45338 #2944

Merged
merged 1 commit into from
Jan 6, 2025
Merged

DFBUGS-1281: [release-4.18] Upgrade golang.org/x/net to v0.33.0 to address CVE-2024-45338 #2944

merged 1 commit into from
Jan 6, 2025

Conversation

openshift-cherrypick-robot
Copy link

This is an automated cherry-pick of #2941

/assign malayparida2000

@malayparida2000
Upgrade golang.org/x/net to v0.33.0 to address CVE-2024-45338
9346f86 
Include make deps-update changes as well.

Signed-off-by: Malay Kumar Parida <[email protected]>
@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Jan 6, 2025
Merged
@malayparida2000 malayparida2000 changed the title [release-4.18] Upgrade golang.org/x/net to v0.33.0 to address CVE-2024-45338 DFBUGS-1281: [release-4.18] Upgrade golang.org/x/net to v0.33.0 to address CVE-2024-45338 Jan 6, 2025
@openshift-ci-robot openshift-ci-robot added jira/valid-reference Indicates that this PR references a valid jira ticket of any type jira/invalid-bug Indicates that the referenced jira bug is invalid for the branch this PR is targeting labels Jan 6, 2025
@openshift-ci-robot
Copy link

openshift-ci-robot commented Jan 6, 2025 •
edited by openshift-ci bot
Loading

@openshift-cherrypick-robot: This pull request references [Jira Issue DFBUGS-1281](https://issues.redhat.com//browse/DFBUGS-1281), which is invalid:

  • expected the bug to target the "odf-4.18" version, but no target version was set

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

In response to this:

This is an automated cherry-pick of #2941

/assign malayparida2000

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.

@malayparida2000
Copy link
Contributor

/jira refresh

@openshift-ci-robot openshift-ci-robot added jira/valid-bug Indicates that the referenced jira bug is valid for the branch this PR is targeting and removed jira/invalid-bug Indicates that the referenced jira bug is invalid for the branch this PR is targeting labels Jan 6, 2025
@openshift-ci-robot
Copy link

openshift-ci-robot commented Jan 6, 2025 •
edited by openshift-ci bot
Loading

@malayparida2000: This pull request references [Jira Issue DFBUGS-1281](https://issues.redhat.com//browse/DFBUGS-1281), which is valid. The bug has been moved to the POST state.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (odf-4.18) matches configured target version for branch (odf-4.18)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, POST)

No GitHub users were found matching the public email listed for the QA contact in Jira ([email protected]), skipping review request.

In response to this:

/jira refresh

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.

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jan 6, 2025
@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Jan 6, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: iamniting, openshift-cherrypick-robot

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:

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 the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 6, 2025
@openshift-merge-bot openshift-merge-bot bot merged commit 8b4416e into red-hat-storage:release-4.18 Jan 6, 2025
11 checks passed
@openshift-ci-robot
Copy link

openshift-ci-robot commented Jan 6, 2025 •
edited by openshift-ci bot
Loading

@openshift-cherrypick-robot: [Jira Issue DFBUGS-1281](https://issues.redhat.com//browse/DFBUGS-1281): All pull requests linked via external trackers have merged:

[Jira Issue DFBUGS-1281](https://issues.redhat.com//browse/DFBUGS-1281) has been moved to the MODIFIED state.

In response to this:

This is an automated cherry-pick of #2941

/assign malayparida2000

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.

@malayparida2000
Copy link
Contributor

/cherry-pick release-4.17

@openshift-cherrypick-robot
Copy link
Author

@malayparida2000: #2944 failed to apply on top of branch "release-4.17":

Applying: Upgrade golang.org/x/net to v0.33.0 to address CVE-2024-45338
Using index info to reconstruct a base tree...
M	api/go.mod
M	api/go.sum
M	api/vendor/golang.org/x/net/http2/http2.go
M	api/vendor/golang.org/x/net/http2/server.go
M	api/vendor/golang.org/x/net/http2/transport.go
M	api/vendor/golang.org/x/sys/unix/mkerrors.sh
M	api/vendor/golang.org/x/sys/unix/syscall_linux.go
M	api/vendor/golang.org/x/sys/unix/zerrors_linux.go
M	api/vendor/golang.org/x/sys/unix/zerrors_linux_386.go
M	api/vendor/golang.org/x/sys/unix/zerrors_linux_amd64.go
M	api/vendor/golang.org/x/sys/unix/zerrors_linux_arm.go
M	api/vendor/golang.org/x/sys/unix/zerrors_linux_arm64.go
M	api/vendor/golang.org/x/sys/unix/zerrors_linux_loong64.go
M	api/vendor/golang.org/x/sys/unix/zerrors_linux_mips.go
M	api/vendor/golang.org/x/sys/unix/zerrors_linux_mips64.go
M	api/vendor/golang.org/x/sys/unix/zerrors_linux_mips64le.go
M	api/vendor/golang.org/x/sys/unix/zerrors_linux_mipsle.go
M	api/vendor/golang.org/x/sys/unix/zerrors_linux_ppc.go
M	api/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64.go
M	api/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64le.go
M	api/vendor/golang.org/x/sys/unix/zerrors_linux_riscv64.go
M	api/vendor/golang.org/x/sys/unix/zerrors_linux_s390x.go
M	api/vendor/golang.org/x/sys/unix/zerrors_linux_sparc64.go
M	api/vendor/golang.org/x/sys/unix/zsyscall_linux.go
M	api/vendor/golang.org/x/sys/unix/ztypes_darwin_amd64.go
M	api/vendor/golang.org/x/sys/unix/ztypes_darwin_arm64.go
M	api/vendor/golang.org/x/sys/unix/ztypes_linux.go
M	api/vendor/golang.org/x/sys/windows/syscall_windows.go
M	api/vendor/golang.org/x/sys/windows/types_windows.go
M	api/vendor/golang.org/x/sys/windows/zsyscall_windows.go
M	api/vendor/modules.txt
M	go.mod
M	go.sum
M	metrics/go.mod
M	metrics/go.sum
M	metrics/vendor/golang.org/x/net/http2/http2.go
M	metrics/vendor/golang.org/x/net/http2/server.go
M	metrics/vendor/golang.org/x/net/http2/transport.go
M	metrics/vendor/golang.org/x/sys/unix/zerrors_linux.go
M	metrics/vendor/golang.org/x/sys/unix/zerrors_linux_386.go
M	metrics/vendor/golang.org/x/sys/unix/zerrors_linux_amd64.go
M	metrics/vendor/golang.org/x/sys/unix/zerrors_linux_arm.go
M	metrics/vendor/golang.org/x/sys/unix/zerrors_linux_arm64.go
M	metrics/vendor/golang.org/x/sys/unix/zerrors_linux_loong64.go
M	metrics/vendor/golang.org/x/sys/unix/zerrors_linux_mips.go
M	metrics/vendor/golang.org/x/sys/unix/zerrors_linux_mips64.go
M	metrics/vendor/golang.org/x/sys/unix/zerrors_linux_mips64le.go
M	metrics/vendor/golang.org/x/sys/unix/zerrors_linux_mipsle.go
M	metrics/vendor/golang.org/x/sys/unix/zerrors_linux_ppc.go
M	metrics/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64.go
M	metrics/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64le.go
M	metrics/vendor/golang.org/x/sys/unix/zerrors_linux_riscv64.go
M	metrics/vendor/golang.org/x/sys/unix/zerrors_linux_s390x.go
M	metrics/vendor/golang.org/x/sys/unix/zerrors_linux_sparc64.go
M	metrics/vendor/golang.org/x/sys/unix/ztypes_darwin_amd64.go
M	metrics/vendor/golang.org/x/sys/unix/ztypes_darwin_arm64.go
M	metrics/vendor/golang.org/x/sys/unix/ztypes_linux.go
M	metrics/vendor/golang.org/x/sys/windows/syscall_windows.go
M	metrics/vendor/golang.org/x/sys/windows/types_windows.go
M	metrics/vendor/golang.org/x/sys/windows/zsyscall_windows.go
M	metrics/vendor/modules.txt
A	services/provider/api/go.mod
A	services/provider/api/go.sum
A	services/provider/api/vendor/golang.org/x/net/http2/client_conn_pool.go
A	services/provider/api/vendor/golang.org/x/net/http2/frame.go
A	services/provider/api/vendor/golang.org/x/net/http2/http2.go
A	services/provider/api/vendor/golang.org/x/net/http2/server.go
A	services/provider/api/vendor/golang.org/x/net/http2/transport.go
A	services/provider/api/vendor/golang.org/x/net/http2/write.go
A	services/provider/api/vendor/golang.org/x/sys/unix/README.md
A	services/provider/api/vendor/golang.org/x/sys/unix/ioctl_linux.go
A	services/provider/api/vendor/golang.org/x/sys/unix/mkerrors.sh
A	services/provider/api/vendor/golang.org/x/sys/unix/syscall_aix.go
A	services/provider/api/vendor/golang.org/x/sys/unix/syscall_linux.go
A	services/provider/api/vendor/golang.org/x/sys/unix/syscall_linux_arm64.go
A	services/provider/api/vendor/golang.org/x/sys/unix/syscall_linux_loong64.go
A	services/provider/api/vendor/golang.org/x/sys/unix/syscall_linux_riscv64.go
A	services/provider/api/vendor/golang.org/x/sys/unix/syscall_zos_s390x.go
A	services/provider/api/vendor/golang.org/x/sys/unix/zerrors_linux.go
A	services/provider/api/vendor/golang.org/x/sys/unix/zerrors_linux_386.go
A	services/provider/api/vendor/golang.org/x/sys/unix/zerrors_linux_amd64.go
A	services/provider/api/vendor/golang.org/x/sys/unix/zerrors_linux_arm.go
A	services/provider/api/vendor/golang.org/x/sys/unix/zerrors_linux_arm64.go
A	services/provider/api/vendor/golang.org/x/sys/unix/zerrors_linux_loong64.go
A	services/provider/api/vendor/golang.org/x/sys/unix/zerrors_linux_mips.go
A	services/provider/api/vendor/golang.org/x/sys/unix/zerrors_linux_mips64.go
A	services/provider/api/vendor/golang.org/x/sys/unix/zerrors_linux_mips64le.go
A	services/provider/api/vendor/golang.org/x/sys/unix/zerrors_linux_mipsle.go
A	services/provider/api/vendor/golang.org/x/sys/unix/zerrors_linux_ppc.go
A	services/provider/api/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64.go
A	services/provider/api/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64le.go
A	services/provider/api/vendor/golang.org/x/sys/unix/zerrors_linux_riscv64.go
A	services/provider/api/vendor/golang.org/x/sys/unix/zerrors_linux_s390x.go
A	services/provider/api/vendor/golang.org/x/sys/unix/zerrors_linux_sparc64.go
A	services/provider/api/vendor/golang.org/x/sys/unix/zsyscall_linux.go
A	services/provider/api/vendor/golang.org/x/sys/unix/zsysnum_linux_amd64.go
A	services/provider/api/vendor/golang.org/x/sys/unix/zsysnum_linux_arm64.go
A	services/provider/api/vendor/golang.org/x/sys/unix/zsysnum_linux_loong64.go
A	services/provider/api/vendor/golang.org/x/sys/unix/zsysnum_linux_riscv64.go
A	services/provider/api/vendor/golang.org/x/sys/unix/ztypes_darwin_amd64.go
A	services/provider/api/vendor/golang.org/x/sys/unix/ztypes_darwin_arm64.go
A	services/provider/api/vendor/golang.org/x/sys/unix/ztypes_linux.go
A	services/provider/api/vendor/golang.org/x/sys/unix/ztypes_zos_s390x.go
A	services/provider/api/vendor/golang.org/x/sys/windows/dll_windows.go
A	services/provider/api/vendor/golang.org/x/sys/windows/syscall_windows.go
A	services/provider/api/vendor/golang.org/x/sys/windows/types_windows.go
A	services/provider/api/vendor/golang.org/x/sys/windows/zsyscall_windows.go
A	services/provider/api/vendor/modules.txt
M	vendor/golang.org/x/net/http2/http2.go
M	vendor/golang.org/x/net/http2/server.go
M	vendor/golang.org/x/net/http2/transport.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/ztypes_darwin_amd64.go
M	vendor/golang.org/x/sys/unix/ztypes_darwin_arm64.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
CONFLICT (content): Merge conflict in 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
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/ztypes_linux.go
Auto-merging vendor/golang.org/x/sys/unix/ztypes_darwin_arm64.go
Auto-merging vendor/golang.org/x/sys/unix/ztypes_darwin_amd64.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
CONFLICT (content): Merge conflict in vendor/golang.org/x/sys/unix/zerrors_linux.go
Auto-merging vendor/golang.org/x/net/http2/transport.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/net/http2/transport.go
Auto-merging vendor/golang.org/x/net/http2/server.go
CONFLICT (content): Merge conflict in vendor/golang.org/x/net/http2/server.go
Auto-merging vendor/golang.org/x/net/http2/http2.go
CONFLICT (modify/delete): services/provider/api/vendor/modules.txt deleted in HEAD and modified in Upgrade golang.org/x/net to v0.33.0 to address CVE-2024-45338. Version Upgrade golang.org/x/net to v0.33.0 to address CVE-2024-45338 of services/provider/api/vendor/modules.txt left in tree.
CONFLICT (modify/delete): services/provider/api/vendor/golang.org/x/sys/windows/zsyscall_windows.go deleted in HEAD and modified in Upgrade golang.org/x/net to v0.33.0 to address CVE-2024-45338. Version Upgrade golang.org/x/net to v0.33.0 to address CVE-2024-45338 of services/provider/api/vendor/golang.org/x/sys/windows/zsyscall_windows.go left in tree.
CONFLICT (modify/delete): services/provider/api/vendor/golang.org/x/sys/windows/types_windows.go deleted in HEAD and modified in Upgrade golang.org/x/net to v0.33.0 to address CVE-2024-45338. Version Upgrade golang.org/x/net to v0.33.0 to address CVE-2024-45338 of services/provider/api/vendor/golang.org/x/sys/windows/types_windows.go left in tree.
CONFLICT (modify/delete): services/provider/api/vendor/golang.org/x/sys/windows/syscall_windows.go deleted in HEAD and modified in Upgrade golang.org/x/net to v0.33.0 to address CVE-2024-45338. Version Upgrade golang.org/x/net to v0.33.0 to address CVE-2024-45338 of services/provider/api/vendor/golang.org/x/sys/windows/syscall_windows.go left in tree.
CONFLICT (modify/delete): services/provider/api/vendor/golang.org/x/sys/unix/ztypes_linux.go deleted in HEAD and modified in Upgrade golang.org/x/net to v0.33.0 to address CVE-2024-45338. Version Upgrade golang.org/x/net to v0.33.0 to address CVE-2024-45338 of services/provider/api/vendor/golang.org/x/sys/unix/ztypes_linux.go left in tree.
CONFLICT (modify/delete): services/provider/api/vendor/golang.org/x/sys/unix/ztypes_darwin_arm64.go deleted in HEAD and modified in Upgrade golang.org/x/net to v0.33.0 to address CVE-2024-45338. Version Upgrade golang.org/x/net to v0.33.0 to address CVE-2024-45338 of services/provider/api/vendor/golang.org/x/sys/unix/ztypes_darwin_arm64.go left in tree.
CONFLICT (modify/delete): services/provider/api/vendor/golang.org/x/sys/unix/ztypes_darwin_amd64.go deleted in HEAD and modified in Upgrade golang.org/x/net to v0.33.0 to address CVE-2024-45338. Version Upgrade golang.org/x/net to v0.33.0 to address CVE-2024-45338 of services/provider/api/vendor/golang.org/x/sys/unix/ztypes_darwin_amd64.go left in tree.
CONFLICT (modify/delete): services/provider/api/vendor/golang.org/x/sys/unix/zerrors_linux_sparc64.go deleted in HEAD and modified in Upgrade golang.org/x/net to v0.33.0 to address CVE-2024-45338. Version Upgrade golang.org/x/net to v0.33.0 to address CVE-2024-45338 of services/provider/api/vendor/golang.org/x/sys/unix/zerrors_linux_sparc64.go left in tree.
CONFLICT (modify/delete): services/provider/api/vendor/golang.org/x/sys/unix/zerrors_linux_s390x.go deleted in HEAD and modified in Upgrade golang.org/x/net to v0.33.0 to address CVE-2024-45338. Version Upgrade golang.org/x/net to v0.33.0 to address CVE-2024-45338 of services/provider/api/vendor/golang.org/x/sys/unix/zerrors_linux_s390x.go left in tree.
CONFLICT (modify/delete): services/provider/api/vendor/golang.org/x/sys/unix/zerrors_linux_riscv64.go deleted in HEAD and modified in Upgrade golang.org/x/net to v0.33.0 to address CVE-2024-45338. Version Upgrade golang.org/x/net to v0.33.0 to address CVE-2024-45338 of services/provider/api/vendor/golang.org/x/sys/unix/zerrors_linux_riscv64.go left in tree.
CONFLICT (modify/delete): services/provider/api/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64le.go deleted in HEAD and modified in Upgrade golang.org/x/net to v0.33.0 to address CVE-2024-45338. Version Upgrade golang.org/x/net to v0.33.0 to address CVE-2024-45338 of services/provider/api/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64le.go left in tree.
CONFLICT (modify/delete): services/provider/api/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64.go deleted in HEAD and modified in Upgrade golang.org/x/net to v0.33.0 to address CVE-2024-45338. Version Upgrade golang.org/x/net to v0.33.0 to address CVE-2024-45338 of services/provider/api/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64.go left in tree.
CONFLICT (modify/delete): services/provider/api/vendor/golang.org/x/sys/unix/zerrors_linux_ppc.go deleted in HEAD and modified in Upgrade golang.org/x/net to v0.33.0 to address CVE-2024-45338. Version Upgrade golang.org/x/net to v0.33.0 to address CVE-2024-45338 of services/provider/api/vendor/golang.org/x/sys/unix/zerrors_linux_ppc.go left in tree.
CONFLICT (modify/delete): services/provider/api/vendor/golang.org/x/sys/unix/zerrors_linux_mipsle.go deleted in HEAD and modified in Upgrade golang.org/x/net to v0.33.0 to address CVE-2024-45338. Version Upgrade golang.org/x/net to v0.33.0 to address CVE-2024-45338 of services/provider/api/vendor/golang.org/x/sys/unix/zerrors_linux_mipsle.go left in tree.
CONFLICT (modify/delete): services/provider/api/vendor/golang.org/x/sys/unix/zerrors_linux_mips64le.go deleted in HEAD and modified in Upgrade golang.org/x/net to v0.33.0 to address CVE-2024-45338. Version Upgrade golang.org/x/net to v0.33.0 to address CVE-2024-45338 of services/provider/api/vendor/golang.org/x/sys/unix/zerrors_linux_mips64le.go left in tree.
CONFLICT (modify/delete): services/provider/api/vendor/golang.org/x/sys/unix/zerrors_linux_mips64.go deleted in HEAD and modified in Upgrade golang.org/x/net to v0.33.0 to address CVE-2024-45338. Version Upgrade golang.org/x/net to v0.33.0 to address CVE-2024-45338 of services/provider/api/vendor/golang.org/x/sys/unix/zerrors_linux_mips64.go left in tree.
CONFLICT (modify/delete): services/provider/api/vendor/golang.org/x/sys/unix/zerrors_linux_mips.go deleted in HEAD and modified in Upgrade golang.org/x/net to v0.33.0 to address CVE-2024-45338. Version Upgrade golang.org/x/net to v0.33.0 to address CVE-2024-45338 of services/provider/api/vendor/golang.org/x/sys/unix/zerrors_linux_mips.go left in tree.
CONFLICT (modify/delete): services/provider/api/vendor/golang.org/x/sys/unix/zerrors_linux_loong64.go deleted in HEAD and modified in Upgrade golang.org/x/net to v0.33.0 to address CVE-2024-45338. Version Upgrade golang.org/x/net to v0.33.0 to address CVE-2024-45338 of services/provider/api/vendor/golang.org/x/sys/unix/zerrors_linux_loong64.go left in tree.
CONFLICT (modify/delete): services/provider/api/vendor/golang.org/x/sys/unix/zerrors_linux_arm64.go deleted in HEAD and modified in Upgrade golang.org/x/net to v0.33.0 to address CVE-2024-45338. Version Upgrade golang.org/x/net to v0.33.0 to address CVE-2024-45338 of services/provider/api/vendor/golang.org/x/sys/unix/zerrors_linux_arm64.go left in tree.
CONFLICT (modify/delete): services/provider/api/vendor/golang.org/x/sys/unix/zerrors_linux_arm.go deleted in HEAD and modified in Upgrade golang.org/x/net to v0.33.0 to address CVE-2024-45338. Version Upgrade golang.org/x/net to v0.33.0 to address CVE-2024-45338 of services/provider/api/vendor/golang.org/x/sys/unix/zerrors_linux_arm.go left in tree.
CONFLICT (modify/delete): services/provider/api/vendor/golang.org/x/sys/unix/zerrors_linux_amd64.go deleted in HEAD and modified in Upgrade golang.org/x/net to v0.33.0 to address CVE-2024-45338. Version Upgrade golang.org/x/net to v0.33.0 to address CVE-2024-45338 of services/provider/api/vendor/golang.org/x/sys/unix/zerrors_linux_amd64.go left in tree.
CONFLICT (modify/delete): services/provider/api/vendor/golang.org/x/sys/unix/zerrors_linux_386.go deleted in HEAD and modified in Upgrade golang.org/x/net to v0.33.0 to address CVE-2024-45338. Version Upgrade golang.org/x/net to v0.33.0 to address CVE-2024-45338 of services/provider/api/vendor/golang.org/x/sys/unix/zerrors_linux_386.go left in tree.
CONFLICT (modify/delete): services/provider/api/vendor/golang.org/x/sys/unix/zerrors_linux.go deleted in HEAD and modified in Upgrade golang.org/x/net to v0.33.0 to address CVE-2024-45338. Version Upgrade golang.org/x/net to v0.33.0 to address CVE-2024-45338 of services/provider/api/vendor/golang.org/x/sys/unix/zerrors_linux.go left in tree.
CONFLICT (modify/delete): services/provider/api/vendor/golang.org/x/net/http2/transport.go deleted in HEAD and modified in Upgrade golang.org/x/net to v0.33.0 to address CVE-2024-45338. Version Upgrade golang.org/x/net to v0.33.0 to address CVE-2024-45338 of services/provider/api/vendor/golang.org/x/net/http2/transport.go left in tree.
CONFLICT (modify/delete): services/provider/api/vendor/golang.org/x/net/http2/server.go deleted in HEAD and modified in Upgrade golang.org/x/net to v0.33.0 to address CVE-2024-45338. Version Upgrade golang.org/x/net to v0.33.0 to address CVE-2024-45338 of services/provider/api/vendor/golang.org/x/net/http2/server.go left in tree.
CONFLICT (modify/delete): services/provider/api/vendor/golang.org/x/net/http2/http2.go deleted in HEAD and modified in Upgrade golang.org/x/net to v0.33.0 to address CVE-2024-45338. Version Upgrade golang.org/x/net to v0.33.0 to address CVE-2024-45338 of services/provider/api/vendor/golang.org/x/net/http2/http2.go left in tree.
CONFLICT (modify/delete): services/provider/api/vendor/golang.org/x/net/http2/frame.go deleted in HEAD and modified in Upgrade golang.org/x/net to v0.33.0 to address CVE-2024-45338. Version Upgrade golang.org/x/net to v0.33.0 to address CVE-2024-45338 of services/provider/api/vendor/golang.org/x/net/http2/frame.go left in tree.
CONFLICT (modify/delete): services/provider/api/go.sum deleted in HEAD and modified in Upgrade golang.org/x/net to v0.33.0 to address CVE-2024-45338. Version Upgrade golang.org/x/net to v0.33.0 to address CVE-2024-45338 of services/provider/api/go.sum left in tree.
CONFLICT (modify/delete): services/provider/api/go.mod deleted in HEAD and modified in Upgrade golang.org/x/net to v0.33.0 to address CVE-2024-45338. Version Upgrade golang.org/x/net to v0.33.0 to address CVE-2024-45338 of services/provider/api/go.mod left in tree.
Auto-merging metrics/vendor/modules.txt
CONFLICT (content): Merge conflict in metrics/vendor/modules.txt
Auto-merging metrics/vendor/golang.org/x/sys/windows/zsyscall_windows.go
CONFLICT (content): Merge conflict in metrics/vendor/golang.org/x/sys/windows/zsyscall_windows.go
Auto-merging metrics/vendor/golang.org/x/sys/windows/types_windows.go
Auto-merging metrics/vendor/golang.org/x/sys/windows/syscall_windows.go
Auto-merging metrics/vendor/golang.org/x/sys/unix/ztypes_linux.go
CONFLICT (content): Merge conflict in metrics/vendor/golang.org/x/sys/unix/ztypes_linux.go
Auto-merging metrics/vendor/golang.org/x/sys/unix/ztypes_darwin_arm64.go
Auto-merging metrics/vendor/golang.org/x/sys/unix/ztypes_darwin_amd64.go
Auto-merging metrics/vendor/golang.org/x/sys/unix/zerrors_linux_sparc64.go
Auto-merging metrics/vendor/golang.org/x/sys/unix/zerrors_linux_s390x.go
Auto-merging metrics/vendor/golang.org/x/sys/unix/zerrors_linux_riscv64.go
Auto-merging metrics/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64le.go
Auto-merging metrics/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64.go
Auto-merging metrics/vendor/golang.org/x/sys/unix/zerrors_linux_ppc.go
Auto-merging metrics/vendor/golang.org/x/sys/unix/zerrors_linux_mipsle.go
Auto-merging metrics/vendor/golang.org/x/sys/unix/zerrors_linux_mips64le.go
Auto-merging metrics/vendor/golang.org/x/sys/unix/zerrors_linux_mips64.go
Auto-merging metrics/vendor/golang.org/x/sys/unix/zerrors_linux_mips.go
Auto-merging metrics/vendor/golang.org/x/sys/unix/zerrors_linux_loong64.go
Auto-merging metrics/vendor/golang.org/x/sys/unix/zerrors_linux_arm64.go
Auto-merging metrics/vendor/golang.org/x/sys/unix/zerrors_linux_arm.go
Auto-merging metrics/vendor/golang.org/x/sys/unix/zerrors_linux_amd64.go
Auto-merging metrics/vendor/golang.org/x/sys/unix/zerrors_linux_386.go
Auto-merging metrics/vendor/golang.org/x/sys/unix/zerrors_linux.go
CONFLICT (content): Merge conflict in metrics/vendor/golang.org/x/sys/unix/zerrors_linux.go
Auto-merging metrics/vendor/golang.org/x/sys/unix/mkerrors.sh
Auto-merging metrics/vendor/golang.org/x/net/http2/transport.go
CONFLICT (content): Merge conflict in metrics/vendor/golang.org/x/net/http2/transport.go
Auto-merging metrics/vendor/golang.org/x/net/http2/server.go
CONFLICT (content): Merge conflict in metrics/vendor/golang.org/x/net/http2/server.go
Auto-merging metrics/vendor/golang.org/x/net/http2/http2.go
Auto-merging metrics/go.sum
CONFLICT (content): Merge conflict in metrics/go.sum
Auto-merging metrics/go.mod
CONFLICT (content): Merge conflict in metrics/go.mod
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
Auto-merging api/vendor/modules.txt
CONFLICT (content): Merge conflict in api/vendor/modules.txt
Auto-merging api/vendor/golang.org/x/sys/windows/zsyscall_windows.go
Auto-merging api/vendor/golang.org/x/sys/windows/types_windows.go
Auto-merging api/vendor/golang.org/x/sys/windows/syscall_windows.go
Auto-merging api/vendor/golang.org/x/sys/unix/ztypes_linux.go
CONFLICT (content): Merge conflict in api/vendor/golang.org/x/sys/unix/ztypes_linux.go
Auto-merging api/vendor/golang.org/x/sys/unix/ztypes_darwin_arm64.go
Auto-merging api/vendor/golang.org/x/sys/unix/ztypes_darwin_amd64.go
Auto-merging api/vendor/golang.org/x/sys/unix/zsyscall_linux.go
Auto-merging api/vendor/golang.org/x/sys/unix/zerrors_linux_sparc64.go
Auto-merging api/vendor/golang.org/x/sys/unix/zerrors_linux_s390x.go
Auto-merging api/vendor/golang.org/x/sys/unix/zerrors_linux_riscv64.go
Auto-merging api/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64le.go
Auto-merging api/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64.go
Auto-merging api/vendor/golang.org/x/sys/unix/zerrors_linux_ppc.go
Auto-merging api/vendor/golang.org/x/sys/unix/zerrors_linux_mipsle.go
Auto-merging api/vendor/golang.org/x/sys/unix/zerrors_linux_mips64le.go
Auto-merging api/vendor/golang.org/x/sys/unix/zerrors_linux_mips64.go
Auto-merging api/vendor/golang.org/x/sys/unix/zerrors_linux_mips.go
Auto-merging api/vendor/golang.org/x/sys/unix/zerrors_linux_loong64.go
Auto-merging api/vendor/golang.org/x/sys/unix/zerrors_linux_arm64.go
Auto-merging api/vendor/golang.org/x/sys/unix/zerrors_linux_arm.go
Auto-merging api/vendor/golang.org/x/sys/unix/zerrors_linux_amd64.go
Auto-merging api/vendor/golang.org/x/sys/unix/zerrors_linux_386.go
Auto-merging api/vendor/golang.org/x/sys/unix/zerrors_linux.go
CONFLICT (content): Merge conflict in api/vendor/golang.org/x/sys/unix/zerrors_linux.go
Auto-merging api/vendor/golang.org/x/sys/unix/syscall_linux.go
Auto-merging api/vendor/golang.org/x/sys/unix/mkerrors.sh
Auto-merging api/vendor/golang.org/x/net/http2/transport.go
CONFLICT (content): Merge conflict in api/vendor/golang.org/x/net/http2/transport.go
Auto-merging api/vendor/golang.org/x/net/http2/server.go
CONFLICT (content): Merge conflict in api/vendor/golang.org/x/net/http2/server.go
Auto-merging api/vendor/golang.org/x/net/http2/http2.go
Auto-merging api/go.sum
CONFLICT (content): Merge conflict in api/go.sum
Auto-merging api/go.mod
CONFLICT (content): Merge conflict in api/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 Upgrade golang.org/x/net to v0.33.0 to address CVE-2024-45338

In response to this:

/cherry-pick release-4.17

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
Reviewers

@iamniting iamniting iamniting approved these changes

Assignees

@iamniting iamniting

@malayparida2000 malayparida2000

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. jira/valid-bug Indicates that the referenced jira bug is valid for the branch this PR is targeting 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.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@openshift-cherrypick-robot @openshift-ci-robot @malayparida2000 @iamniting