aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRajamohan Raj <rajamohan.raj@intel.com>2019-06-20 20:40:38 +0000
committerRajamohan Raj <rajamohan.raj@intel.com>2019-06-20 20:40:38 +0000
commit89d943c479f8c6af2ab45f79548aec335cac42e0 (patch)
tree69ce3f45fb9518731f27dd599042f9768c2bba54
parent5a3bd7342fc68f6ea79133225649182d224d43ea (diff)
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
-rw-r--r--vnfs/DAaaS/sample-apps/m3db_promql/templates/configmap_promql_app_env.yaml4
-rw-r--r--vnfs/DAaaS/sample-apps/m3db_promql/templates/deployment.yaml4
-rw-r--r--vnfs/DAaaS/sample-apps/m3db_promql/values.yaml1
3 files changed, 5 insertions, 4 deletions
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 1f54f341..7116a175 100644
--- 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 99a4e2ad..d82f18f8 100644
--- 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 7a669847..9920bccd 100644
--- 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)