aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSylvain Desbureaux <sylvain.desbureaux@orange.com>2021-12-06 15:33:44 +0100
committerSylvain Desbureaux <sylvain.desbureaux@orange.com>2021-12-06 15:33:44 +0100
commitc6448eb53a0ca921d0a061f02b10d225a76af574 (patch)
treeb34b3ecd1796f273a0c3fabcff8aaccdf5d155fe
parent78a9a4c9aa06ade02f382ba55b7218d7e574f747 (diff)
[HOLMES] Use direct name for consul
Holmes used to use external service name created by dcae bootstrap. As it's not created anymore by default, we need to give the right value for it. Issue-ID: DCAEGEN2-2968 Issue-ID: DCAEGEN2-2958 Issue-ID: DCAEGEN2-2983 Signed-off-by: Sylvain Desbureaux <sylvain.desbureaux@orange.com> Change-Id: I07ca710c78401c8c4bfafda5673a50f7831bebf7
-rw-r--r--kubernetes/holmes/components/holmes-engine-mgmt/templates/deployment.yaml3
-rw-r--r--kubernetes/holmes/components/holmes-rule-mgmt/templates/deployment.yaml3
2 files changed, 6 insertions, 0 deletions
diff --git a/kubernetes/holmes/components/holmes-engine-mgmt/templates/deployment.yaml b/kubernetes/holmes/components/holmes-engine-mgmt/templates/deployment.yaml
index 45c268c6b6..b625f6d72e 100644
--- a/kubernetes/holmes/components/holmes-engine-mgmt/templates/deployment.yaml
+++ b/kubernetes/holmes/components/holmes-engine-mgmt/templates/deployment.yaml
@@ -30,6 +30,9 @@ spec:
- name: init-consul
image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.consulLoaderImage }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+ env:
+ - name: CONSUL_HOST
+ value: {{ .Values.consulHost | default "consul-server-ui" }}.{{ include "common.namespace" . }}
args:
- --key
- holmes-engine-mgmt|/hemconfig/cfy.json
diff --git a/kubernetes/holmes/components/holmes-rule-mgmt/templates/deployment.yaml b/kubernetes/holmes/components/holmes-rule-mgmt/templates/deployment.yaml
index d757b75d68..19ccbc0cdc 100644
--- a/kubernetes/holmes/components/holmes-rule-mgmt/templates/deployment.yaml
+++ b/kubernetes/holmes/components/holmes-rule-mgmt/templates/deployment.yaml
@@ -30,6 +30,9 @@ spec:
- name: init-consul
image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.consulLoaderImage }}
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+ env:
+ - name: CONSUL_HOST
+ value: {{ .Values.consulHost | default "consul-server-ui" }}.{{ include "common.namespace" . }}
args:
- --key
- holmes-rule-mgmt|/hrmconfigs/cfy.json