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

security: bump golang.org/x/net to v0.33.0 to fix CVE-2024-45338 #1720

Merged
merged 1 commit into from
Jan 7, 2025

Conversation

aramase
Copy link
Member

@aramase aramase commented Jan 2, 2025

No description provided.

@k8s-ci-robot k8s-ci-robot requested review from ritazh and tam7t January 2, 2025 16:33
@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. approved Indicates a PR has been approved by an approver from all required OWNERS files. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Jan 2, 2025
@aramase
Copy link
Member Author

aramase commented Jan 2, 2025

/assign enj

@codecov-commenter
Copy link

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 36.50%. Comparing base (87f51ec) to head (0a9f6c3).
Report is 96 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #1720      +/-   ##
==========================================
+ Coverage   35.83%   36.50%   +0.66%     
==========================================
  Files          63       63              
  Lines        3759     4526     +767     
==========================================
+ Hits         1347     1652     +305     
- Misses       2268     2731     +463     
+ Partials      144      143       -1     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@aramase
Copy link
Member Author

aramase commented Jan 7, 2025

@enj need an LGTM 😄

@enj
Copy link
Contributor

enj commented Jan 7, 2025

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jan 7, 2025
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: aramase, enj

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

@k8s-ci-robot
Copy link
Contributor

k8s-ci-robot commented Jan 7, 2025

@aramase: 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
pull-secrets-store-csi-driver-image-scan 0a9f6c3 link false /test pull-secrets-store-csi-driver-image-scan

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

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.

@k8s-ci-robot k8s-ci-robot merged commit d2494a5 into kubernetes-sigs:main Jan 7, 2025
23 of 24 checks passed
@aramase aramase deleted the aramase/c/bump_x_net branch January 7, 2025 17:03
@aramase
Copy link
Member Author

aramase commented Jan 7, 2025

/cherrypick release-1.4

@k8s-infra-cherrypick-robot

@aramase: #1720 failed to apply on top of branch "release-1.4":

Applying: security: bump golang.org/x/net to v0.33.0 to fix CVE-2024-45338
Using index info to reconstruct a base tree...
M	go.mod
M	go.sum
M	test/e2eprovider/go.mod
M	test/e2eprovider/go.sum
Falling back to patching base and 3-way merge...
Auto-merging test/e2eprovider/go.sum
Auto-merging test/e2eprovider/go.mod
CONFLICT (content): Merge conflict in test/e2eprovider/go.mod
Auto-merging 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 security: bump golang.org/x/net to v0.33.0 to fix CVE-2024-45338

In response to this:

/cherrypick release-1.4

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
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants