From ef4b2e8a05e55c619656e98ed0e76c8b7cfb3d2c Mon Sep 17 00:00:00 2001 From: hc-github-team-consul-core Date: Fri, 21 Jul 2023 12:18:17 -0400 Subject: [PATCH] Backport of fix typos and update ecs compat table into release/1.16.x (#18220) * backport of commit 216f79353fe39e9f96b2eba64022ace334bd8887 * backport of commit 1df03269ef0cf336ea28ac65b280416461530765 * backport of commit 12df6a1ac91cb63552a5df2a542f251b60ba3735 --------- Co-authored-by: trujillo-adam Co-authored-by: trujillo-adam <47586768+trujillo-adam@users.noreply.github.com> --- website/content/docs/ecs/compatibility.mdx | 15 +++++++-------- .../content/docs/lambda/registration/automate.mdx | 4 ++-- website/content/docs/nia/usage/run-ha.mdx | 14 ++++++++------ 3 files changed, 17 insertions(+), 16 deletions(-) diff --git a/website/content/docs/ecs/compatibility.mdx b/website/content/docs/ecs/compatibility.mdx index 803d4e3c2..8fc0fd080 100644 --- a/website/content/docs/ecs/compatibility.mdx +++ b/website/content/docs/ecs/compatibility.mdx @@ -5,19 +5,18 @@ description: >- The binary for Consul on Amazon Web Services ECS and the Terraform modules for automating deployments are tightly coupled and have specific version requirements. Review compatibility information for versions of Consul and `consul-ecs` to help you choose compatible versions. --- -# Consul on AWS Elastic Container Service (ECS) Compatability Matrix +# Consul on AWS Elastic Container Service (ECS) compatability matrix For every release of Consul on ECS, the `consul-ecs` binary and `consul-ecs` Terraform module are updated. The versions of the Terraform module and binary are tightly coupled. For example, `consul-ecs` 0.5.2 binary must use the `consul-ecs` 0.5.2 Terraform module. ## Supported Consul versions -| Consul Version | Compatible consul-ecs Versions | -| -------------- | ------------------------------- | -| 1.14.x | 0.5.2+ | -| 1.13.x | 0.5.2+ | -| 1.12.x | 0.5.x | -| 1.11.x | 0.3.0, 0.4.x | -| 1.10.x | 0.2.x | +| Consul Version | Compatible consul-ecs Version | +|----------------------- | ----------------------------- | +| 1.15.x, 1.14.x, 1.13.x | 0.6.x | +| 1.14.x, 1.13.x, 1.12.x | 0.5.2+ | +| 1.11.x | 0.3.0, 0.4.x | +| 1.10.x | 0.2.x | ## Supported Envoy versions diff --git a/website/content/docs/lambda/registration/automate.mdx b/website/content/docs/lambda/registration/automate.mdx index 4614be695..8a118aa86 100644 --- a/website/content/docs/lambda/registration/automate.mdx +++ b/website/content/docs/lambda/registration/automate.mdx @@ -1,11 +1,11 @@ --- layout: docs -page_title: Automate Lambda Function Registeration +page_title: Automate Lambda function registration description: >- Register AWS Lambda functions with Consul service mesh using the Consul Lambda registrator. The Consul Lambda registrator automates Lambda function registration. --- -# Automate Lambda Function Registeration +# Automate Lambda function registration This topic describes how to automate Lambda function registration using Consul's Lambda registrator module for Terraform. diff --git a/website/content/docs/nia/usage/run-ha.mdx b/website/content/docs/nia/usage/run-ha.mdx index 1623cd66c..31d225156 100644 --- a/website/content/docs/nia/usage/run-ha.mdx +++ b/website/content/docs/nia/usage/run-ha.mdx @@ -1,14 +1,16 @@ --- layout: docs -page_title: Run Consul-Terraform-Sync with High Availability +page_title: Run Consul-Terraform-Sync with high availability description: >- Improve network automation resiliency by enabling high availability for Consul-Terraform-Sync. HA enables persistent task and event data so that CTS functions as expected during a failover event. --- -# Run Consul-Terraform-Sync with High Availability +# Run Consul-Terraform-Sync with high availability + - Licenses are only required for Consul-Terraform-Sync (CTS) Enterprise + An enterpise license is only required for enterprise distributions of Consul-Terraform-Sync (CTS). + This topic describes how to run Consul-Terraform-Sync (CTS) configured for high availability. High availability is an enterprise capability that ensures that all changes to Consul that occur during a failover transition are processed and that CTS continues to operate as expected. ## Introduction @@ -120,9 +122,9 @@ When high availability is enabled, CTS persists task and event data. Refer to [S You can use the following methods for modifying tasks when high availability is enabled. We recommend choosing a single method to make all task configuration changes because inconsistencies between the state and the configuration can occur when mixing methods. -### Delete and recreate the task (recommended) +### Delete and recreate the task -Use the CTS API to identify the CTS leader instance as well as delete and replace a task. +We recommend deleting and recreating a task if you need to make a modification. Use the CTS API to identify the CTS leader instance and replace a task. 1. Identify the leader CTS instance by either making a call to the [`status/cluster` API endpoint](/consul/docs/nia/api/status#cluster-status) or by checking the logs for the following entry: @@ -143,7 +145,7 @@ Use the CTS API to identify the CTS leader instance as well as delete and replac --request POST \ --data @payload.json \ localhost:8558/v1/tasks -``` + ``` You can also use the [`task-create` command](/consul/docs/nia/cli/task#task-create) to complete this step.