Merge pull request #23 from homeylab/fix_args_nut

fix args for runtime flags for nut
homeylab · Dec 5, 2023 · d917e36 · d917e36
2 parents 658483a + c9806d0
commit d917e36
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/charts/nut-exporter/Chart.yaml b/charts/nut-exporter/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.0.3
+version: 0.0.5
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

diff --git a/charts/nut-exporter/templates/deployment.yaml b/charts/nut-exporter/templates/deployment.yaml
@@ -39,7 +39,7 @@ spec:
             {{- toYaml .Values.securityContext | nindent 12 }}
           image: "{{ .Values.image.repository }}/{{ .Values.image.name }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
-        {{- if .Values.extraRunFlags }}
+        {{- if or .Values.extraRunFlags .Values.webconfig_file }}
           args:
           {{- range $key, $value := .Values.extraRunFlags }}
             {{- if $value }}
@@ -82,23 +82,23 @@ spec:
           #     port: http
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
-          {{- with .Values.volumeMounts }}
           volumeMounts:
+          {{- with .Values.volumeMounts }}
             {{- toYaml . | nindent 12 }}
+          {{- end }}
           {{- if .Values.webconfig_file }}
           - mountPath: /webconfig.yml
             name: webconfig
             subPath: webconfig.yml
           {{- end }}
-          {{- end }}
-      {{- with .Values.volumes }}
       volumes:
+      {{- with .Values.volumes }}
         {{- toYaml . | nindent 8 }}
+      {{- end }}
       {{- if .Values.webconfig_file }}
       - name: webconfig
-            configMap:
-              name: {{ include "nut-exporter.fullname" . }}
-      {{- end }}
+        configMap:
+          name: {{ include "nut-exporter.fullname" . }}-webconfig
       {{- end }}
       {{- with .Values.nodeSelector }}
       nodeSelector:

diff --git a/charts/nut-exporter/templates/webconfig.yaml b/charts/nut-exporter/templates/webconfig.yaml
@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: {{ include "nut-exporter.fullname" . }}
+  name: {{ include "nut-exporter.fullname" . }}-webconfig
 data:
-  webconfig_file: {{- .Values.webconfig_file | toYaml | indent 1 }}
+  webconfig_file.yml: {{- .Values.webconfig_file | toYaml | indent 1 }}
 {{- end }}