status-im
/
consul
mirror of https://github.com/status-im/consul.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #8150 from hashicorp/18-wan-fed-docs 

Remove consul:beta now that 1.8 is out.
This commit is contained in:
Luke Kysow 2020-06-18 12:54:31 -07:00 committed by GitHub
parent 4f17350928 fcbed6da44
commit d3cc5ec1fe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
website/pages/docs/k8s/installation/multi-cluster/kubernetes.mdx
View File

@ -38,7 +38,6 @@ with the possible modifications listed below.
```yaml ```yaml
global: global:
name: consul name: consul
image: consul:beta
datacenter: dc1 datacenter: dc1
# TLS configures whether Consul components use TLS. # TLS configures whether Consul components use TLS.
@ -78,12 +77,6 @@ meshGateway:
Modifications: Modifications:
1. Note the Docker image:
```yaml
global:
image: consul:beta
```
Kubernetes support for federation is currently only available in Consul 1.8.0 beta.
1. The Consul datacenter name is `dc1`. The datacenter name in each federated 1. The Consul datacenter name is `dc1`. The datacenter name in each federated
cluster **must be unique**. cluster **must be unique**.
1. ACLs are enabled in the above config file. They can be disabled by setting: 1. ACLs are enabled in the above config file. They can be disabled by setting:
@ -133,7 +126,6 @@ the following config:
```yaml ```yaml
global: global:
image: consul:beta
tls: tls:
enabled: true enabled: true
federation: federation:
@ -146,8 +138,6 @@ meshGateway:
enabled: true enabled: true
``` ```
1. `global.image` must be set to `consul:beta` because Kubernetes support
for federation is currently only available in Consul 1.8.0 beta.
1. `global.tls.enabled` must be `true`. See [Configuring TLS on an Existing Cluster](/docs/k8s/operations/tls-on-existing-cluster) 1. `global.tls.enabled` must be `true`. See [Configuring TLS on an Existing Cluster](/docs/k8s/operations/tls-on-existing-cluster)
for more information on safely upgrading a cluster to use TLS. for more information on safely upgrading a cluster to use TLS.
@ -267,7 +257,6 @@ settings are different.
```yaml ```yaml
global: global:
name: consul name: consul
image: consul:beta
datacenter: dc2 datacenter: dc2
tls: tls:
enabled: true enabled: true
@ -314,8 +303,6 @@ server:
Modifications: Modifications:
1. Note `global.image: consul:beta`. Kubernetes support for federation is currently only available
in Consul 1.8.0 beta.
1. The Consul datacenter name is `dc2`. The primary datacenter's name was `dc1`. 1. The Consul datacenter name is `dc2`. The primary datacenter's name was `dc1`.
The datacenter name in **each** federated cluster **must be unique**. The datacenter name in **each** federated cluster **must be unique**.
1. ACLs are enabled in the above config file. They can be disabled by removing 1. ACLs are enabled in the above config file. They can be disabled by removing

1
website/pages/docs/k8s/installation/multi-cluster/vms-and-kubernetes.mdx
View File

@ -244,7 +244,6 @@ Then use the following Helm config file:
```yaml ```yaml
global: global:
name: consul name: consul
image: consul:beta
datacenter: dc2 datacenter: dc2
tls: tls:
enabled: true enabled: true