From d2558a0be32aa1ab340cc22926036d96299e651f Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Sun, 2 Sep 2018 16:19:45 -0700 Subject: [PATCH] use globals.domain instead of common in case we refactor later --- templates/client-daemonset.yaml | 2 +- templates/server-statefulset.yaml | 2 +- values.yaml | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/templates/client-daemonset.yaml b/templates/client-daemonset.yaml index be50c9c..e363430 100644 --- a/templates/client-daemonset.yaml +++ b/templates/client-daemonset.yaml @@ -70,7 +70,7 @@ spec: {{- end }} {{- end }} {{- end }} - -domain={{ .Values.common.domain }} + -domain={{ .Values.global.domain }} volumeMounts: - name: data mountPath: /consul/data diff --git a/templates/server-statefulset.yaml b/templates/server-statefulset.yaml index 3ef66c4..9a0097e 100644 --- a/templates/server-statefulset.yaml +++ b/templates/server-statefulset.yaml @@ -77,7 +77,7 @@ spec: -config-dir=/consul/config \ -datacenter={{ .Values.server.datacenter }} \ -data-dir=/consul/data \ - -domain={{ .Values.common.domain }} \ + -domain={{ .Values.global.domain }} \ {{- if .Values.server.connect }} -hcl="connect { enabled = true }" \ {{- end }} diff --git a/values.yaml b/values.yaml index 1900e8e..dbc256e 100644 --- a/values.yaml +++ b/values.yaml @@ -11,7 +11,6 @@ global: # value. enabled: true -common: # Domain to register the Consul DNS server to listen for. domain: consul