fix env merging

charts/qbittorrent/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: qbittorrent
-version: 0.0.2
+version: 0.0.6
 description: Chart for qBittorrent
 keywords:
   - downloads

charts/qbittorrent/templates/deployment.yaml

@@ -49,7 +49,7 @@ spec:
           image: "{{.Values.gluetun.image.repository}}:{{.Values.gluetun.image.tag}}"
           imagePullPolicy: {{ .Values.gluetun.image.pullPolicy }}
           env:
-          {{- with (concat .Values.global.env .Values.server.env) }}
+          {{- with (concat .Values.global.env .Values.gluetun.env) }}
             {{- toYaml . | nindent 12 }}
           {{- end }}
           ports:
@@ -60,7 +60,7 @@ spec:
               containerPort: {{ .Values.server.service.http.port }}
               protocol: TCP
             - name: metrics
-              containerPort: {{ .Values.metrics.exporter.env.port }}
+              containerPort: 9022
               protocol: TCP
           securityContext:
             {{- toYaml .Values.gluetun.securityContext | nindent 12 }}
@@ -99,13 +99,15 @@ spec:
           image: "{{ .Values.metrics.exporter.image.repository }}:{{.Values.metrics.exporter.image.tag }}"
           imagePullPolicy: {{ .Values.metrics.exporter.image.pullPolicy }}
           env:
-          {{- with (concat .Values.global.env .Values.server.env) }}
+          {{- with (concat .Values.global.env .Values.metrics.exporter.env) }}
             {{- toYaml . | nindent 12 }}
           {{- end }}
             - name: QBITTORRENT_HOST
               value: "http://localhost"
             - name: QBITTORRENT_PORT
               value: "{{ .Values.server.service.http.port }}"
+            - name: EXPORTER_PORT
+              value: "9022"
         {{- end }}
 
       volumes:

charts/qbittorrent/templates/service-monitor.yaml

@@ -1,4 +1,4 @@
-{{- if and .Values.metrics.enabled .Values.server.metrics.serviceMonitor.enabled }}
+{{- if and .Values.metrics.enabled .Values.metrics.serviceMonitor.enabled }}
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:

charts/qbittorrent/values.yaml

@@ -80,7 +80,5 @@ metrics:
         value: admin
       - name: QBITTORRENT_PASS
         value: ""
-      - name: EXPORTER_PORT
-        value: 9022
       - name: EXPORTER_LOG_LEVEL
         value: INFO