diff --git a/nextcloud-aio-helm-chart/Chart.yaml b/nextcloud-aio-helm-chart/Chart.yaml index 29465b3b..5a3378c3 100755 --- a/nextcloud-aio-helm-chart/Chart.yaml +++ b/nextcloud-aio-helm-chart/Chart.yaml @@ -1,6 +1,6 @@ name: nextcloud-aio-helm-chart description: A generated Helm Chart for Nextcloud AIO from Skippbox Kompose -version: 6.1.1 +version: 6.2.1 apiVersion: v2 keywords: - latest diff --git a/nextcloud-aio-helm-chart/templates/nextcloud-aio-apache-deployment.yaml b/nextcloud-aio-helm-chart/templates/nextcloud-aio-apache-deployment.yaml index 97b233f2..4b4b8104 100755 --- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-apache-deployment.yaml +++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-apache-deployment.yaml @@ -48,13 +48,15 @@ spec: value: "{{ .Values.NC_DOMAIN }}" - name: NEXTCLOUD_HOST value: nextcloud-aio-nextcloud + - name: NOTIFY_PUSH_HOST + value: nextcloud-aio-notify-push - name: ONLYOFFICE_HOST value: nextcloud-aio-onlyoffice - name: TALK_HOST value: nextcloud-aio-talk - name: TZ value: "{{ .Values.TIMEZONE }}" - image: nextcloud/aio-apache:20230613_120442-latest + image: nextcloud/aio-apache:20230626_101439-latest name: nextcloud-aio-apache ports: - containerPort: {{ .Values.APACHE_PORT }} diff --git a/nextcloud-aio-helm-chart/templates/nextcloud-aio-clamav-deployment.yaml b/nextcloud-aio-helm-chart/templates/nextcloud-aio-clamav-deployment.yaml index 03999b7c..7e70fbbb 100755 --- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-clamav-deployment.yaml +++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-clamav-deployment.yaml @@ -29,7 +29,16 @@ spec: - chmod - "777" - /nextcloud-aio-clamav + - /nextcloud-aio-clamav-tmpfs0 + - /nextcloud-aio-clamav-tmpfs1 + - /nextcloud-aio-clamav-tmpfs2 volumeMounts: + - name: nextcloud-aio-clamav-tmpfs2 + mountPath: /nextcloud-aio-clamav-tmpfs2 + - name: nextcloud-aio-clamav-tmpfs1 + mountPath: /nextcloud-aio-clamav-tmpfs1 + - name: nextcloud-aio-clamav-tmpfs0 + mountPath: /nextcloud-aio-clamav-tmpfs0 - name: nextcloud-aio-clamav mountPath: /nextcloud-aio-clamav containers: @@ -38,15 +47,27 @@ spec: value: "90" - name: TZ value: "{{ .Values.TIMEZONE }}" - image: nextcloud/aio-clamav:20230613_120442-latest + image: nextcloud/aio-clamav:20230626_101439-latest name: nextcloud-aio-clamav ports: - containerPort: 3310 volumeMounts: - mountPath: /var/lib/clamav name: nextcloud-aio-clamav + - mountPath: /var/lock + name: nextcloud-aio-clamav-tmpfs0 + - mountPath: /var/log/clamav + name: nextcloud-aio-clamav-tmpfs1 + - mountPath: /tmp + name: nextcloud-aio-clamav-tmpfs2 volumes: - name: nextcloud-aio-clamav persistentVolumeClaim: claimName: nextcloud-aio-clamav + - emptyDir: {} + name: nextcloud-aio-clamav-tmpfs0 + - emptyDir: {} + name: nextcloud-aio-clamav-tmpfs1 + - emptyDir: {} + name: nextcloud-aio-clamav-tmpfs2 {{- end }} diff --git a/nextcloud-aio-helm-chart/templates/nextcloud-aio-collabora-deployment.yaml b/nextcloud-aio-helm-chart/templates/nextcloud-aio-collabora-deployment.yaml index 31583c3d..1c6fccbd 100755 --- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-collabora-deployment.yaml +++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-collabora-deployment.yaml @@ -36,7 +36,7 @@ spec: value: --o:ssl.enable=false --o:ssl.termination=true --o:mount_jail_tree=false --o:logging.level=warning --o:home_mode.enable=true {{ .Values.COLLABORA_SECCOMP_POLICY }} --o:remote_font_config.url=https://{{ .Values.NC_DOMAIN }}/apps/richdocuments/settings/fonts.json - name: server_name value: "{{ .Values.NC_DOMAIN }}" - image: nextcloud/aio-collabora:20230613_120442-latest + image: nextcloud/aio-collabora:20230626_101439-latest name: nextcloud-aio-collabora ports: - containerPort: 9980 diff --git a/nextcloud-aio-helm-chart/templates/nextcloud-aio-database-deployment.yaml b/nextcloud-aio-helm-chart/templates/nextcloud-aio-database-deployment.yaml index 7ecbd146..eff50ee6 100755 --- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-database-deployment.yaml +++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-database-deployment.yaml @@ -60,7 +60,7 @@ spec: value: nextcloud - name: TZ value: "{{ .Values.TIMEZONE }}" - image: nextcloud/aio-postgresql:20230613_120442-latest + image: nextcloud/aio-postgresql:20230626_101439-latest name: nextcloud-aio-database ports: - containerPort: 5432 diff --git a/nextcloud-aio-helm-chart/templates/nextcloud-aio-fulltextsearch-deployment.yaml b/nextcloud-aio-helm-chart/templates/nextcloud-aio-fulltextsearch-deployment.yaml index 6c7aab94..99ca8d78 100755 --- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-fulltextsearch-deployment.yaml +++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-fulltextsearch-deployment.yaml @@ -42,7 +42,7 @@ spec: value: "{{ .Values.TIMEZONE }}" - name: discovery.type value: single-node - image: nextcloud/aio-fulltextsearch:20230613_120442-latest + image: nextcloud/aio-fulltextsearch:20230626_101439-latest name: nextcloud-aio-fulltextsearch ports: - containerPort: 9200 diff --git a/nextcloud-aio-helm-chart/templates/nextcloud-aio-imaginary-deployment.yaml b/nextcloud-aio-helm-chart/templates/nextcloud-aio-imaginary-deployment.yaml index 6c616071..661eab83 100755 --- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-imaginary-deployment.yaml +++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-imaginary-deployment.yaml @@ -26,7 +26,7 @@ spec: - env: - name: TZ value: "{{ .Values.TIMEZONE }}" - image: nextcloud/aio-imaginary:20230613_120442-latest + image: nextcloud/aio-imaginary:20230626_101439-latest name: nextcloud-aio-imaginary ports: - containerPort: 9000 diff --git a/nextcloud-aio-helm-chart/templates/nextcloud-aio-nextcloud-deployment.yaml b/nextcloud-aio-helm-chart/templates/nextcloud-aio-nextcloud-deployment.yaml index 391e3405..a1352fab 100755 --- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-nextcloud-deployment.yaml +++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-nextcloud-deployment.yaml @@ -116,11 +116,10 @@ spec: value: "{{ .Values.TIMEZONE }}" - name: UPDATE_NEXTCLOUD_APPS value: "{{ .Values.UPDATE_NEXTCLOUD_APPS }}" - image: nextcloud/aio-nextcloud:20230613_120442-latest + image: nextcloud/aio-nextcloud:20230626_101439-latest name: nextcloud-aio-nextcloud ports: - containerPort: 9000 - - containerPort: 7867 volumeMounts: - mountPath: /var/www/html name: nextcloud-aio-nextcloud diff --git a/nextcloud-aio-helm-chart/templates/nextcloud-aio-nextcloud-service.yaml b/nextcloud-aio-helm-chart/templates/nextcloud-aio-nextcloud-service.yaml index 36053808..a5de6eef 100755 --- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-nextcloud-service.yaml +++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-nextcloud-service.yaml @@ -12,8 +12,5 @@ spec: - name: "9000" port: 9000 targetPort: 9000 - - name: "7867" - port: 7867 - targetPort: 7867 selector: io.kompose.service: nextcloud-aio-nextcloud diff --git a/nextcloud-aio-helm-chart/templates/nextcloud-aio-notify-push-deployment.yaml b/nextcloud-aio-helm-chart/templates/nextcloud-aio-notify-push-deployment.yaml new file mode 100755 index 00000000..67d50d18 --- /dev/null +++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-notify-push-deployment.yaml @@ -0,0 +1,63 @@ +apiVersion: apps/v1 +kind: Deployment +metadata: + annotations: + kompose.cmd: kompose convert -c -f latest.yml + kompose.version: 1.28.0 (c4137012e) + labels: + io.kompose.service: nextcloud-aio-notify-push + name: nextcloud-aio-notify-push +spec: + replicas: 1 + selector: + matchLabels: + io.kompose.service: nextcloud-aio-notify-push + template: + metadata: + annotations: + kompose.cmd: kompose convert -c -f latest.yml + kompose.version: 1.28.0 (c4137012e) + labels: + io.kompose.network/nextcloud-aio: "true" + io.kompose.service: nextcloud-aio-notify-push + spec: + initContainers: + - name: init-volumes + image: alpine + command: + - chmod + - "777" + - /nextcloud-aio-nextcloud + volumeMounts: + - name: nextcloud-aio-nextcloud + mountPath: /nextcloud-aio-nextcloud + containers: + - env: + - name: NC_DOMAIN + value: "{{ .Values.NC_DOMAIN }}" + - name: NEXTCLOUD_HOST + value: nextcloud-aio-nextcloud + - name: POSTGRES_DB + value: nextcloud_database + - name: POSTGRES_HOST + value: nextcloud-aio-database + - name: POSTGRES_PASSWORD + value: "{{ .Values.DATABASE_PASSWORD }}" + - name: POSTGRES_USER + value: nextcloud + - name: REDIS_HOST + value: nextcloud-aio-redis + - name: REDIS_HOST_PASSWORD + value: "{{ .Values.REDIS_PASSWORD }}" + image: nextcloud/aio-notify-push:20230626_101439-latest + name: nextcloud-aio-notify-push + ports: + - containerPort: 7867 + volumeMounts: + - mountPath: /nextcloud + name: nextcloud-aio-nextcloud + readOnly: true + volumes: + - name: nextcloud-aio-nextcloud + persistentVolumeClaim: + claimName: nextcloud-aio-nextcloud diff --git a/nextcloud-aio-helm-chart/templates/nextcloud-aio-notify-push-service.yaml b/nextcloud-aio-helm-chart/templates/nextcloud-aio-notify-push-service.yaml new file mode 100755 index 00000000..6a7d17dd --- /dev/null +++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-notify-push-service.yaml @@ -0,0 +1,16 @@ +apiVersion: v1 +kind: Service +metadata: + annotations: + kompose.cmd: kompose convert -c -f latest.yml + kompose.version: 1.28.0 (c4137012e) + labels: + io.kompose.service: nextcloud-aio-notify-push + name: nextcloud-aio-notify-push +spec: + ports: + - name: "7867" + port: 7867 + targetPort: 7867 + selector: + io.kompose.service: nextcloud-aio-notify-push diff --git a/nextcloud-aio-helm-chart/templates/nextcloud-aio-onlyoffice-deployment.yaml b/nextcloud-aio-helm-chart/templates/nextcloud-aio-onlyoffice-deployment.yaml index 331e6f8f..33536e82 100755 --- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-onlyoffice-deployment.yaml +++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-onlyoffice-deployment.yaml @@ -42,7 +42,7 @@ spec: value: "{{ .Values.ONLYOFFICE_SECRET }}" - name: TZ value: "{{ .Values.TIMEZONE }}" - image: nextcloud/aio-onlyoffice:20230613_120442-latest + image: nextcloud/aio-onlyoffice:20230626_101439-latest name: nextcloud-aio-onlyoffice ports: - containerPort: 80 diff --git a/nextcloud-aio-helm-chart/templates/nextcloud-aio-redis-deployment.yaml b/nextcloud-aio-helm-chart/templates/nextcloud-aio-redis-deployment.yaml index ca338b69..3661e408 100755 --- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-redis-deployment.yaml +++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-redis-deployment.yaml @@ -37,7 +37,7 @@ spec: value: "{{ .Values.REDIS_PASSWORD }}" - name: TZ value: "{{ .Values.TIMEZONE }}" - image: nextcloud/aio-redis:20230613_120442-latest + image: nextcloud/aio-redis:20230626_101439-latest name: nextcloud-aio-redis ports: - containerPort: 6379 diff --git a/nextcloud-aio-helm-chart/templates/nextcloud-aio-talk-deployment.yaml b/nextcloud-aio-helm-chart/templates/nextcloud-aio-talk-deployment.yaml index 8bf34751..b2c47c6e 100755 --- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-talk-deployment.yaml +++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-talk-deployment.yaml @@ -36,7 +36,7 @@ spec: value: "{{ .Values.TURN_SECRET }}" - name: TZ value: "{{ .Values.TIMEZONE }}" - image: nextcloud/aio-talk:20230613_120442-latest + image: nextcloud/aio-talk:20230626_101439-latest name: nextcloud-aio-talk ports: - containerPort: {{ .Values.TALK_PORT }} diff --git a/nextcloud-aio-helm-chart/templates/nextcloud-aio-talk-recording-deployment.yaml b/nextcloud-aio-helm-chart/templates/nextcloud-aio-talk-recording-deployment.yaml index 340acf83..8b8a671f 100755 --- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-talk-recording-deployment.yaml +++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-talk-recording-deployment.yaml @@ -32,7 +32,7 @@ spec: value: "{{ .Values.RECORDING_SECRET }}" - name: TZ value: "{{ .Values.TIMEZONE }}" - image: nextcloud/aio-talk-recording:20230613_120442-latest + image: nextcloud/aio-talk-recording:20230626_101439-latest name: nextcloud-aio-talk-recording ports: - containerPort: 1234 diff --git a/nextcloud-aio-helm-chart/values.yaml b/nextcloud-aio-helm-chart/values.yaml index 4e2ab3a0..06e59ff7 100755 --- a/nextcloud-aio-helm-chart/values.yaml +++ b/nextcloud-aio-helm-chart/values.yaml @@ -31,6 +31,7 @@ NEXTCLOUD_TRUSTED_CACERTS_DIR: # Setting this to any value allows to auto NEXTCLOUD_UPLOAD_LIMIT: 10G # This allows to change the upload limit of the Nextcloud container TALK_PORT: 3478 # This allows to adjust the port that the talk container is using. UPDATE_NEXTCLOUD_APPS: no # When setting to yes (with quotes), it will automatically update all installed Nextcloud apps upon container startup on saturdays. + STORAGE_CLASS: # By setting this, you can adjust the storage class for your volumes APACHE_STORAGE_SIZE: 1Gi # You can change the size of the apache volume that default to 1Gi with this value CLAMAV_STORAGE_SIZE: 1Gi # You can change the size of the clamav volume that default to 1Gi with this value