Skip to content

Commit

Permalink
add collabora to the normal nextcloud app with no tolerations
Browse files Browse the repository at this point in the history
  • Loading branch information
jessebot committed Dec 17, 2024
1 parent 58729f7 commit 33926c6
Showing 1 changed file with 44 additions and 7 deletions.
51 changes: 44 additions & 7 deletions nextcloud/app_of_apps/nextcloud_argocd_appset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
apiVersion: argoproj.io/v1alpha1
kind: ApplicationSet
metadata:
name: nextcloud-web-app-set
name: nextcloud-appset
namespace: argocd
spec:
goTemplate: true
Expand All @@ -25,27 +25,40 @@ spec:
- nextcloud_s3_region
template:
metadata:
name: nextcloud-web-app
name: nextcloud-app
annotations:
argocd.argoproj.io/sync-wave: "3"

spec:
# project in Argo CD
project: nextcloud

# which k8s cluster this goes to (this assumes the local cluster)
destination:
server: https://kubernetes.default.svc
namespace: nextcloud

# the sync policy for this Argo CD Application
syncPolicy:
syncOptions:
- ApplyOutOfSyncOnly=true
automated:
prune: true
selfHeal: true

source:
repoURL: 'https://nextcloud.github.io/helm'
targetRevision: 6.4.1
chart: nextcloud
targetRevision: 6.4.1
helm:
# release name for this helm chart release. If this is not set,
# Argo CD will use the name of the Application as the release name
releaseName: nextcloud
# all values to pass into the helm chart
valuesObject:
image:
# this is a custom nextcloud image with ffmpeg on it
# it's otherwise exact the same as nextcloud:fpm-alpine
repository: jessebot/nextcloud
tag: 30.0.4-fpm-alpine
pullPolicy: IfNotPresent
Expand Down Expand Up @@ -621,15 +634,28 @@ spec:
## for more options see https://github.com/CollaboraOnline/online/tree/master/kubernetes/helm/collabora-online
collabora:
enabled: true

# please check collabora README.md first
autoscaling:
enabled: false

image:
repository: collabora/code
pullPolicy: IfNotPresent
tag: 24.04.10.2.1

collabora:
fullnameOverrride: "collabora"

## HTTPS nextcloud domain, if needed
# aliasgroups:
# - host: "https://nextcloud.domain:443"
# extra_params: --o:ssl.enable=false --o:ssl.termination=true
aliasgroups:
- host: "https://{{ .nextcloud_hostname }}:443"

extra_params: >
--o:ssl.enable=false
--o:ssl.termination=true
--o:fetch_update_check=0
--o:num_prespawn_children=3
## Specify server_name when the hostname is not reachable directly for example behind reverse-proxy
server_name: '{{ .nextcloud_collabora_hostname }}'
Expand All @@ -648,6 +674,10 @@ spec:
# please check collabora values.yaml for nginx/haproxy annotations examples
annotations:
cert-manager.io/cluster-issuer: '{{ .global_cluster_issuer }}'
nginx.ingress.kubernetes.io/upstream-hash-by: "$arg_WOPISrc"
nginx.ingress.kubernetes.io/proxy-body-size: "0"
nginx.ingress.kubernetes.io/proxy-read-timeout: "600"
nginx.ingress.kubernetes.io/proxy-send-timeout: "600"
hosts:
- host: '{{ .nextcloud_collabora_hostname }}'
paths:
Expand All @@ -659,4 +689,11 @@ spec:
- '{{ .nextcloud_collabora_hostname }}'

# see collabora helm README.md for recommended values
resources: {}
# https://github.com/CollaboraOnline/online/tree/master/kubernetes/helm/collabora-online#deploying-collabora-online-in-kubernetes
resources:
limits:
cpu: "8000m"
memory: "8000Mi"
requests:
cpu: "1800m"
memory: "2000Mi"

0 comments on commit 33926c6

Please sign in to comment.