From 316beee00a155f003364df610448c4cc28076455 Mon Sep 17 00:00:00 2001
From: Stavros Kois <47820033+stavros-k@users.noreply.github.com>
Date: Fri, 16 Dec 2022 23:28:10 +0200
Subject: [PATCH] chore(qbittorrent): Use port for containerPort as the listen
 port is configured via CM, and default torrentudd port to torrent (#5443)

---
 charts/stable/qbittorrent/Chart.yaml            | 2 +-
 charts/stable/qbittorrent/questions.yaml        | 2 +-
 charts/stable/qbittorrent/templates/common.yaml | 9 +++++++--
 charts/stable/qbittorrent/values.yaml           | 2 --
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/charts/stable/qbittorrent/Chart.yaml b/charts/stable/qbittorrent/Chart.yaml
index 6a84b3d074f..2c3a93b21d6 100644
--- a/charts/stable/qbittorrent/Chart.yaml
+++ b/charts/stable/qbittorrent/Chart.yaml
@@ -21,7 +21,7 @@ sources:
   - https://github.com/truecharts/charts/tree/master/charts/stable/qbittorrent
   - https://github.com/qbittorrent/qBittorrent
 type: application
-version: 13.0.5
+version: 13.0.6
 annotations:
   truecharts.org/catagories: |
     - media
diff --git a/charts/stable/qbittorrent/questions.yaml b/charts/stable/qbittorrent/questions.yaml
index 8517c7af4f8..a2f19868c8a 100644
--- a/charts/stable/qbittorrent/questions.yaml
+++ b/charts/stable/qbittorrent/questions.yaml
@@ -71,7 +71,7 @@ questions:
                         attrs:
                           - variable: port
                             label: "Port"
-                            description: "This port exposes the container port on the service"
+                            description: "Does not have any effect. It defaults to the same port as torrent service"
                             schema:
                               type: int
                               default: 6881
diff --git a/charts/stable/qbittorrent/templates/common.yaml b/charts/stable/qbittorrent/templates/common.yaml
index a6f2d0e33f8..37624174de7 100644
--- a/charts/stable/qbittorrent/templates/common.yaml
+++ b/charts/stable/qbittorrent/templates/common.yaml
@@ -1,6 +1,11 @@
-{{/* Render the templates */}}
-{{ include "tc.common.loader.all" . }}
+{{/* Make sure all variables are set properly */}}
+{{- include "tc.common.loader.init" . }}
 
+{{/* Set it to the same port as "torrent" service/port */}}
+{{- $_ := set $.Values.service.torrentudp.ports.torrentudp "port" (int .Values.service.torrent.ports.torrent.port) -}}
 
 {{/* Render the configmap */}}
 {{ include "qbittorrent.configmap" . }}
+
+{{/* Render the templates */}}
+{{ include "tc.common.loader.apply" . }}
diff --git a/charts/stable/qbittorrent/values.yaml b/charts/stable/qbittorrent/values.yaml
index 7a8c7a8d734..58e6f1ff44c 100644
--- a/charts/stable/qbittorrent/values.yaml
+++ b/charts/stable/qbittorrent/values.yaml
@@ -18,14 +18,12 @@ service:
       torrent:
         enabled: true
         port: 6881
-        targetPort: 6881
   torrentudp:
     enabled: true
     ports:
       torrentudp:
         enabled: true
         port: 6881
-        targetPort: 6881
         protocol: UDP
 
 persistence: