hardcode the exporter port

charts/qbittorrent/Chart.yaml

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

charts/qbittorrent/templates/deployment.yaml

@@ -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 }}
@@ -106,6 +106,8 @@ spec:
               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

charts/tdarr/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: tdarr
-version: 0.0.1
+version: 0.0.3
 description: Chart for Tdarr V2
 keywords:
   - video

charts/tdarr/templates/deployment.yaml

@@ -132,10 +132,6 @@ spec:
         - name: tdarr-node
           image: "{{ .Values.node.image.repository }}:{{ .Values.node.image.tag }}"
           imagePullPolicy: {{ .Values.node.image.pullPolicy }}
-          ports:
-            - name: api
-              containerPort: {{ .Values.node.service.api.port }}
-              protocol: TCP
           env:
           {{- with (concat .Values.global.env .Values.node.env) }}
             {{- toYaml . | nindent 12 }}
@@ -146,36 +142,17 @@ spec:
               valueFrom:
                 fieldRef:
                   fieldPath: spec.nodeName
+            - name: serverIP
+              value: tdarr-server-api
             - name: serverPort
-              value: "{{ .Values.node.service.api.port }}"
+              value: "{{ .Values.server.service.api.port }}"
           volumeMounts:
             - name: tdarr-node-cache
               mountPath: /tcache
             - name: media-storage
-              mountPath: {{ .Values.global.persistence.media.mountPath }}              
+              mountPath: {{ .Values.global.persistence.media.mountPath }}
           resources:
             {{- toYaml .Values.node.resources | nindent 12 }}
-          livenessProbe:
-            tcpSocket:
-              port: {{ .Values.node.service.api.port }}
-            initialDelaySeconds: 0
-            failureThreshold: 3
-            timeoutSeconds: 1
-            periodSeconds: 10
-          readinessProbe:
-            tcpSocket:
-              port: {{ .Values.node.service.api.port }}
-            initialDelaySeconds: 0
-            failureThreshold: 3
-            timeoutSeconds: 1
-            periodSeconds: 10
-          startupProbe:
-            tcpSocket:
-              port: {{ .Values.node.service.api.port }}
-            initialDelaySeconds: 0
-            failureThreshold: 30
-            timeoutSeconds: 1
-            periodSeconds: 5      
       volumes:
         - name: tdarr-node-cache
           emptyDir:

charts/tdarr/values.yaml

@@ -69,9 +69,6 @@ node:
     limits:
       cpu: 1000m
       memory: 2Gi
-  service:
-    api:
-      port: 8266
   persistence:
     cache:
       size: 5Gi