Skip to content

Backport of [NET-8601] Upgrade vault/api and docker/docker to resolve open CVEs into release/1.2.x#3839

Merged
zalimeni merged 3 commits intorelease/1.2.xfrom
backport/zalimeni/fix-multiple-cves/previously-fit-loon
Mar 29, 2024
Merged

Backport of [NET-8601] Upgrade vault/api and docker/docker to resolve open CVEs into release/1.2.x#3839
zalimeni merged 3 commits intorelease/1.2.xfrom
backport/zalimeni/fix-multiple-cves/previously-fit-loon

Conversation

@hc-github-team-consul-core
Copy link
Collaborator

Backport

This PR is auto-generated from #3837 to be assessed for backporting due to the inclusion of the label backport/1.2.x.

🚨

Warning automatic cherry-pick of commits failed. If the first commit failed,
you will see a blank no-op commit below. If at least one commit succeeded, you
will see the cherry-picked commits up to, not including, the commit where
the merge conflict occurred.

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.

merge conflict error: POST https://api.github.com/repos/hashicorp/consul-k8s/merges: 409 Merge conflict []

The below text is copied from the body of the original PR.


Changes proposed in this PR

Created by running:

make go-mod-get DEP_VERSION=github.com/hashicorp/vault/api@v1.12.2
make go-mod-get DEP_VERSION=github.com/docker/docker@v25.0.5+incompatible

These unblock the 1.4.1 patch release, so will be backported to .x and point-release branches.

How I've tested this PR

CI and Security Scan pass.

Also ran scan repository . to confirm CVEs are resolved.

How I expect reviewers to test this PR

👀

Checklist


Overview of commits

@hashicorp-cla
Copy link

hashicorp-cla commented Mar 29, 2024

CLA assistant check
All committers have signed the CLA.

@zalimeni zalimeni force-pushed the backport/zalimeni/fix-multiple-cves/previously-fit-loon branch from 3dba157 to 60b16f1 Compare March 29, 2024 17:22
@zalimeni zalimeni marked this pull request as ready for review March 29, 2024 17:23
@zalimeni zalimeni merged commit b164239 into release/1.2.x Mar 29, 2024
@zalimeni zalimeni deleted the backport/zalimeni/fix-multiple-cves/previously-fit-loon branch March 29, 2024 18:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants