Paramterize the configMap name

Paramterize the configmap name in the helm chart of
sample-promql-query-app.

Issue-ID: ONAPARC-508
Signed-off-by: Rajamohan Raj <rajamohan.raj@intel.com>
Change-Id: I8ec7c6128fbc0577c73abacf1c8496eaf912fec7

diff --git a/vnfs/DAaaS/sample-apps/m3db_promql/templates/configmap_promql_app_env.yaml b/vnfs/DAaaS/sample-apps/m3db_promql/templates/configmap_promql_app_env.yaml
index 1f54f34..7116a17 100644 (file)
--- a/vnfs/DAaaS/sample-apps/m3db_promql/templates/configmap_promql_app_env.yaml
+++ b/vnfs/DAaaS/sample-apps/m3db_promql/templates/configmap_promql_app_env.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: configmap_promql_app_env
+  name: {{ if .Values.prometheus.configMapName }}{{ .Values.prometheus.configMapName }}{{ else }}{{ template "promql_query_app.fullname" . }}{{ end }}
 data:
-  DATA_ENDPOINT: {{ .Values.prometheus.serverURL }}
\ No newline at end of file
+  prometheus_endpoint: {{ .Values.prometheus.serverURL }}
\ No newline at end of file

diff --git a/vnfs/DAaaS/sample-apps/m3db_promql/templates/deployment.yaml b/vnfs/DAaaS/sample-apps/m3db_promql/templates/deployment.yaml
index 99a4e2a..d82f18f 100644 (file)
--- a/vnfs/DAaaS/sample-apps/m3db_promql/templates/deployment.yaml
+++ b/vnfs/DAaaS/sample-apps/m3db_promql/templates/deployment.yaml
@@ -46,8 +46,8 @@ spec:
             - name: DATA_ENDPOINT
               valueFrom:
                 configMapKeyRef:
-                  name: configmap_promql_app_env
-                  key: DATA_ENDPOINT
+                  name: {{ if .Values.prometheus.configMapName }}{{ .Values.prometheus.configMapName }}{{ else }}{{ template "promql_query_app.fullname" . }}{{ end }}
+                  key: prometheus_endpoint
             - name: AWS_ACCESS_KEY_ID
               valueFrom:
                 secretKeyRef:

diff --git a/vnfs/DAaaS/sample-apps/m3db_promql/values.yaml b/vnfs/DAaaS/sample-apps/m3db_promql/values.yaml
index 7a66984..9920bcc 100644 (file)
--- a/vnfs/DAaaS/sample-apps/m3db_promql/values.yaml
+++ b/vnfs/DAaaS/sample-apps/m3db_promql/values.yaml
@@ -15,6 +15,7 @@ fullnameOverride: ""
 
 prometheus:
   serverURL: http://172.25.103.1:30090
+  configMapName: ""
 
 ## Model repository information (Minio)
 ## Model repository information (Minio)