Move datacenter to global
This commit is contained in:
parent
08ff19831a
commit
c9a5588264
3 changed files with 8 additions and 8 deletions
|
@ -61,7 +61,7 @@ spec:
|
|||
-bind=0.0.0.0 \
|
||||
-client=0.0.0.0 \
|
||||
-config-dir=/consul/config \
|
||||
-datacenter={{ .Values.server.datacenter }} \
|
||||
-datacenter={{ .Values.global.datacenter }} \
|
||||
-data-dir=/consul/data \
|
||||
{{- if (.Values.client.join) and (gt (len .Values.client.join) 0) }}
|
||||
{{- range $value := .Values.client.join }}
|
||||
|
|
|
@ -75,7 +75,7 @@ spec:
|
|||
-bootstrap-expect={{ .Values.server.bootstrapExpect }} \
|
||||
-client=0.0.0.0 \
|
||||
-config-dir=/consul/config \
|
||||
-datacenter={{ .Values.server.datacenter }} \
|
||||
-datacenter={{ .Values.global.datacenter }} \
|
||||
-data-dir=/consul/data \
|
||||
-domain={{ .Values.global.domain }} \
|
||||
{{- if .Values.server.connect }}
|
||||
|
|
12
values.yaml
12
values.yaml
|
@ -18,6 +18,12 @@ global:
|
|||
# servers below. This can be overridden per component.
|
||||
image: "consul:1.2.2"
|
||||
|
||||
# Datacenter is the name of the datacenter that the agents should register
|
||||
# as. This shouldn't be changed once the Consul cluster is up and running
|
||||
# since Consul doesn't support an automatic way to change this value
|
||||
# currently: https://github.com/hashicorp/consul/issues/1858
|
||||
datacenter: dc1
|
||||
|
||||
server:
|
||||
enabled: "-"
|
||||
image: null
|
||||
|
@ -30,12 +36,6 @@ server:
|
|||
# via the extraConfig setting.
|
||||
connect: true
|
||||
|
||||
# Datacenter is the name of the datacenter that the server should register
|
||||
# as. This shouldn't be changed once the Consul cluster is up and running
|
||||
# since Consul doesn't support an automatic way to change this value
|
||||
# currently: https://github.com/hashicorp/consul/issues/1858
|
||||
datacenter: dc1
|
||||
|
||||
# Resource requests, limits, etc. for the server cluster placement. This
|
||||
# should map directly to the value of the resources field for a PodSpec.
|
||||
# By default no direct resource request is made.
|
||||
|
|
Loading…
Reference in a new issue