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

[release-4.17] OCPBUGS-47443: Bump x/net to v0.33.0 #2592

Merged
merged 1 commit into from
Jan 10, 2025
Merged

[release-4.17] OCPBUGS-47443: Bump x/net to v0.33.0 #2592

merged 1 commit into from
Jan 10, 2025

Conversation

mansikulkarni96
Copy link
Member

This PR bumps the x/net dependency to v0.33.0
to fix CVE-2024-45338.
Ran: go mod tidy && go mod vendor

@mansikulkarni96
Bump x/net to v0.33.0
364cd81 
This commit bumps the x/net dependency to v0.33.0
to fix CVE-2024-45338.
Ran: go mod tidy && go mod vendor
@openshift-ci openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Dec 20, 2024
@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Dec 20, 2024

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@openshift-ci-robot openshift-ci-robot added jira/severity-important Referenced Jira bug's severity is important for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Dec 20, 2024
@openshift-ci-robot
Copy link

@mansikulkarni96: This pull request references Jira Issue OCPBUGS-47443, which is invalid:

  • release note text must be set and not match the template OR release note type must be set to "Release Note Not Required". For more information you can reference the OpenShift Bug Process.
  • expected Jira Issue OCPBUGS-47443 to depend on a bug targeting a version in 4.18.0 and in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but no dependents were found

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.

The bug has been updated to refer to the pull request using the external bug tracker.

In response to this:

This PR bumps the x/net dependency to v0.33.0
to fix CVE-2024-45338.
Ran: go mod tidy && go mod vendor

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
Copy link
Contributor

openshift-ci bot commented Dec 20, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mansikulkarni96

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 Dec 20, 2024
@mansikulkarni96
Copy link
Member Author

/jira refresh

@openshift-ci-robot
Copy link

@mansikulkarni96: This pull request references Jira Issue OCPBUGS-47443, which is invalid:

  • expected dependent Jira Issue OCPBUGS-47444 to be in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but it is POST instead

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:

/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.

@jrvaldes
Copy link
Contributor

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Dec 20, 2024
@jrvaldes
Copy link
Contributor

@openshift/openshift-team-windows-containers for this fix, I think we can skip the parent bug dependency
#2592 (comment) and open all the backport PRs

@mansikulkarni96 mansikulkarni96 marked this pull request as ready for review January 6, 2025 16:38
@openshift-ci openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jan 6, 2025
@mansikulkarni96
Copy link
Member Author

/jira refresh

@openshift-ci-robot
Copy link

@mansikulkarni96: This pull request references Jira Issue OCPBUGS-47443, which is invalid:

  • expected dependent Jira Issue OCPBUGS-47444 to be in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but it is MODIFIED instead

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:

/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 requested a review from sebsoto January 6, 2025 16:39
@mansikulkarni96
Copy link
Member Author

/jira refresh

@openshift-ci-robot
Copy link

@mansikulkarni96: This pull request references Jira Issue OCPBUGS-47443, which is invalid:

  • expected Jira Issue OCPBUGS-47443 to depend on a bug targeting a version in 4.18.0 and in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but no dependents were found

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:

/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.

@mansikulkarni96
Copy link
Member Author

/jira refresh

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

@mansikulkarni96: This pull request references Jira Issue OCPBUGS-47443, which is valid.

7 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.17.z) matches configured target version for branch (4.17.z)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)
  • release note text is set and does not match the template
  • dependent bug Jira Issue OCPBUGS-47444 is in the state Verified, which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
  • dependent Jira Issue OCPBUGS-47444 targets the "4.18.0" version, which is one of the valid target versions: 4.18.0
  • bug has dependents

Requesting review from QA contact:
/cc @rrasouli

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 requested a review from rrasouli January 9, 2025 15:20
@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD d1e9271 and 2 for PR HEAD 364cd81 in total

1 similar comment
@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD d1e9271 and 2 for PR HEAD 364cd81 in total

@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Jan 9, 2025

@mansikulkarni96: all tests passed!

Full PR test history. Your PR dashboard.

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. I understand the commands that are listed here.

@mansikulkarni96
Copy link
Member Author

/override Red Hat Konflux / windows-machine-config-operator-release-4-17-on-pull-request

@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Jan 10, 2025

@mansikulkarni96: /override requires failed status contexts, check run or a prowjob name to operate on.
The following unknown contexts/checkruns were given:

  • /
  • Hat
  • Konflux
  • Red
  • windows-machine-config-operator-release-4-17-on-pull-request

Only the following failed contexts/checkruns were expected:

  • Red Hat Konflux / windows-machine-config-operator-release-4-17-on-pull-request
  • ci/prow/aws-e2e-operator
  • ci/prow/azure-e2e-operator
  • ci/prow/azure-e2e-upgrade
  • ci/prow/build
  • ci/prow/ci-bundle-wmco-bundle
  • ci/prow/gcp-e2e-operator
  • ci/prow/images
  • ci/prow/lint
  • ci/prow/nutanix-e2e-operator
  • ci/prow/platform-none-vsphere-e2e-operator
  • ci/prow/security
  • ci/prow/unit
  • ci/prow/vsphere-disconnected-e2e-operator
  • ci/prow/vsphere-e2e-operator
  • ci/prow/vsphere-proxy-e2e-operator
  • ci/prow/wicd-unit-vsphere
  • pull-ci-openshift-windows-machine-config-operator-master-aws-e2e-operator
  • pull-ci-openshift-windows-machine-config-operator-master-azure-e2e-operator
  • pull-ci-openshift-windows-machine-config-operator-master-azure-e2e-upgrade
  • pull-ci-openshift-windows-machine-config-operator-master-build
  • pull-ci-openshift-windows-machine-config-operator-master-ci-bundle-wmco-bundle
  • pull-ci-openshift-windows-machine-config-operator-master-gcp-e2e-operator
  • pull-ci-openshift-windows-machine-config-operator-master-images
  • pull-ci-openshift-windows-machine-config-operator-master-lint
  • pull-ci-openshift-windows-machine-config-operator-master-nutanix-e2e-operator
  • pull-ci-openshift-windows-machine-config-operator-master-platform-none-vsphere-e2e-operator
  • pull-ci-openshift-windows-machine-config-operator-master-security
  • pull-ci-openshift-windows-machine-config-operator-master-unit
  • pull-ci-openshift-windows-machine-config-operator-master-vsphere-disconnected-e2e-operator
  • pull-ci-openshift-windows-machine-config-operator-master-vsphere-e2e-operator
  • pull-ci-openshift-windows-machine-config-operator-master-vsphere-proxy-e2e-operator
  • pull-ci-openshift-windows-machine-config-operator-master-wicd-unit-vsphere
  • tide

If you are trying to override a checkrun that has a space in it, you must put a double quote on the context.

In response to this:

/override Red Hat Konflux / windows-machine-config-operator-release-4-17-on-pull-request

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.

@mansikulkarni96
Copy link
Member Author

/override Red Hat Konflux / windows-machine-config-operator-release-4-17-on-pull-request

@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Jan 10, 2025

@mansikulkarni96: /override requires failed status contexts, check run or a prowjob name to operate on.
The following unknown contexts/checkruns were given:

  • /
  • Hat
  • Konflux
  • Red
  • windows-machine-config-operator-release-4-17-on-pull-request

Only the following failed contexts/checkruns were expected:

  • Red Hat Konflux / windows-machine-config-operator-release-4-17-on-pull-request
  • ci/prow/aws-e2e-operator
  • ci/prow/azure-e2e-operator
  • ci/prow/azure-e2e-upgrade
  • ci/prow/build
  • ci/prow/ci-bundle-wmco-bundle
  • ci/prow/gcp-e2e-operator
  • ci/prow/images
  • ci/prow/lint
  • ci/prow/nutanix-e2e-operator
  • ci/prow/platform-none-vsphere-e2e-operator
  • ci/prow/security
  • ci/prow/unit
  • ci/prow/vsphere-disconnected-e2e-operator
  • ci/prow/vsphere-e2e-operator
  • ci/prow/vsphere-proxy-e2e-operator
  • ci/prow/wicd-unit-vsphere
  • pull-ci-openshift-windows-machine-config-operator-master-aws-e2e-operator
  • pull-ci-openshift-windows-machine-config-operator-master-azure-e2e-operator
  • pull-ci-openshift-windows-machine-config-operator-master-azure-e2e-upgrade
  • pull-ci-openshift-windows-machine-config-operator-master-build
  • pull-ci-openshift-windows-machine-config-operator-master-ci-bundle-wmco-bundle
  • pull-ci-openshift-windows-machine-config-operator-master-gcp-e2e-operator
  • pull-ci-openshift-windows-machine-config-operator-master-images
  • pull-ci-openshift-windows-machine-config-operator-master-lint
  • pull-ci-openshift-windows-machine-config-operator-master-nutanix-e2e-operator
  • pull-ci-openshift-windows-machine-config-operator-master-platform-none-vsphere-e2e-operator
  • pull-ci-openshift-windows-machine-config-operator-master-security
  • pull-ci-openshift-windows-machine-config-operator-master-unit
  • pull-ci-openshift-windows-machine-config-operator-master-vsphere-disconnected-e2e-operator
  • pull-ci-openshift-windows-machine-config-operator-master-vsphere-e2e-operator
  • pull-ci-openshift-windows-machine-config-operator-master-vsphere-proxy-e2e-operator
  • pull-ci-openshift-windows-machine-config-operator-master-wicd-unit-vsphere
  • tide

If you are trying to override a checkrun that has a space in it, you must put a double quote on the context.

In response to this:

/override Red Hat Konflux / windows-machine-config-operator-release-4-17-on-pull-request

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.

@mansikulkarni96
Copy link
Member Author

/override "Red Hat Konflux / windows-machine-config-operator-release-4-17-on-pull-request"

@openshift-ci OpenShift CI
Copy link
Contributor

openshift-ci bot commented Jan 10, 2025

@mansikulkarni96: Overrode contexts on behalf of mansikulkarni96: Red Hat Konflux / windows-machine-config-operator-release-4-17-on-pull-request

In response to this:

/override "Red Hat Konflux / windows-machine-config-operator-release-4-17-on-pull-request"

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-merge-bot openshift-merge-bot bot merged commit c8b2213 into openshift:release-4.17 Jan 10, 2025
18 of 19 checks passed
@openshift-ci-robot
Copy link

@mansikulkarni96: Jira Issue OCPBUGS-47443: All pull requests linked via external trackers have merged:

Jira Issue OCPBUGS-47443 has been moved to the MODIFIED state.

In response to this:

This PR bumps the x/net dependency to v0.33.0
to fix CVE-2024-45338.
Ran: go mod tidy && go mod vendor

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.

@mansikulkarni96
Copy link
Member Author

/cherry-pick release-4.16

@openshift-cherrypick-robot
Copy link

@mansikulkarni96: #2592 failed to apply on top of branch "release-4.16":

Applying: Bump x/net to v0.33.0
Using index info to reconstruct a base tree...
M	go.mod
M	go.sum
M	vendor/golang.org/x/crypto/ssh/server.go
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_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/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
Auto-merging vendor/golang.org/x/crypto/ssh/server.go
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
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 x/net to v0.33.0

In response to this:

/cherry-pick release-4.16

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

@sebsoto sebsoto Awaiting requested review from sebsoto

@rrasouli rrasouli Awaiting requested review from rrasouli

Assignees

@jrvaldes jrvaldes

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. jira/severity-important Referenced Jira bug's severity is important for the branch this PR is targeting. jira/valid-bug Indicates that a 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
@mansikulkarni96 @openshift-ci-robot @jrvaldes @openshift-cherrypick-robot