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

Backport of deps: coredns v1.10.1 into release/1.15.x #17933

Merged

Conversation

hc-github-team-consul-core
Copy link
Contributor

Backport

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

🚨

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:
@loshz
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/merges: 409 Merge conflict []

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


Description

Bumps the coredns from v1.6.6-> v1.10.1

Addresses CVEs noted in #17358


Overview of commits

@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/loshz/bump-coredns/severely-resolved-poodle branch from c53d405 to f1d40cc Compare June 28, 2023 14:54
@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/loshz/bump-coredns/severely-resolved-poodle branch from f1d40cc to c53d405 Compare June 28, 2023 14:54
@hashicorp-cla
Copy link

hashicorp-cla commented Jun 28, 2023

CLA assistant check
All committers have signed the CLA.

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Auto approved Consul Bot automated PR

@vercel vercel bot temporarily deployed to Preview – consul-ui-staging June 28, 2023 14:58 Inactive
@vercel vercel bot temporarily deployed to Preview – consul June 28, 2023 15:03 Inactive
@loshz loshz force-pushed the backport/loshz/bump-coredns/severely-resolved-poodle branch from f58cbcc to dc30819 Compare June 28, 2023 16:30
@loshz loshz marked this pull request as ready for review June 28, 2023 16:30
@loshz loshz enabled auto-merge (squash) June 28, 2023 16:30
@loshz loshz merged commit 4e3a2fd into release/1.15.x Jun 28, 2023
@loshz loshz deleted the backport/loshz/bump-coredns/severely-resolved-poodle branch June 28, 2023 17:02
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.

4 participants