Merge branch 'main' into docs/reintroduce-identity-argument

Author: trujillo-adam

content/terraform-enterprise/1.0.x/docs/enterprise/deploy/kubernetes/index.mdx

@@ -213,17 +213,6 @@ env:
     TFE_REDIS_PASSWORD: '<Redis password>'
     TFE_LICENSE: <Hashicorp license>
     TFE_ENCRYPTION_PASSWORD: '<Encryption password>'
-    TFE_REDIS_USE_MTLS: <To use mtls with Redis standalone or Sentinel? eg. "false">
-    TFE_REDIS_CLIENT_CERT_PATH: <Path to the client certificate file to be used for mTLS authentication with Redis server>
-    TFE_REDIS_CA_CERT_PATH: <Path to the Certificate Authority file user to validate the certificate>
-    TFE_REDIS_CLIENT_KEY_PATH: <Path to the private key file corresponding to the client certificate>
-    TFE_REDIS_SIDEKIQ_USE_MTLS: <To use mtls with Redis Enterprise? eg. "false">
-    TFE_REDIS_SIDEKIQ_CLIENT_CERT_PATH: <Path to the client certificate file to be used for mTLS authentication with Redis server>
-    TFE_REDIS_SIDEKIQ_CA_CERT_PATH: <Path to the Certificate Authority file user to validate the certificate>
-    TFE_REDIS_SIDEKIQ_CLIENT_KEY_PATH: <Path to the private key file corresponding to the client certificate>
-    TFE_REDIS_SENTINEL_ENABLED: <To use sentinel? e.g. "false">
-    TFE_REDIS_SENTINEL_HOSTS: <Hostname and port of Sentinel hosts, e.g. sentinel.example.com:26379>
-    TFE_REDIS_SENTINEL_LEADER_NAME: <Name of the Sentinel leader>
 ```
 
 ### Google Kubernetes Engine (GKE)
@@ -254,17 +243,6 @@ env:
     TFE_REDIS_USE_TLS: <To use tls? eg. "false">
     TFE_REDIS_USE_AUTH: <To use customized credential to authenticate? eg. "true">
     TFE_REDIS_USER: <Redis username>
-    TFE_REDIS_USE_MTLS: <To use mtls with Redis standalone or Sentinel? eg. "false">
-    TFE_REDIS_CLIENT_CERT_PATH: <Path to the client certificate file to be used for mTLS authentication with Redis server>
-    TFE_REDIS_CA_CERT_PATH: <Path to the Certificate Authority file user to validate the certificate>
-    TFE_REDIS_CLIENT_KEY_PATH: <Path to the private key file corresponding to the client certificate>
-    TFE_REDIS_SIDEKIQ_USE_MTLS: <To use mtls with Redis Enterprise? eg. "false">
-    TFE_REDIS_SIDEKIQ_CLIENT_CERT_PATH: <Path to the client certificate file to be used for mTLS authentication with Redis server>
-    TFE_REDIS_SIDEKIQ_CA_CERT_PATH: <Path to the Certificate Authority file user to validate the certificate>
-    TFE_REDIS_SIDEKIQ_CLIENT_KEY_PATH: <Path to the private key file corresponding to the client certificate>
-    TFE_REDIS_SENTINEL_ENABLED: <To use sentinel? e.g. "false">
-    TFE_REDIS_SENTINEL_HOSTS: <Hostname and port of Sentinel hosts, e.g. sentinel.example.com:26379>
-    TFE_REDIS_SENTINEL_LEADER_NAME: <Name of the Sentinel leader>
 
     # Google Cloud Storage settings.
     TFE_OBJECT_STORAGE_TYPE: google
@@ -307,17 +285,6 @@ env:
     TFE_REDIS_USE_TLS: <To use tls? eg. "false">
     TFE_REDIS_USE_AUTH: <To use customized credential to authenticate? eg. "true">
     TFE_REDIS_USER: <Redis username>
-    TFE_REDIS_USE_MTLS: <To use mtls with Redis standalone or Sentinel? eg. "false">
-    TFE_REDIS_CLIENT_CERT_PATH: <Path to the client certificate file to be used for mTLS authentication with Redis server>
-    TFE_REDIS_CA_CERT_PATH: <Path to the Certificate Authority file user to validate the certificate>
-    TFE_REDIS_CLIENT_KEY_PATH: <Path to the private key file corresponding to the client certificate>
-    TFE_REDIS_SIDEKIQ_USE_MTLS: <To use mtls with Redis Enterprise? eg. "false">
-    TFE_REDIS_SIDEKIQ_CLIENT_CERT_PATH: <Path to the client certificate file to be used for mTLS authentication with Redis server>
-    TFE_REDIS_SIDEKIQ_CA_CERT_PATH: <Path to the Certificate Authority file user to validate the certificate>
-    TFE_REDIS_SIDEKIQ_CLIENT_KEY_PATH: <Path to the private key file corresponding to the client certificate>
-    TFE_REDIS_SENTINEL_ENABLED: <To use sentinel? e.g. "false">
-    TFE_REDIS_SENTINEL_HOSTS: <Hostname and port of Sentinel hosts, e.g. sentinel.example.com:26379>
-    TFE_REDIS_SENTINEL_LEADER_NAME: <Name of the Sentinel leader>
 
     # Azure container storage settings.
     TFE_OBJECT_STORAGE_TYPE: azure

content/terraform-enterprise/1.0.x/docs/enterprise/deploy/manage/upgrade.mdx

@@ -21,6 +21,8 @@ Complete the following steps to upgrade Terraform Enterprise:
 
 1. If your deployment is configured to run multiple `terraform-enterprise` nodes, scale down to a single node. You can run multiple nodes when Terraform Enterprise is in `active-active` mode. Refer to  [Configure the operational mode](/terraform/enterprise/deploy/configuration/storage/configure-mode) for additional information.
 
+1. If your deployment makes use of an autoscaling group to manage instances of Terraform Enterprise, disable any configured health checks that would trigger the autoscaling group to rotate Terraform Enterprise instances during an upgrade.
+
 1. Stop the Terraform Enterprise application.
 
   <Tabs>

content/terraform-enterprise/v202501-1/docs/enterprise/deploy/manage/upgrade.mdx

@@ -21,6 +21,8 @@ Complete the following steps to upgrade Terraform Enterprise:
 
 1. If your deployment is configured to run multiple `terraform-enterprise` nodes, scale down to a single node. You can run multiple nodes when Terraform Enterprise is in `active-active` mode. Refer to  [Configure the operational mode](/terraform/enterprise/deploy/configuration/storage/configure-mode) for additional information.
 
+1. If your deployment makes use of an autoscaling group to manage instances of Terraform Enterprise, disable any configured health checks that would trigger the autoscaling group to rotate Terraform Enterprise instances during an upgrade.
+
 1. Stop the Terraform Enterprise application.
 
   <Tabs>

content/terraform-enterprise/v202502-1/docs/enterprise/deploy/manage/upgrade.mdx

@@ -21,6 +21,8 @@ Complete the following steps to upgrade Terraform Enterprise:
 
 1. If your deployment is configured to run multiple `terraform-enterprise` nodes, scale down to a single node. You can run multiple nodes when Terraform Enterprise is in `active-active` mode. Refer to  [Configure the operational mode](/terraform/enterprise/deploy/configuration/storage/configure-mode) for additional information.
 
+1. If your deployment makes use of an autoscaling group to manage instances of Terraform Enterprise, disable any configured health checks that would trigger the autoscaling group to rotate Terraform Enterprise instances during an upgrade.
+
 1. Stop the Terraform Enterprise application.
 
   <Tabs>

content/terraform-enterprise/v202502-2/docs/enterprise/deploy/manage/upgrade.mdx

@@ -21,6 +21,8 @@ Complete the following steps to upgrade Terraform Enterprise:
 
 1. If your deployment is configured to run multiple `terraform-enterprise` nodes, scale down to a single node. You can run multiple nodes when Terraform Enterprise is in `active-active` mode. Refer to  [Configure the operational mode](/terraform/enterprise/deploy/configuration/storage/configure-mode) for additional information.
 
+1. If your deployment makes use of an autoscaling group to manage instances of Terraform Enterprise, disable any configured health checks that would trigger the autoscaling group to rotate Terraform Enterprise instances during an upgrade.
+
 1. Stop the Terraform Enterprise application.
 
   <Tabs>

content/terraform-enterprise/v202503-1/docs/enterprise/deploy/manage/upgrade.mdx

@@ -21,6 +21,8 @@ Complete the following steps to upgrade Terraform Enterprise:
 
 1. If your deployment is configured to run multiple `terraform-enterprise` nodes, scale down to a single node. You can run multiple nodes when Terraform Enterprise is in `active-active` mode. Refer to  [Configure the operational mode](/terraform/enterprise/deploy/configuration/storage/configure-mode) for additional information.
 
+1. If your deployment makes use of an autoscaling group to manage instances of Terraform Enterprise, disable any configured health checks that would trigger the autoscaling group to rotate Terraform Enterprise instances during an upgrade.
+
 1. Stop the Terraform Enterprise application.
 
   <Tabs>

content/terraform-enterprise/v202504-1/docs/enterprise/deploy/manage/upgrade.mdx

@@ -21,6 +21,8 @@ Complete the following steps to upgrade Terraform Enterprise:
 
 1. If your deployment is configured to run multiple `terraform-enterprise` nodes, scale down to a single node. You can run multiple nodes when Terraform Enterprise is in `active-active` mode. Refer to  [Configure the operational mode](/terraform/enterprise/deploy/configuration/storage/configure-mode) for additional information.
 
+1. If your deployment makes use of an autoscaling group to manage instances of Terraform Enterprise, disable any configured health checks that would trigger the autoscaling group to rotate Terraform Enterprise instances during an upgrade.
+
 1. Stop the Terraform Enterprise application.
 
   <Tabs>

content/terraform-enterprise/v202505-1/docs/enterprise/deploy/manage/upgrade.mdx

@@ -21,6 +21,8 @@ Complete the following steps to upgrade Terraform Enterprise:
 
 1. If your deployment is configured to run multiple `terraform-enterprise` nodes, scale down to a single node. You can run multiple nodes when Terraform Enterprise is in `active-active` mode. Refer to  [Configure the operational mode](/terraform/enterprise/deploy/configuration/storage/configure-mode) for additional information.
 
+1. If your deployment makes use of an autoscaling group to manage instances of Terraform Enterprise, disable any configured health checks that would trigger the autoscaling group to rotate Terraform Enterprise instances during an upgrade.
+
 1. Stop the Terraform Enterprise application.
 
   <Tabs>

content/terraform-enterprise/v202506-1/docs/enterprise/deploy/kubernetes/index.mdx

@@ -213,14 +213,6 @@ env:
     TFE_REDIS_PASSWORD: '<Redis password>'
     TFE_LICENSE: <Hashicorp license>
     TFE_ENCRYPTION_PASSWORD: '<Encryption password>'
-    TFE_REDIS_USE_MTLS: <To use mtls with Redis standalone? eg. "false">
-    TFE_REDIS_CLIENT_CERT_PATH: <Path to the client certificate file to be used for mTLS authentication with Redis server>
-    TFE_REDIS_CA_CERT_PATH: <Path to the Certificate Authority file user to validate the certificate>
-    TFE_REDIS_CLIENT_KEY_PATH: <Path to the private key file corresponding to the client certificate>
-    TFE_REDIS_SIDEKIQ_USE_MTLS: <To use mtls with Redis Enterprise? eg. "false">
-    TFE_REDIS_SIDEKIQ_CLIENT_CERT_PATH: <Path to the client certificate file to be used for mTLS authentication with Redis server>
-    TFE_REDIS_SIDEKIQ_CA_CERT_PATH: <Path to the Certificate Authority file user to validate the certificate>
-    TFE_REDIS_SIDEKIQ_CLIENT_KEY_PATH: <Path to the private key file corresponding to the client certificate>
 ```
 
 ### Google Kubernetes Engine (GKE)
@@ -251,14 +243,6 @@ env:
     TFE_REDIS_USE_TLS: <To use tls? eg. "false">
     TFE_REDIS_USE_AUTH: <To use customized credential to authenticate? eg. "true">
     TFE_REDIS_USER: <Redis username>
-    TFE_REDIS_USE_MTLS: <To use mtls with Redis standalone? eg. "false">
-    TFE_REDIS_CLIENT_CERT_PATH: <Path to the client certificate file to be used for mTLS authentication with Redis server>
-    TFE_REDIS_CA_CERT_PATH: <Path to the Certificate Authority file user to validate the certificate>
-    TFE_REDIS_CLIENT_KEY_PATH: <Path to the private key file corresponding to the client certificate>
-    TFE_REDIS_SIDEKIQ_USE_MTLS: <To use mtls with Redis Enterprise? eg. "false">
-    TFE_REDIS_SIDEKIQ_CLIENT_CERT_PATH: <Path to the client certificate file to be used for mTLS authentication with Redis server>
-    TFE_REDIS_SIDEKIQ_CA_CERT_PATH: <Path to the Certificate Authority file user to validate the certificate>
-    TFE_REDIS_SIDEKIQ_CLIENT_KEY_PATH: <Path to the private key file corresponding to the client certificate>
 
     # Google Cloud Storage settings.
     TFE_OBJECT_STORAGE_TYPE: google
@@ -301,14 +285,6 @@ env:
     TFE_REDIS_USE_TLS: <To use tls? eg. "false">
     TFE_REDIS_USE_AUTH: <To use customized credential to authenticate? eg. "true">
     TFE_REDIS_USER: <Redis username>
-    TFE_REDIS_USE_MTLS: <To use mtls with Redis standalone? eg. "false">
-    TFE_REDIS_CLIENT_CERT_PATH: <Path to the client certificate file to be used for mTLS authentication with Redis server>
-    TFE_REDIS_CA_CERT_PATH: <Path to the Certificate Authority file user to validate the certificate>
-    TFE_REDIS_CLIENT_KEY_PATH: <Path to the private key file corresponding to the client certificate>
-    TFE_REDIS_SIDEKIQ_USE_MTLS: <To use mtls with Redis Enterprise? eg. "false">
-    TFE_REDIS_SIDEKIQ_CLIENT_CERT_PATH: <Path to the client certificate file to be used for mTLS authentication with Redis server>
-    TFE_REDIS_SIDEKIQ_CA_CERT_PATH: <Path to the Certificate Authority file user to validate the certificate>
-    TFE_REDIS_SIDEKIQ_CLIENT_KEY_PATH: <Path to the private key file corresponding to the client certificate>
 
     # Azure container storage settings.
     TFE_OBJECT_STORAGE_TYPE: azure

content/terraform-enterprise/v202506-1/docs/enterprise/deploy/manage/upgrade.mdx

@@ -21,6 +21,8 @@ Complete the following steps to upgrade Terraform Enterprise:
 
 1. If your deployment is configured to run multiple `terraform-enterprise` nodes, scale down to a single node. You can run multiple nodes when Terraform Enterprise is in `active-active` mode. Refer to  [Configure the operational mode](/terraform/enterprise/deploy/configuration/storage/configure-mode) for additional information.
 
+1. If your deployment makes use of an autoscaling group to manage instances of Terraform Enterprise, disable any configured health checks that would trigger the autoscaling group to rotate Terraform Enterprise instances during an upgrade.
+
 1. Stop the Terraform Enterprise application.
 
   <Tabs>