Backport of [NET-2420] security: Upgrade helm containerd and several other dependencies into release/1.3.x#3640
Merged
zalimeni merged 8 commits intorelease/1.3.xfrom Feb 17, 2024
Conversation
8c4cd99 to
edd232f
Compare
edd232f to
fbc2bcf
Compare
Addresses GHSA-7ww5-4wqc-m92c (GO-2023-2412)
Addresses GHSA-6xv5-86q9-7xr8 (GO-2023-2048)
fbc2bcf to
061c0d7
Compare
Member
|
I've hand-checked this diff for alignment w/ the original change after manually applying each individual bump from that PR. I don't see any red-flag differences in the deps diffs, and they're mostly-similar due to backports apart from a few that were apparently missed on some branches in the past. |
wilkermichael
approved these changes
Feb 16, 2024
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Backport
This PR is auto-generated from #3625 to be assessed for backporting due to the inclusion of the label backport/1.3.x.
🚨
The person who merged in the original PR is:
@zalimeni
This person should manually cherry-pick the original PR into a new backport PR,
and close this one when the manual backport PR is merged in.
The below text is copied from the body of the original PR.
This upgrades several dependencies to address open CVEs in the
climodule (caused by our consumption of 3rd-party libs for API clients that are bundled w/ unused runtimes, where a non-impacting vulnerability actually exists) and cross-compatibility between upgraded modules.This will allow us to re-enable release blocks on Go module scan results in CRT, previously disabled in:
Changes proposed in this PR
Upgrade the following (split by commit to aid review):
helm/v33.9.4 -> 3.11.3k8s.io/dependencies 1.26.? -> 1.26.10 to matchcontroller-runtime/helmcontainerd1.3.0 -> 1.7.13 (latest)docker/docker23.0.3+incompatible -> 25.0.2+incompatible (latest)oras.land/oras-go1.2.2 -> 1.2.5 to fix docker incompatibilitydocker/distribution2.8.1+incompatible -> 2.8.3+incompatible (latest)cyphar/filepath-securejoin0.2.3 -> 0.2.4 (latest 0.x patch)Automated backports will almost certainly fail, but I've added the labels JIC they're successful and to make it clear this should be backported.
How I've tested this PR
CI and acceptance tests continue to pass.
How I expect reviewers to test this PR
👀 + 💭
Checklist
Overview of commits