Skip to content

Set default for nextcloud.containerPort in values.yaml and update YAML templates to use it everywhere #386

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jessebot merged 2 commits into from
Apr 29, 2023
Merged

Set default for nextcloud.containerPort in values.yaml and update YAML templates to use it everywhere #386

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ffa91ae
Change default nextcloud.containerPort to 80 in values.yaml; referenc…
Apr 29, 2023
3d492ca
bump chart version
Apr 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion charts/nextcloud/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
12 changes: 6 additions & 6 deletions charts/nextcloud/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand All @@ -97,7 +97,7 @@ spec:
readinessProbe:
httpGet:
path: /status.php
port: http
port: {{ .Values.nextcloud.containerPort }}
httpHeaders:
- name: Host
value: {{ .Values.nextcloud.host | quote }}
Expand All @@ -111,7 +111,7 @@ spec:
startupProbe:
httpGet:
path: /status.php
port: http
port: {{ .Values.nextcloud.containerPort }}
httpHeaders:
- name: Host
value: {{ .Values.nextcloud.host | quote }}
Expand Down Expand Up @@ -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:
Expand All @@ -191,7 +191,7 @@ spec:
readinessProbe:
httpGet:
path: /status.php
port: http
port: {{ .Values.nextcloud.containerPort }}
httpHeaders:
- name: Host
value: {{ .Values.nextcloud.host | quote }}
Expand Down
2 changes: 1 addition & 1 deletion charts/nextcloud/templates/service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" }}
Expand Down
2 changes: 1 addition & 1 deletion charts/nextcloud/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down