Skip to content

Backport of update config defaults, add docs into release/1.14.x#15323

Merged
hashi-derek merged 1 commit into
release/1.14.xfrom
backport/malizz/NET-1203/change-1.14-config-defaults/centrally-valued-crayfish
Nov 10, 2022
Merged

Backport of update config defaults, add docs into release/1.14.x#15323
hashi-derek merged 1 commit into
release/1.14.xfrom
backport/malizz/NET-1203/change-1.14-config-defaults/centrally-valued-crayfish

Conversation

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

Backport

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

WARNING automatic cherry-pick of commits failed. Commits will require human attention.

merge conflict error: unable to process merge commit: "9260da27b40c59810df21f3b56ba9efafc253212", automatic backport requires rebase workflow

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


Description

Change 1.14 Config Defaults

  • Peering is enabled by default
  • Set the gRPC TLS port to 8503 by default (on Consul servers)
  • Connect is enabled by default

PR Checklist

  • updated test coverage
  • external facing docs updated
  • not a security concern

Overview of commits

@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/malizz/NET-1203/change-1.14-config-defaults/centrally-valued-crayfish branch from 226cc39 to 99b2732 Compare November 10, 2022 15:30
@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/malizz/NET-1203/change-1.14-config-defaults/centrally-valued-crayfish branch from 0daaea7 to 3b4b20b Compare November 10, 2022 15:30
@github-actions github-actions Bot added theme/config Relating to Consul Agent configuration, including reloading type/docs Documentation needs to be created/updated/clarified labels Nov 10, 2022
* update config defaults, add docs

* update grpc tls port for non-default values

* add changelog

* Update website/content/docs/upgrading/upgrade-specific.mdx

Co-authored-by: Derek Menteer <105233703+hashi-derek@users.noreply.github.com>

* Update website/content/docs/agent/config/config-files.mdx

Co-authored-by: Derek Menteer <105233703+hashi-derek@users.noreply.github.com>

* update logic for setting grpc tls port value

* move default config to default.go, update changelog

* update docs

* Fix config tests.

* Fix linter error.

* Fix ConnectCA tests.

* Cleanup markdown on upgrade notes.

Co-authored-by: Derek Menteer <105233703+hashi-derek@users.noreply.github.com>
Co-authored-by: Derek Menteer <derek.menteer@hashicorp.com>
@hashi-derek hashi-derek force-pushed the backport/malizz/NET-1203/change-1.14-config-defaults/centrally-valued-crayfish branch from 3b4b20b to 94d8f86 Compare November 10, 2022 15:40
@hashi-derek hashi-derek marked this pull request as ready for review November 10, 2022 16:40
@hashi-derek hashi-derek requested a review from a team as a code owner November 10, 2022 16:40
@hashi-derek hashi-derek merged commit 6645e02 into release/1.14.x Nov 10, 2022
@hashi-derek hashi-derek deleted the backport/malizz/NET-1203/change-1.14-config-defaults/centrally-valued-crayfish branch November 10, 2022 17:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

theme/config Relating to Consul Agent configuration, including reloading type/docs Documentation needs to be created/updated/clarified

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants