fix: helm chart syntax error and secrets handling

phsmith · Nov 20, 2024 · 8d9bc44 · 8d9bc44
1 parent 4888ec3
commit 8d9bc44
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Changed
+
+- Bump chart version (`0.3.1`)
+
+### Fixed
+
+- Helm chart error when using `serviceMonitor.name` (formatting error)
+- Remove default `RUNDECK_TOKEN` env variable (default value overrules value from secret if set)
+
 ## [2.8.3] - 2024-10-16
 ### Fixed
 

diff --git a/charts/Chart.yaml b/charts/Chart.yaml
@@ -11,4 +11,4 @@ maintainers:
   name: Phillipe Smith
 name: rundeck-exporter
 type: application
-version: 0.3.0
+version: 0.3.1
diff --git a/charts/templates/serviceMonitor.yaml b/charts/templates/serviceMonitor.yaml
@@ -3,16 +3,8 @@
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
-  {{- if .Values.serviceMonitor.name -}}
-  name: {{ .Values.serviceMonitor.name }}
-  {{- else }}
-  name: rundeck-exporter-monitor
-  {{- end }}
-  {{- if .Values.serviceMonitor.namespace -}}
-  namespace: {{ .Values.serviceMonitor.namespace }}
-  {{- else }}
-  namespace: {{ .Release.Namespace }}
-  {{- end }}
+  name: {{ .Values.serviceMonitor.name | default "rundeck-exporter-monitor" }}
+  namespace: {{ .Values.serviceMonitor.namespace | default .Release.Namespace }}
   labels:
     {{- include "rundeck-exporter.selectorLabels" . | nindent 4 }}
 spec:

diff --git a/charts/values.yaml b/charts/values.yaml
@@ -10,7 +10,7 @@ env:
   RUNDECK_EXPORTER_HOST: 0.0.0.0
   RUNDECK_EXPORTER_PORT: 9620
   RUNDECK_URL: "http://localhost:4440"
-  RUNDECK_TOKEN: "exporter_auth_token"
+  # RUNDECK_TOKEN: "exporter_auth_token"
   # RUNDECK_USERNAME: "your-rundeck-username"
   # RUNDECK_USERPASSWORD: "your-rundeck-password"
   RUNDECK_API_VERSION: 40