diff options
| author |   Sylvain Desbureaux <sylvain.desbureaux@orange.com> | 2020-03-26 15:49:23 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2020-03-26 15:49:23 +0000 |
| commit | 3adab05a21fe91d254de524d67fa754db93cd2b9 (patch) | |
| tree | bd5d275595b87881f83bb6509ab4482a66caf230 /kubernetes/dmaap/components/message-router/charts/message-router-zookeeper | |
| parent | 96d790d503ce3b3553bebd775f06de431444f528 (diff) | |
| parent | a386565083bb8aa03c43dbd8dc9cf124d2dd76d1 (diff) | |
Merge "update certs fix the issues while toggling the aaf and prometheus flags add Prometheus monitoring to message router"
Diffstat (limited to 'kubernetes/dmaap/components/message-router/charts/message-router-zookeeper')
2 files changed, 2 insertions, 2 deletions
diff --git a/kubernetes/dmaap/components/message-router/charts/message-router-zookeeper/templates/configmap.yaml b/kubernetes/dmaap/components/message-router/charts/message-router-zookeeper/templates/configmap.yaml index 907111d898..50091bd387 100644 --- a/kubernetes/dmaap/components/message-router/charts/message-router-zookeeper/templates/configmap.yaml +++ b/kubernetes/dmaap/components/message-router/charts/message-router-zookeeper/templates/configmap.yaml @@ -24,7 +24,7 @@ metadata: release: {{ include "common.release" . }} heritage: {{ .Release.Service }} data: -{{ (.Files.Glob "resources/config/jmx-zookeeper-prometheus.yml").AsConfig | indent 2 }} +{{ tpl (.Files.Glob "resources/config/jmx-zookeeper-prometheus.yml").AsConfig . | indent 2 }} --- {{ end }} diff --git a/kubernetes/dmaap/components/message-router/charts/message-router-zookeeper/templates/statefulset.yaml b/kubernetes/dmaap/components/message-router/charts/message-router-zookeeper/templates/statefulset.yaml index 0ed5d9715d..30f4abd588 100644 --- a/kubernetes/dmaap/components/message-router/charts/message-router-zookeeper/templates/statefulset.yaml +++ b/kubernetes/dmaap/components/message-router/charts/message-router-zookeeper/templates/statefulset.yaml @@ -210,7 +210,7 @@ spec: name: {{ include "common.fullname" . }}-jaas-configmap {{- if .Values.prometheus.jmx.enabled }} - name: jmx-config - configMap: + configMap: name: {{ include "common.fullname" . }}-prometheus-configmap {{- end }} {{ if not .Values.persistence.enabled }} |