Skip to content

Backport of NET-6317 - update usage of deprecated fields: http2_protocol_options and access_log_path into release/1.15.x#19951

Merged
jmurret merged 1 commit into
release/1.15.xfrom
backport/jm/NET-6317/strongly-settled-manatee
Dec 14, 2023
Merged

Backport of NET-6317 - update usage of deprecated fields: http2_protocol_options and access_log_path into release/1.15.x#19951
jmurret merged 1 commit into
release/1.15.xfrom
backport/jm/NET-6317/strongly-settled-manatee

Conversation

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

Backport

This PR is auto-generated from #19940 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:
@jmurret
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

Remove uses of deprecated fields:

  • envoy.config.cluster.v3.Cluster.http2_protocol_options
  • envoy.config.bootstrap.v3.Admin.access_log_path

Testing & Reproduction steps

CI works

PR Checklist

  • updated test coverage
  • external facing docs updated
  • appropriate backport labels added
  • not a security concern

Overview of commits

@hashicorp-cla
Copy link
Copy Markdown

hashicorp-cla commented Dec 14, 2023

CLA assistant check
All committers have signed the CLA.

Copy link
Copy Markdown
Collaborator

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 December 14, 2023 20:20 Inactive
@jmurret jmurret marked this pull request as ready for review December 14, 2023 21:35
@jmurret jmurret requested a review from a team as a code owner December 14, 2023 21:35
@jmurret jmurret force-pushed the backport/jm/NET-6317/strongly-settled-manatee branch from 5634ed0 to f712fbf Compare December 14, 2023 21:36
@jmurret jmurret merged commit 1268d06 into release/1.15.x Dec 14, 2023
@jmurret jmurret deleted the backport/jm/NET-6317/strongly-settled-manatee branch December 14, 2023 21:57
jmurret added a commit that referenced this pull request Jan 5, 2024
…p2_protocol_options and access_log_path into release/1.15.x (#19951)"

This reverts commit 1268d06.
jmurret added a commit that referenced this pull request Jan 5, 2024
* Revert "Backport into 1.15 of NET-6944 - Replace usage of deprecated Envoy field envoy.extensions.filters.http.lua.v3.Lua.inline_code (#20052)"

This reverts commit d99c27b.

* Revert "Backport of NET-4774 - replace usage of deprecated Envoy field match_subject_alt_names into release/1.15.x (#20055)"

This reverts commit dbc87ca.

* Revert "Backport of NET-6942 - Replace usage of deprecated Envoy field envoy.config.cluster.v3.Cluster.http_protocol_options. into release/1.15.x (#20031)"

This reverts commit 3b70b66.

* Revert "Backport of NET-6317 - update usage of deprecated fields: http2_protocol_options and access_log_path into release/1.15.x (#19951)"

This reverts commit 1268d06.
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