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 <[email protected]>
nextcloud · Nov 27, 2022 · 7e18ec1 · 7e18ec1
1 parent da174ec
commit 7e18ec1
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git 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
@@ -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
@@ -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" }}