From a215de8e0cafd940818b888e94806a387500abc4 Mon Sep 17 00:00:00 2001
From: JesseBot <jessebot@linux.com>
Date: Sat, 29 Apr 2023 10:44:34 +0200
Subject: [PATCH] Set default for nextcloud.containerPort in values.yaml and
 update YAML templates to use it everywhere (#386)

* Change default nextcloud.containerPort to 80 in values.yaml; reference nextcloud.containerPort in service and deployment templates

Signed-off-by: Jesse Hitch <jessebot@linux.com>

* bump chart version

Signed-off-by: Jesse Hitch <jessebot@linux.com>

---------

Signed-off-by: Jesse Hitch <jessebot@linux.com>
---
 charts/nextcloud/Chart.yaml                |  2 +-
 charts/nextcloud/templates/deployment.yaml | 12 ++++++------
 charts/nextcloud/templates/service.yaml    |  2 +-
 charts/nextcloud/values.yaml               |  2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/charts/nextcloud/Chart.yaml b/charts/nextcloud/Chart.yaml
index 52acfb58..183f77e3 100644
--- a/charts/nextcloud/Chart.yaml
+++ b/charts/nextcloud/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: nextcloud
-version: 3.5.11
+version: 3.5.12
 appVersion: 26.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 50d4992c..68a99692 100644
--- a/charts/nextcloud/templates/deployment.yaml
+++ b/charts/nextcloud/templates/deployment.yaml
@@ -76,14 +76,14 @@ spec:
         {{- if not .Values.nginx.enabled }}
         ports:
         - name: http
-          containerPort: {{ .Values.nextcloud.containerPort | default "80" }}
+          containerPort: {{ .Values.nextcloud.containerPort }}
           protocol: TCP
         {{- end }}
         {{- if and .Values.livenessProbe.enabled (not .Values.nginx.enabled) }}
         livenessProbe:
           httpGet:
             path: /status.php
-            port: http
+            port:  {{ .Values.nextcloud.containerPort }}
             httpHeaders:
             - name: Host
               value: {{ .Values.nextcloud.host | quote }}
@@ -97,7 +97,7 @@ spec:
         readinessProbe:
           httpGet:
             path: /status.php
-            port: http
+            port:  {{ .Values.nextcloud.containerPort }}
             httpHeaders:
             - name: Host
               value: {{ .Values.nextcloud.host | quote }}
@@ -111,7 +111,7 @@ spec:
         startupProbe:
           httpGet:
             path: /status.php
-            port: http
+            port:  {{ .Values.nextcloud.containerPort }}
             httpHeaders:
             - name: Host
               value: {{ .Values.nextcloud.host | quote }}
@@ -171,7 +171,7 @@ spec:
         imagePullPolicy: {{ .Values.nginx.image.pullPolicy }}
         ports:
         - name: http
-          containerPort: {{ .Values.nextcloud.containerPort | default "80" }}
+          containerPort: {{ .Values.nextcloud.containerPort }}
           protocol: TCP
         {{- if .Values.livenessProbe.enabled }}
         livenessProbe:
@@ -191,7 +191,7 @@ spec:
         readinessProbe:
           httpGet:
             path: /status.php
-            port: http
+            port: {{ .Values.nextcloud.containerPort }}
             httpHeaders:
             - name: Host
               value: {{ .Values.nextcloud.host | quote }}
diff --git a/charts/nextcloud/templates/service.yaml b/charts/nextcloud/templates/service.yaml
index c88ca51d..81a2b974 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 }}
     protocol: TCP
     name: http
     {{- if eq .Values.service.type "NodePort" }}
diff --git a/charts/nextcloud/values.yaml b/charts/nextcloud/values.yaml
index 4a605328..e97ecc46 100644
--- a/charts/nextcloud/values.yaml
+++ b/charts/nextcloud/values.yaml
@@ -85,7 +85,7 @@ nextcloud:
     # smtpPasswordKey: smtp-password
   update: 0
   # If web server is not binding default port, you can define it
-  # containerPort: 8080
+  containerPort: 80
   datadir: /var/www/html/data
   persistence:
     subPath: