Fix promxy svc url template in mothership grafana

K0rdent · Dec 6, 2024 · 7cbff53 · 7cbff53
1 parent 864af63
commit 7cbff53
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/charts/motel-mothership/Chart.yaml b/charts/motel-mothership/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: motel-mothership
 description: A Helm chart that deploys Grafana, Promxy, and VictoriaMetrics.
-version: 0.1.3
+version: 0.1.4
 appVersion: "1.0"
 dependencies:
   - name: grafana-operator

diff --git a/charts/motel-mothership/templates/grafana/metrics-datasource.yaml b/charts/motel-mothership/templates/grafana/metrics-datasource.yaml
@@ -12,7 +12,7 @@ spec:
     name: promxy
     type: prometheus
     access: proxy
-    url: {{ .Values.grafana.promxyDatasourceUrl | quote | default (printf "http://%s-promxy:8082" .Release.Name) }}
+    url: {{ .Values.grafana.promxyDatasourceUrl | default (printf "http://%s-promxy:8082" .Release.Name) | quote }}
     isDefault: true
     jsonData:
       tlsSkipVerify: true

diff --git a/charts/motel-mothership/templates/promxy/service.yaml b/charts/motel-mothership/templates/promxy/service.yaml
@@ -11,7 +11,7 @@ metadata:
     {{- if .Values.promxy.extraLabels}}
     {{ toYaml .Values.promxy.extraLabels | nindent 4 }}
     {{- end}}
-  name: {{ template "chart.fullname" . }}-promxy
+  name: {{ .Release.Name }}-promxy
   namespace: {{ .Release.Namespace }}
 spec:
 {{- if .Values.promxy.service.clusterIP }}