feat: allow changing of prom release name

jenkins-x-charts · Dec 24, 2020 · a0f2c86 · a0f2c86
1 parent 58d6faf
commit a0f2c86
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -18,6 +18,8 @@ download:
 	rm -rf charts/istio-control
 	cp -r chartTemplates/ charts
 	mv downloads/istio/samples/addons/extras/prometheus-operator.yaml charts/istio-prometheus/templates
+	sed -i .bak 's/    release: istio/    release: {{ .Values.prometheusReleaseName }}/g' charts/istio-prometheus/templates/prometheus-operator.yaml
+	rm charts/istio-prometheus/templates/prometheus-operator.yaml.bak
 	curl -s https://grafana.com/api/dashboards/$(WORKLOAD_DASHBOARD)/revisions/$(DASHBOARD_REVISION)/download > charts/istio-dashboards/dashboards/istio-workload-dashboard.json
 	curl -s https://grafana.com/api/dashboards/$(SERVICE_DASHBOARD)/revisions/$(DASHBOARD_REVISION)/download > charts/istio-dashboards/dashboards/istio-service-dashboard.json
 	curl -s https://grafana.com/api/dashboards/$(MESH_DASHBOARD)/revisions/$(DASHBOARD_REVISION)/download > charts/istio-dashboards/dashboards/istio-mesh-dashboard.json

diff --git a/chartTemplates/istio-prometheus/values.yaml b/chartTemplates/istio-prometheus/values.yaml
@@ -0,0 +1 @@
+prometheusReleaseName: kube-prometheus-stack
diff --git a/charts/istio-prometheus/templates/prometheus-operator.yaml b/charts/istio-prometheus/templates/prometheus-operator.yaml
@@ -5,7 +5,7 @@ metadata:
   namespace: istio-system
   labels:
     monitoring: istio-proxies
-    release: istio
+    release: {{ .Values.prometheusReleaseName }}
 spec:
   selector:
     matchExpressions:
@@ -43,7 +43,7 @@ metadata:
   namespace: istio-system
   labels:
     monitoring: istio-components
-    release: istio
+    release: {{ .Values.prometheusReleaseName }}
 spec:
   jobLabel: istio
   targetLabels: [app]

diff --git a/charts/istio-prometheus/values.yaml b/charts/istio-prometheus/values.yaml
@@ -0,0 +1 @@
+prometheusReleaseName: kube-prometheus-stack