Skip to content

Feature: client push #551

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

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Feature: client push #551

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9d79183
Add client_push configuration #109
AndreKoepke Apr 2, 2024
df47ff8
Merge branch 'main' into feature/client_push
jessebot Jul 22, 2024
a2627db
Merge branch 'main' into feature/client_push
jessebot Jul 22, 2024
fcf5f5b
Merge branch 'main' into feature/client_push
jessebot Jul 24, 2024
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
45 changes: 32 additions & 13 deletions charts/nextcloud/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,10 +87,10 @@ spec:
livenessProbe:
httpGet:
path: /status.php
port: {{ $.Values.nextcloud.containerPort }}
port: {{ $.Values.nextcloud.containerPort }}
httpHeaders:
- name: Host
value: {{ $.Values.nextcloud.host | quote }}
- name: Host
value: {{ $.Values.nextcloud.host | quote }}
initialDelaySeconds: {{ .initialDelaySeconds }}
periodSeconds: {{ .periodSeconds }}
timeoutSeconds: {{ .timeoutSeconds }}
Expand All @@ -103,10 +103,10 @@ spec:
readinessProbe:
httpGet:
path: /status.php
port: {{ $.Values.nextcloud.containerPort }}
port: {{ $.Values.nextcloud.containerPort }}
httpHeaders:
- name: Host
value: {{ $.Values.nextcloud.host | quote }}
- name: Host
value: {{ $.Values.nextcloud.host | quote }}
initialDelaySeconds: {{ .initialDelaySeconds }}
periodSeconds: {{ .periodSeconds }}
timeoutSeconds: {{ .timeoutSeconds }}
Expand All @@ -119,10 +119,10 @@ spec:
startupProbe:
httpGet:
path: /status.php
port: {{ $.Values.nextcloud.containerPort }}
port: {{ $.Values.nextcloud.containerPort }}
httpHeaders:
- name: Host
value: {{ $.Values.nextcloud.host | quote }}
- name: Host
value: {{ $.Values.nextcloud.host | quote }}
initialDelaySeconds: {{ .initialDelaySeconds }}
periodSeconds: {{ .periodSeconds }}
timeoutSeconds: {{ .timeoutSeconds }}
Expand Down Expand Up @@ -164,7 +164,7 @@ spec:
livenessProbe:
httpGet:
path: /status.php
port: {{ $.Values.nextcloud.containerPort }}
port: {{ $.Values.nextcloud.containerPort }}
httpHeaders:
- name: Host
value: {{ $.Values.nextcloud.host | quote }}
Expand All @@ -180,7 +180,7 @@ spec:
readinessProbe:
httpGet:
path: /status.php
port: {{ $.Values.nextcloud.containerPort }}
port: {{ $.Values.nextcloud.containerPort }}
httpHeaders:
- name: Host
value: {{ $.Values.nextcloud.host | quote }}
Expand All @@ -196,7 +196,7 @@ spec:
startupProbe:
httpGet:
path: /status.php
port: {{ $.Values.nextcloud.containerPort }}
port: {{ $.Values.nextcloud.containerPort }}
httpHeaders:
- name: Host
value: {{ $.Values.nextcloud.host | quote }}
Expand Down Expand Up @@ -280,6 +280,25 @@ spec:
volumeMounts:
{{- include "nextcloud.volumeMounts" . | trim | nindent 12 }}
{{- end }}{{/* end-if cronjob.enabled */}}
{{ if .Values.clientPush.enabled }}
- name: {{ .Chart.Name }}-client-push
image: {{ include "nextcloud.image" . }}
imagePullPolicy: {{ .Values.image.pullPolicy }}
command:
- custom_apps/notify_push/bin/x86_64/notify_push
Copy link
Author

@AndreKoepke AndreKoepke Apr 2, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hard-coded x86_64

args:
- config/config.php
env:
- name: NEXTCLOUD_URL
value: http://localhost:80
volumeMounts:
- name: nextcloud-main
mountPath: /var/www/html/custom_apps
subPath: {{ ternary "custom_apps" (printf "%s/custom_apps" .Values.nextcloud.persistence.subPath) (empty .Values.nextcloud.persistence.subPath) }}
- name: nextcloud-main
mountPath: /var/www/html/config
subPath: {{ ternary "config" (printf "%s/config" .Values.nextcloud.persistence.subPath) (empty .Values.nextcloud.persistence.subPath) }}
{{- end }}{{/* end-if clientPush.enabled */}}
{{- with .Values.nextcloud.extraSidecarContainers }}
{{- toYaml . | nindent 8 }}
{{- end }}
Expand Down Expand Up @@ -349,7 +368,7 @@ spec:
persistentVolumeClaim:
claimName: {{ if .Values.persistence.existingClaim }}{{ .Values.persistence.existingClaim }}{{- else }}{{ template "nextcloud.fullname" . }}-nextcloud{{- end }}
{{- else }}
emptyDir: {}
emptyDir: { }
{{- end }}
{{- if and .Values.persistence.nextcloudData.enabled .Values.persistence.enabled }}
- name: nextcloud-data
Expand Down
14 changes: 14 additions & 0 deletions charts/nextcloud/templates/nginx-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,20 @@
location / {
try_files $uri $uri/ /index.php$request_uri;
}


{{ if .Values.clientPush.enabled }}
# client-push application
# https://github.com/nextcloud/notify_push?tab=readme-ov-file#nginx
location ^~ /push/ {
proxy_pass http://127.0.0.1:7867/;
proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "Upgrade";
proxy_set_header Host $host;
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
}
{{ end }}{{/* end-if clientPush.enabled */}}
}
{{- end }}

Expand Down
3 changes: 3 additions & 0 deletions charts/nextcloud/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -599,6 +599,9 @@ rbac:
name: nextcloud-serviceaccount
annotations: {}

clientPush:
enabled: true


## @param securityContext for nextcloud pod @deprecated Use `nextcloud.podSecurityContext` instead
securityContext: {}