From 60d5c614baed865bd8bd655dbae40f75e93467ca Mon Sep 17 00:00:00 2001
From: Stavros Kois <47820033+stavros-k@users.noreply.github.com>
Date: Tue, 9 Apr 2024 11:03:25 +0300
Subject: [PATCH] qbit: allow for https probe option (#2360)

* qbit: allow for https probe option

* fmt

* fix upgrade

* whoops
---
 library/ix-dev/community/qbittorrent/Chart.yaml          | 2 +-
 library/ix-dev/community/qbittorrent/questions.yaml      | 9 +++++++++
 .../community/qbittorrent/templates/_qbittorrent.tpl     | 9 ++++++---
 library/ix-dev/community/qbittorrent/values.yaml         | 1 +
 4 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/library/ix-dev/community/qbittorrent/Chart.yaml b/library/ix-dev/community/qbittorrent/Chart.yaml
index d54478acb5..42207da04a 100644
--- a/library/ix-dev/community/qbittorrent/Chart.yaml
+++ b/library/ix-dev/community/qbittorrent/Chart.yaml
@@ -4,7 +4,7 @@ description: The qBittorrent project aims to provide an open-source software alt
 annotations:
   title: qBittorrent
 type: application
-version: 1.2.10
+version: 1.2.11
 apiVersion: v2
 appVersion: 4.6.4
 kubeVersion: '>=1.16.0-0'
diff --git a/library/ix-dev/community/qbittorrent/questions.yaml b/library/ix-dev/community/qbittorrent/questions.yaml
index b452e14970..70dadd47c0 100644
--- a/library/ix-dev/community/qbittorrent/questions.yaml
+++ b/library/ix-dev/community/qbittorrent/questions.yaml
@@ -97,6 +97,15 @@ questions:
             min: 9000
             max: 65535
             required: true
+        - variable: useHttpsProbe
+          label: Use HTTPS Probe
+          description: |
+            Use HTTPS probe for the qBittorrent Web UI. </br>
+            This will ONLY affect the probes, only enable this if you
+            configured HTTPS in the qBittorrent Web UI.
+          schema:
+            type: boolean
+            default: false
         - variable: hostNetwork
           label: Host Network
           description: |
diff --git a/library/ix-dev/community/qbittorrent/templates/_qbittorrent.tpl b/library/ix-dev/community/qbittorrent/templates/_qbittorrent.tpl
index 7dd2987bed..0e6cf6bcd2 100644
--- a/library/ix-dev/community/qbittorrent/templates/_qbittorrent.tpl
+++ b/library/ix-dev/community/qbittorrent/templates/_qbittorrent.tpl
@@ -25,19 +25,22 @@ workload:
             - configMapRef:
                 name: qbit-config
           probes:
+            {{- if not (hasKey .Values.qbitNetwork "useHttpsProbe") -}}
+              {{- $_ := set .Values.qbitNetwork "useHttpsProbe" false -}}
+            {{- end }}
             liveness:
               enabled: true
-              type: http
+              type: {{ ternary "https" "http" .Values.qbitNetwork.useHttpsProbe }}
               port: "{{ .Values.qbitNetwork.webPort }}"
               path: /
             readiness:
               enabled: true
-              type: http
+              type: {{ ternary "https" "http" .Values.qbitNetwork.useHttpsProbe }}
               port: "{{ .Values.qbitNetwork.webPort }}"
               path: /
             startup:
               enabled: true
-              type: http
+              type: {{ ternary "https" "http" .Values.qbitNetwork.useHttpsProbe }}
               port: "{{ .Values.qbitNetwork.webPort }}"
               path: /
       initContainers:
diff --git a/library/ix-dev/community/qbittorrent/values.yaml b/library/ix-dev/community/qbittorrent/values.yaml
index 5404c50941..bdbd3ff554 100644
--- a/library/ix-dev/community/qbittorrent/values.yaml
+++ b/library/ix-dev/community/qbittorrent/values.yaml
@@ -14,6 +14,7 @@ qbitConfig:
 qbitNetwork:
   webPort: 30024
   btPort: 50413
+  useHttpsProbe: false
   hostNetwork: false
 
 qbitRunAs: