From 7e18ec167b1f95883be0e22d9a44aa8a84b73a50 Mon Sep 17 00:00:00 2001
From: Rick Elrod <rick@elrod.me>
Date: Sat, 26 Nov 2022 23:43:18 -0600
Subject: [PATCH] Use containerPort in Service and probe checks

- For non-root deployments (such as required in OpenShift), this makes
  the given containerPort be used instead of hardcoding to "http" in
  several places.

Signed-off-by: Rick Elrod <rick@elrod.me>
---
 charts/nextcloud/Chart.yaml                |  2 +-
 charts/nextcloud/templates/deployment.yaml | 10 +++++-----
 charts/nextcloud/templates/service.yaml    |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/charts/nextcloud/Chart.yaml b/charts/nextcloud/Chart.yaml
index cfe7c16c..7e87c722 100644
--- a/charts/nextcloud/Chart.yaml
+++ b/charts/nextcloud/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: nextcloud
-version: 3.3.3
+version: 3.3.4
 appVersion: 25.0.1
 description: A file sharing server that puts the control and security of your own data back into your hands.
 keywords:
diff --git a/charts/nextcloud/templates/deployment.yaml b/charts/nextcloud/templates/deployment.yaml
index f5d6b65a..c5bb2fd9 100644
--- a/charts/nextcloud/templates/deployment.yaml
+++ b/charts/nextcloud/templates/deployment.yaml
@@ -83,7 +83,7 @@ spec:
         livenessProbe:
           httpGet:
             path: /status.php
-            port: http
+            port: {{ .Values.nextcloud.containerPort | default "http" }}
             httpHeaders:
             - name: Host
               value: {{ .Values.nextcloud.host | quote }}
@@ -97,7 +97,7 @@ spec:
         readinessProbe:
           httpGet:
             path: /status.php
-            port: http
+            port: {{ .Values.nextcloud.containerPort | default "http" }}
             httpHeaders:
             - name: Host
               value: {{ .Values.nextcloud.host | quote }}
@@ -111,7 +111,7 @@ spec:
         startupProbe:
           httpGet:
             path: /status.php
-            port: http
+            port: {{ .Values.nextcloud.containerPort | default "http" }}
             httpHeaders:
             - name: Host
               value: {{ .Values.nextcloud.host | quote }}
@@ -165,7 +165,7 @@ spec:
         livenessProbe:
           httpGet:
             path: /status.php
-            port: http
+            port: {{ .Values.nextcloud.containerPort | default "http" }}
             httpHeaders:
             - name: Host
               value: {{ .Values.nextcloud.host | quote }}
@@ -179,7 +179,7 @@ spec:
         readinessProbe:
           httpGet:
             path: /status.php
-            port: http
+            port: {{ .Values.nextcloud.containerPort | default "http" }}
             httpHeaders:
             - name: Host
               value: {{ .Values.nextcloud.host | quote }}
diff --git a/charts/nextcloud/templates/service.yaml b/charts/nextcloud/templates/service.yaml
index c88ca51d..9132ce34 100644
--- a/charts/nextcloud/templates/service.yaml
+++ b/charts/nextcloud/templates/service.yaml
@@ -15,7 +15,7 @@ spec:
   {{- end }}
   ports:
   - port: {{ .Values.service.port }}
-    targetPort: http
+    targetPort: {{ .Values.nextcloud.containerPort | default "http" }}
     protocol: TCP
     name: http
     {{- if eq .Values.service.type "NodePort" }}