Remove hardcoded values from values.yaml

[demo.git] / vnfs / DAaaS / collection / charts / prometheus / templates / servicemonitor.yaml

diff --git a/vnfs/DAaaS/collection/charts/prometheus/templates/servicemonitor.yaml b/vnfs/DAaaS/collection/charts/prometheus/templates/servicemonitor.yaml
index 47a911c..ea2b81b 100644 (file)
--- a/vnfs/DAaaS/collection/charts/prometheus/templates/servicemonitor.yaml
+++ b/vnfs/DAaaS/collection/charts/prometheus/templates/servicemonitor.yaml
@@ -7,6 +7,8 @@ items:
     kind: ServiceMonitor
     metadata:
       name: {{ .name }}
+      "helm.sh/hook": post-install
+      "helm.sh/hook-weight": "1"
       labels:
         app: {{ template "prometheus.name" $ }}-prometheus
 {{ include "prometheus.labels" $ | indent 8 }}
@@ -19,11 +21,10 @@ items:
     {{- if .jobLabel }}
       jobLabel: {{ .jobLabel }}
     {{- end }}
-    {{- if .namespaceSelector }}
       namespaceSelector:
-{{ toYaml .namespaceSelector | indent 8 }}
-    {{- end }}
+        matchNames:
+          - {{ $.Release.Namespace | quote }}
       selector:
-{{ toYaml .selector | indent 8 }}
+{{ toYaml .selector  | indent 8  }}  release: {{ $.Release.Name | quote }}
 {{- end }}
 {{- end }}