diff --git a/helm-chart/Chart.yaml b/helm-chart/Chart.yaml index 606c05ff..fefeda85 100755 --- a/helm-chart/Chart.yaml +++ b/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: 4.0.1 +version: 4.2.0 apiVersion: v1 keywords: - latest diff --git a/helm-chart/templates/nextcloud-aio-apache-deployment.yaml b/helm-chart/templates/nextcloud-aio-apache-deployment.yaml index 6b23459a..33a7839b 100755 --- a/helm-chart/templates/nextcloud-aio-apache-deployment.yaml +++ b/helm-chart/templates/nextcloud-aio-apache-deployment.yaml @@ -3,7 +3,7 @@ kind: Deployment metadata: annotations: kompose.cmd: kompose convert -c -f latest.yml - kompose.version: 1.27.0 (b0ed6a2c9) + kompose.version: 1.28.0 (c4137012e) labels: io.kompose.service: nextcloud-aio-apache name: nextcloud-aio-apache @@ -16,7 +16,7 @@ spec: metadata: annotations: kompose.cmd: kompose convert -c -f latest.yml - kompose.version: 1.27.0 (b0ed6a2c9) + kompose.version: 1.28.0 (c4137012e) labels: io.kompose.network/nextcloud-aio: "true" io.kompose.service: nextcloud-aio-apache @@ -41,10 +41,11 @@ spec: value: nextcloud-aio-talk - name: TZ value: "{{ .Values.TIMEZONE }}" - image: nextcloud/aio-apache:20221229_091124-{{ .Values.IMAGE_TAG }} + image: nextcloud/aio-apache:20230124_100035-{{ .Values.IMAGE_TAG }} name: nextcloud-aio-apache ports: - containerPort: {{ .Values.APACHE_PORT }} + hostIP: {{ .Values.APACHE_IP_BINDING }} volumeMounts: - mountPath: /var/www/html name: nextcloud-aio-nextcloud diff --git a/helm-chart/templates/nextcloud-aio-apache-persistentvolumeclaim.yaml b/helm-chart/templates/nextcloud-aio-apache-persistentvolumeclaim.yaml index fc6d1b65..d1a03c77 100755 --- a/helm-chart/templates/nextcloud-aio-apache-persistentvolumeclaim.yaml +++ b/helm-chart/templates/nextcloud-aio-apache-persistentvolumeclaim.yaml @@ -9,7 +9,7 @@ spec: storageClassName: {{ .Values.STORAGE_CLASS }} {{- end }} accessModes: - - ReadWriteMany + - ReadWriteOnce resources: requests: - storage: {{ .Values.MAX_STORAGE_SIZE }} + storage: 1Gi diff --git a/helm-chart/templates/nextcloud-aio-apache-service.yaml b/helm-chart/templates/nextcloud-aio-apache-service.yaml index 22ed8269..50acc4b3 100755 --- a/helm-chart/templates/nextcloud-aio-apache-service.yaml +++ b/helm-chart/templates/nextcloud-aio-apache-service.yaml @@ -3,7 +3,7 @@ kind: Service metadata: annotations: kompose.cmd: kompose convert -c -f latest.yml - kompose.version: 1.27.0 (b0ed6a2c9) + kompose.version: 1.28.0 (c4137012e) labels: io.kompose.service: nextcloud-aio-apache name: nextcloud-aio-apache @@ -14,5 +14,3 @@ spec: targetPort: {{ .Values.APACHE_PORT }} selector: io.kompose.service: nextcloud-aio-apache -status: - loadBalancer: {} diff --git a/helm-chart/templates/nextcloud-aio-clamav-deployment.yaml b/helm-chart/templates/nextcloud-aio-clamav-deployment.yaml index 7de199da..d4606e2d 100755 --- a/helm-chart/templates/nextcloud-aio-clamav-deployment.yaml +++ b/helm-chart/templates/nextcloud-aio-clamav-deployment.yaml @@ -4,7 +4,7 @@ kind: Deployment metadata: annotations: kompose.cmd: kompose convert -c -f latest.yml - kompose.version: 1.27.0 (b0ed6a2c9) + kompose.version: 1.28.0 (c4137012e) labels: io.kompose.service: nextcloud-aio-clamav name: nextcloud-aio-clamav @@ -17,7 +17,7 @@ spec: metadata: annotations: kompose.cmd: kompose convert -c -f latest.yml - kompose.version: 1.27.0 (b0ed6a2c9) + kompose.version: 1.28.0 (c4137012e) labels: io.kompose.network/nextcloud-aio: "true" io.kompose.service: nextcloud-aio-clamav @@ -28,7 +28,7 @@ spec: value: "90" - name: TZ value: "{{ .Values.TIMEZONE }}" - image: nextcloud/aio-clamav:20221229_091124-{{ .Values.IMAGE_TAG }} + image: nextcloud/aio-clamav:20230124_100035-{{ .Values.IMAGE_TAG }} name: nextcloud-aio-clamav volumeMounts: - mountPath: /var/lib/clamav diff --git a/helm-chart/templates/nextcloud-aio-clamav-persistentvolumeclaim.yaml b/helm-chart/templates/nextcloud-aio-clamav-persistentvolumeclaim.yaml index 776901fb..6c4c4b79 100755 --- a/helm-chart/templates/nextcloud-aio-clamav-persistentvolumeclaim.yaml +++ b/helm-chart/templates/nextcloud-aio-clamav-persistentvolumeclaim.yaml @@ -9,7 +9,7 @@ spec: storageClassName: {{ .Values.STORAGE_CLASS }} {{- end }} accessModes: - - ReadWriteMany + - ReadWriteOnce resources: requests: - storage: {{ .Values.MAX_STORAGE_SIZE }} + storage: 1Gi diff --git a/helm-chart/templates/nextcloud-aio-collabora-deployment.yaml b/helm-chart/templates/nextcloud-aio-collabora-deployment.yaml index 2f83b739..c30b0afd 100755 --- a/helm-chart/templates/nextcloud-aio-collabora-deployment.yaml +++ b/helm-chart/templates/nextcloud-aio-collabora-deployment.yaml @@ -4,7 +4,7 @@ kind: Deployment metadata: annotations: kompose.cmd: kompose convert -c -f latest.yml - kompose.version: 1.27.0 (b0ed6a2c9) + kompose.version: 1.28.0 (c4137012e) labels: io.kompose.service: nextcloud-aio-collabora name: nextcloud-aio-collabora @@ -17,7 +17,7 @@ spec: metadata: annotations: kompose.cmd: kompose convert -c -f latest.yml - kompose.version: 1.27.0 (b0ed6a2c9) + kompose.version: 1.28.0 (c4137012e) labels: io.kompose.network/nextcloud-aio: "true" io.kompose.service: nextcloud-aio-collabora @@ -32,7 +32,7 @@ spec: value: "{{ .Values.COLLABORA_DICTIONARIES }}" - name: extra_params value: --o:ssl.enable=false --o:ssl.termination=true --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 - image: nextcloud/aio-collabora:20221229_091124-{{ .Values.IMAGE_TAG }} + image: nextcloud/aio-collabora:20230124_100035-{{ .Values.IMAGE_TAG }} name: nextcloud-aio-collabora volumeMounts: - mountPath: /opt/cool/systemplate/tmpfonts diff --git a/helm-chart/templates/nextcloud-aio-collabora-fonts-persistentvolumeclaim.yaml b/helm-chart/templates/nextcloud-aio-collabora-fonts-persistentvolumeclaim.yaml index 099998a4..54c704fe 100755 --- a/helm-chart/templates/nextcloud-aio-collabora-fonts-persistentvolumeclaim.yaml +++ b/helm-chart/templates/nextcloud-aio-collabora-fonts-persistentvolumeclaim.yaml @@ -9,7 +9,7 @@ spec: storageClassName: {{ .Values.STORAGE_CLASS }} {{- end }} accessModes: - - ReadWriteMany + - ReadWriteOnce resources: requests: - storage: {{ .Values.MAX_STORAGE_SIZE }} + storage: 1Gi diff --git a/helm-chart/templates/nextcloud-aio-database-deployment.yaml b/helm-chart/templates/nextcloud-aio-database-deployment.yaml index b5bae70e..36c7a981 100755 --- a/helm-chart/templates/nextcloud-aio-database-deployment.yaml +++ b/helm-chart/templates/nextcloud-aio-database-deployment.yaml @@ -3,7 +3,7 @@ kind: Deployment metadata: annotations: kompose.cmd: kompose convert -c -f latest.yml - kompose.version: 1.27.0 (b0ed6a2c9) + kompose.version: 1.28.0 (c4137012e) labels: io.kompose.service: nextcloud-aio-database name: nextcloud-aio-database @@ -16,7 +16,7 @@ spec: metadata: annotations: kompose.cmd: kompose convert -c -f latest.yml - kompose.version: 1.27.0 (b0ed6a2c9) + kompose.version: 1.28.0 (c4137012e) labels: io.kompose.network/nextcloud-aio: "true" io.kompose.service: nextcloud-aio-database @@ -33,7 +33,7 @@ spec: value: nextcloud - name: TZ value: "{{ .Values.TIMEZONE }}" - image: nextcloud/aio-postgresql:20221229_091124-{{ .Values.IMAGE_TAG }} + image: nextcloud/aio-postgresql:20230124_100035-{{ .Values.IMAGE_TAG }} name: nextcloud-aio-database volumeMounts: - mountPath: /var/lib/postgresql/data diff --git a/helm-chart/templates/nextcloud-aio-database-dump-persistentvolumeclaim.yaml b/helm-chart/templates/nextcloud-aio-database-dump-persistentvolumeclaim.yaml index 5b5d61b2..a7a29492 100755 --- a/helm-chart/templates/nextcloud-aio-database-dump-persistentvolumeclaim.yaml +++ b/helm-chart/templates/nextcloud-aio-database-dump-persistentvolumeclaim.yaml @@ -9,7 +9,7 @@ spec: storageClassName: {{ .Values.STORAGE_CLASS }} {{- end }} accessModes: - - ReadWriteMany + - ReadWriteOnce resources: requests: - storage: {{ .Values.MAX_STORAGE_SIZE }} + storage: 1Gi diff --git a/helm-chart/templates/nextcloud-aio-database-persistentvolumeclaim.yaml b/helm-chart/templates/nextcloud-aio-database-persistentvolumeclaim.yaml index 71a78ad6..23947a12 100755 --- a/helm-chart/templates/nextcloud-aio-database-persistentvolumeclaim.yaml +++ b/helm-chart/templates/nextcloud-aio-database-persistentvolumeclaim.yaml @@ -9,7 +9,7 @@ spec: storageClassName: {{ .Values.STORAGE_CLASS }} {{- end }} accessModes: - - ReadWriteMany + - ReadWriteOnce resources: requests: - storage: {{ .Values.MAX_STORAGE_SIZE }} + storage: 1Gi diff --git a/helm-chart/templates/nextcloud-aio-elasticsearch-persistentvolumeclaim.yaml b/helm-chart/templates/nextcloud-aio-elasticsearch-persistentvolumeclaim.yaml index ec2ecbce..5b92f15b 100755 --- a/helm-chart/templates/nextcloud-aio-elasticsearch-persistentvolumeclaim.yaml +++ b/helm-chart/templates/nextcloud-aio-elasticsearch-persistentvolumeclaim.yaml @@ -9,7 +9,7 @@ spec: storageClassName: {{ .Values.STORAGE_CLASS }} {{- end }} accessModes: - - ReadWriteMany + - ReadWriteOnce resources: requests: - storage: {{ .Values.MAX_STORAGE_SIZE }} + storage: 1Gi diff --git a/helm-chart/templates/nextcloud-aio-fulltextsearch-deployment.yaml b/helm-chart/templates/nextcloud-aio-fulltextsearch-deployment.yaml index 33408159..63e475cf 100755 --- a/helm-chart/templates/nextcloud-aio-fulltextsearch-deployment.yaml +++ b/helm-chart/templates/nextcloud-aio-fulltextsearch-deployment.yaml @@ -4,7 +4,7 @@ kind: Deployment metadata: annotations: kompose.cmd: kompose convert -c -f latest.yml - kompose.version: 1.27.0 (b0ed6a2c9) + kompose.version: 1.28.0 (c4137012e) labels: io.kompose.service: nextcloud-aio-fulltextsearch name: nextcloud-aio-fulltextsearch @@ -17,7 +17,7 @@ spec: metadata: annotations: kompose.cmd: kompose convert -c -f latest.yml - kompose.version: 1.27.0 (b0ed6a2c9) + kompose.version: 1.28.0 (c4137012e) labels: io.kompose.network/nextcloud-aio: "true" io.kompose.service: nextcloud-aio-fulltextsearch @@ -30,7 +30,7 @@ spec: value: "{{ .Values.TIMEZONE }}" - name: discovery.type value: single-node - image: nextcloud/aio-fulltextsearch:20221229_091124-{{ .Values.IMAGE_TAG }} + image: nextcloud/aio-fulltextsearch:20230124_100035-{{ .Values.IMAGE_TAG }} name: nextcloud-aio-fulltextsearch volumeMounts: - mountPath: /usr/share/elasticsearch/data diff --git a/helm-chart/templates/nextcloud-aio-imaginary-deployment.yaml b/helm-chart/templates/nextcloud-aio-imaginary-deployment.yaml index e6b90ac7..2eabe094 100755 --- a/helm-chart/templates/nextcloud-aio-imaginary-deployment.yaml +++ b/helm-chart/templates/nextcloud-aio-imaginary-deployment.yaml @@ -4,7 +4,7 @@ kind: Deployment metadata: annotations: kompose.cmd: kompose convert -c -f latest.yml - kompose.version: 1.27.0 (b0ed6a2c9) + kompose.version: 1.28.0 (c4137012e) labels: io.kompose.service: nextcloud-aio-imaginary name: nextcloud-aio-imaginary @@ -17,7 +17,7 @@ spec: metadata: annotations: kompose.cmd: kompose convert -c -f latest.yml - kompose.version: 1.27.0 (b0ed6a2c9) + kompose.version: 1.28.0 (c4137012e) labels: io.kompose.network/nextcloud-aio: "true" io.kompose.service: nextcloud-aio-imaginary @@ -26,6 +26,6 @@ spec: - env: - name: TZ value: "{{ .Values.TIMEZONE }}" - image: nextcloud/aio-imaginary:20221229_091124-{{ .Values.IMAGE_TAG }} + image: nextcloud/aio-imaginary:20230124_100035-{{ .Values.IMAGE_TAG }} name: nextcloud-aio-imaginary {{- end }} diff --git a/helm-chart/templates/nextcloud-aio-nextcloud-data-persistentvolumeclaim.yaml b/helm-chart/templates/nextcloud-aio-nextcloud-data-persistentvolumeclaim.yaml index a3e65b4f..994bd947 100755 --- a/helm-chart/templates/nextcloud-aio-nextcloud-data-persistentvolumeclaim.yaml +++ b/helm-chart/templates/nextcloud-aio-nextcloud-data-persistentvolumeclaim.yaml @@ -9,7 +9,7 @@ spec: storageClassName: {{ .Values.STORAGE_CLASS }} {{- end }} accessModes: - - ReadWriteMany + - ReadWriteOnce resources: requests: - storage: {{ .Values.MAX_STORAGE_SIZE }} + storage: 1Gi diff --git a/helm-chart/templates/nextcloud-aio-nextcloud-deployment.yaml b/helm-chart/templates/nextcloud-aio-nextcloud-deployment.yaml index 72483cfe..025ae24a 100755 --- a/helm-chart/templates/nextcloud-aio-nextcloud-deployment.yaml +++ b/helm-chart/templates/nextcloud-aio-nextcloud-deployment.yaml @@ -3,7 +3,7 @@ kind: Deployment metadata: annotations: kompose.cmd: kompose convert -c -f latest.yml - kompose.version: 1.27.0 (b0ed6a2c9) + kompose.version: 1.28.0 (c4137012e) labels: io.kompose.service: nextcloud-aio-nextcloud name: nextcloud-aio-nextcloud @@ -16,7 +16,7 @@ spec: metadata: annotations: kompose.cmd: kompose convert -c -f latest.yml - kompose.version: 1.27.0 (b0ed6a2c9) + kompose.version: 1.28.0 (c4137012e) labels: io.kompose.network/nextcloud-aio: "true" io.kompose.service: nextcloud-aio-nextcloud @@ -101,14 +101,14 @@ spec: value: "{{ .Values.TIMEZONE }}" - name: UPDATE_NEXTCLOUD_APPS value: "{{ .Values.UPDATE_NEXTCLOUD_APPS }}" - image: nextcloud/aio-nextcloud:20221229_091124-{{ .Values.IMAGE_TAG }} + image: nextcloud/aio-nextcloud:20230124_100035-{{ .Values.IMAGE_TAG }} name: nextcloud-aio-nextcloud volumeMounts: - mountPath: /var/www/html name: nextcloud-aio-nextcloud - mountPath: /mnt/ncdata name: nextcloud-aio-nextcloud-data - - mountPath: /mnt/ + - mountPath: /mnt name: nextcloud-aio-nextcloud-mount - mountPath: /usr/local/share/ca-certificates name: nextcloud-aio-nextcloud-trusted-cacerts diff --git a/helm-chart/templates/nextcloud-aio-nextcloud-mount-persistentvolumeclaim.yaml b/helm-chart/templates/nextcloud-aio-nextcloud-mount-persistentvolumeclaim.yaml index ced4114b..c36dca31 100755 --- a/helm-chart/templates/nextcloud-aio-nextcloud-mount-persistentvolumeclaim.yaml +++ b/helm-chart/templates/nextcloud-aio-nextcloud-mount-persistentvolumeclaim.yaml @@ -9,7 +9,7 @@ spec: storageClassName: {{ .Values.STORAGE_CLASS }} {{- end }} accessModes: - - ReadWriteMany + - ReadWriteOnce resources: requests: - storage: {{ .Values.MAX_STORAGE_SIZE }} + storage: 1Gi diff --git a/helm-chart/templates/nextcloud-aio-nextcloud-persistentvolumeclaim.yaml b/helm-chart/templates/nextcloud-aio-nextcloud-persistentvolumeclaim.yaml index b047dc5a..9a00b40c 100755 --- a/helm-chart/templates/nextcloud-aio-nextcloud-persistentvolumeclaim.yaml +++ b/helm-chart/templates/nextcloud-aio-nextcloud-persistentvolumeclaim.yaml @@ -9,7 +9,7 @@ spec: storageClassName: {{ .Values.STORAGE_CLASS }} {{- end }} accessModes: - - ReadWriteMany + - ReadWriteOnce resources: requests: - storage: {{ .Values.MAX_STORAGE_SIZE }} + storage: 1Gi diff --git a/helm-chart/templates/nextcloud-aio-nextcloud-trusted-cacerts-persistentvolumeclaim.yaml b/helm-chart/templates/nextcloud-aio-nextcloud-trusted-cacerts-persistentvolumeclaim.yaml index 6a46650c..f3826da7 100755 --- a/helm-chart/templates/nextcloud-aio-nextcloud-trusted-cacerts-persistentvolumeclaim.yaml +++ b/helm-chart/templates/nextcloud-aio-nextcloud-trusted-cacerts-persistentvolumeclaim.yaml @@ -9,7 +9,7 @@ spec: storageClassName: {{ .Values.STORAGE_CLASS }} {{- end }} accessModes: - - ReadWriteMany + - ReadWriteOnce resources: requests: - storage: {{ .Values.MAX_STORAGE_SIZE }} + storage: 1Gi diff --git a/helm-chart/templates/nextcloud-aio-onlyoffice-deployment.yaml b/helm-chart/templates/nextcloud-aio-onlyoffice-deployment.yaml index 1da2dbb7..c7de97a4 100755 --- a/helm-chart/templates/nextcloud-aio-onlyoffice-deployment.yaml +++ b/helm-chart/templates/nextcloud-aio-onlyoffice-deployment.yaml @@ -4,7 +4,7 @@ kind: Deployment metadata: annotations: kompose.cmd: kompose convert -c -f latest.yml - kompose.version: 1.27.0 (b0ed6a2c9) + kompose.version: 1.28.0 (c4137012e) labels: io.kompose.service: nextcloud-aio-onlyoffice name: nextcloud-aio-onlyoffice @@ -17,7 +17,7 @@ spec: metadata: annotations: kompose.cmd: kompose convert -c -f latest.yml - kompose.version: 1.27.0 (b0ed6a2c9) + kompose.version: 1.28.0 (c4137012e) labels: io.kompose.network/nextcloud-aio: "true" io.kompose.service: nextcloud-aio-onlyoffice @@ -32,7 +32,7 @@ spec: value: "{{ .Values.ONLYOFFICE_SECRET }}" - name: TZ value: "{{ .Values.TIMEZONE }}" - image: nextcloud/aio-onlyoffice:20221229_091124-{{ .Values.IMAGE_TAG }} + image: nextcloud/aio-onlyoffice:20230124_100035-{{ .Values.IMAGE_TAG }} name: nextcloud-aio-onlyoffice volumeMounts: - mountPath: /var/lib/onlyoffice diff --git a/helm-chart/templates/nextcloud-aio-onlyoffice-persistentvolumeclaim.yaml b/helm-chart/templates/nextcloud-aio-onlyoffice-persistentvolumeclaim.yaml index 90916696..0a97d85f 100755 --- a/helm-chart/templates/nextcloud-aio-onlyoffice-persistentvolumeclaim.yaml +++ b/helm-chart/templates/nextcloud-aio-onlyoffice-persistentvolumeclaim.yaml @@ -9,7 +9,7 @@ spec: storageClassName: {{ .Values.STORAGE_CLASS }} {{- end }} accessModes: - - ReadWriteMany + - ReadWriteOnce resources: requests: - storage: {{ .Values.MAX_STORAGE_SIZE }} + storage: 1Gi diff --git a/helm-chart/templates/nextcloud-aio-redis-deployment.yaml b/helm-chart/templates/nextcloud-aio-redis-deployment.yaml index 0dc84638..7d9dd504 100755 --- a/helm-chart/templates/nextcloud-aio-redis-deployment.yaml +++ b/helm-chart/templates/nextcloud-aio-redis-deployment.yaml @@ -3,7 +3,7 @@ kind: Deployment metadata: annotations: kompose.cmd: kompose convert -c -f latest.yml - kompose.version: 1.27.0 (b0ed6a2c9) + kompose.version: 1.28.0 (c4137012e) labels: io.kompose.service: nextcloud-aio-redis name: nextcloud-aio-redis @@ -16,7 +16,7 @@ spec: metadata: annotations: kompose.cmd: kompose convert -c -f latest.yml - kompose.version: 1.27.0 (b0ed6a2c9) + kompose.version: 1.28.0 (c4137012e) labels: io.kompose.network/nextcloud-aio: "true" io.kompose.service: nextcloud-aio-redis @@ -27,7 +27,7 @@ spec: value: "{{ .Values.REDIS_PASSWORD }}" - name: TZ value: "{{ .Values.TIMEZONE }}" - image: nextcloud/aio-redis:20221229_091124-{{ .Values.IMAGE_TAG }} + image: nextcloud/aio-redis:20230124_100035-{{ .Values.IMAGE_TAG }} name: nextcloud-aio-redis volumeMounts: - mountPath: /data diff --git a/helm-chart/templates/nextcloud-aio-redis-persistentvolumeclaim.yaml b/helm-chart/templates/nextcloud-aio-redis-persistentvolumeclaim.yaml index fd7af042..c9c003e2 100755 --- a/helm-chart/templates/nextcloud-aio-redis-persistentvolumeclaim.yaml +++ b/helm-chart/templates/nextcloud-aio-redis-persistentvolumeclaim.yaml @@ -9,7 +9,7 @@ spec: storageClassName: {{ .Values.STORAGE_CLASS }} {{- end }} accessModes: - - ReadWriteMany + - ReadWriteOnce resources: requests: - storage: {{ .Values.MAX_STORAGE_SIZE }} + storage: 1Gi diff --git a/helm-chart/templates/nextcloud-aio-talk-deployment.yaml b/helm-chart/templates/nextcloud-aio-talk-deployment.yaml index 29d078c8..06ac7f2d 100755 --- a/helm-chart/templates/nextcloud-aio-talk-deployment.yaml +++ b/helm-chart/templates/nextcloud-aio-talk-deployment.yaml @@ -4,7 +4,7 @@ kind: Deployment metadata: annotations: kompose.cmd: kompose convert -c -f latest.yml - kompose.version: 1.27.0 (b0ed6a2c9) + kompose.version: 1.28.0 (c4137012e) labels: io.kompose.service: nextcloud-aio-talk name: nextcloud-aio-talk @@ -17,7 +17,7 @@ spec: metadata: annotations: kompose.cmd: kompose convert -c -f latest.yml - kompose.version: 1.27.0 (b0ed6a2c9) + kompose.version: 1.28.0 (c4137012e) labels: io.kompose.network/nextcloud-aio: "true" io.kompose.service: nextcloud-aio-talk @@ -36,7 +36,7 @@ spec: value: "{{ .Values.TURN_SECRET }}" - name: TZ value: "{{ .Values.TIMEZONE }}" - image: nextcloud/aio-talk:20221229_091124-{{ .Values.IMAGE_TAG }} + image: nextcloud/aio-talk:20230124_100035-{{ .Values.IMAGE_TAG }} name: nextcloud-aio-talk ports: - containerPort: {{ .Values.TALK_PORT }} diff --git a/helm-chart/templates/nextcloud-aio-talk-service.yaml b/helm-chart/templates/nextcloud-aio-talk-service.yaml index a9588e4e..91bc1887 100755 --- a/helm-chart/templates/nextcloud-aio-talk-service.yaml +++ b/helm-chart/templates/nextcloud-aio-talk-service.yaml @@ -4,7 +4,7 @@ kind: Service metadata: annotations: kompose.cmd: kompose convert -c -f latest.yml - kompose.version: 1.27.0 (b0ed6a2c9) + kompose.version: 1.28.0 (c4137012e) labels: io.kompose.service: nextcloud-aio-talk name: nextcloud-aio-talk @@ -19,6 +19,4 @@ spec: targetPort: {{ .Values.TALK_PORT }} selector: io.kompose.service: nextcloud-aio-talk -status: - loadBalancer: {} {{- end }} diff --git a/helm-chart/update-helm.sh b/helm-chart/update-helm.sh index 8268bbde..cf3ad294 100755 --- a/helm-chart/update-helm.sh +++ b/helm-chart/update-helm.sh @@ -29,20 +29,26 @@ sed -i "s|\${TALK_PORT}:\${TALK_PORT}/|$TALK_PORT:$TALK_PORT/|g" latest.yml sed -i "s|\${NEXTCLOUD_DATADIR}|$NEXTCLOUD_DATADIR|" latest.yml sed -i "/NEXTCLOUD_DATADIR/d" latest.yml sed -i "s|\${NEXTCLOUD_MOUNT}:\${NEXTCLOUD_MOUNT}:|nextcloud_aio_nextcloud_mount:$NEXTCLOUD_MOUNT:|" latest.yml +sed -i "/^volumes:/a\ \ nextcloud_aio_nextcloud_mount:\n \ \ \ \ name: nextcloud_aio_nextcloud_mount" latest.yml +sed -i "/^volumes:/a\ \ nextcloud_aio_nextcloud_trusted_cacerts:\n \ \ \ \ name: nextcloud_aio_nextcloud_trusted_cacerts" latest.yml sed -i "s|\${NEXTCLOUD_TRUSTED_CACERTS_DIR}:|nextcloud_aio_nextcloud_trusted_cacerts:|g#" latest.yml sed -i 's|\${|{{ .Values.|g' latest.yml sed -i 's|}| }}|g' latest.yml -sed -i '/profiles: /d' latest.yml cat latest.yml kompose convert -c -f latest.yml cd latest +mv ./templates/manual-install-nextcloud-aio-networkpolicy.yaml ./templates/nextcloud-aio-networkpolicy.yaml # shellcheck disable=SC1083 -find ./ -name '*persistentvolumeclaim.yaml' -exec sed -i "s|storage: 100Mi|storage: {{ .Values.MAX_STORAGE_SIZE }}|" \{} \; +find ./ -name '*networkpolicy.yaml' -exec sed -i "s|manual-install-nextcloud-aio|nextcloud-aio|" \{} \; # shellcheck disable=SC1083 -find ./ -name '*persistentvolumeclaim.yaml' -exec sed -i "s|ReadOnlyMany|ReadWriteMany|" \{} \; +find ./ -name '*service.yaml' -exec sed -i "/^status:/,$ d" \{} \; # shellcheck disable=SC1083 -find ./ -name '*persistentvolumeclaim.yaml' -exec sed -i "s|ReadWriteOnce|ReadWriteMany|" \{} \; +find ./ -name '*deployment.yaml' -exec sed -i "s|manual-install-nextcloud-aio|nextcloud-aio|" \{} \; +# shellcheck disable=SC1083 +find ./ -name '*persistentvolumeclaim.yaml' -exec sed -i "s|storage: 100Mi|storage: 1Gi|" \{} \; +# shellcheck disable=SC1083 +find ./ -name '*persistentvolumeclaim.yaml' -exec sed -i "s|ReadOnlyMany|ReadWriteOnce|" \{} \; # shellcheck disable=SC1083 find ./ -name '*persistentvolumeclaim.yaml' -exec sed -i "/accessModes:/i\ \ {{- if .Values.STORAGE_CLASS }}" \{} \; # shellcheck disable=SC1083 @@ -85,14 +91,12 @@ sed -i "s|^version:.*|version: $AIO_VERSION|" ../helm-chart/Chart.yaml # Conversion of sample.conf cp sample.conf /tmp/ -sed -i "/^APACHE_IP_BINDING/d" /tmp/sample.conf sed -i 's|"||g' /tmp/sample.conf sed -i 's|=|: |' /tmp/sample.conf sed -i 's|= |: |' /tmp/sample.conf sed -i '/^NEXTCLOUD_DATADIR/d' /tmp/sample.conf sed -i 's|^NEXTCLOUD_MOUNT: .*|NEXTCLOUD_MOUNT: # Setting this to any value allows to enable external storages in Nextcloud|' /tmp/sample.conf sed -i 's|^NEXTCLOUD_TRUSTED_CACERTS_DIR: .*|NEXTCLOUD_TRUSTED_CACERTS_DIR: # Setting this to any value allows to automatically import root certificates into the Nextcloud container|' /tmp/sample.conf -echo 'MAX_STORAGE_SIZE: 10Gi # You can adjust the max storage that each volume can use with this value' >> /tmp/sample.conf echo 'STORAGE_CLASS: # By setting this, you can adjust the storage class for your volumes' >> /tmp/sample.conf mv /tmp/sample.conf ../helm-chart/values.yaml diff --git a/helm-chart/values.yaml b/helm-chart/values.yaml index 5ec3fcdf..e18a34a9 100755 --- a/helm-chart/values.yaml +++ b/helm-chart/values.yaml @@ -1,6 +1,7 @@ IMAGE_TAG: latest # Version of docker images, should be latest or latest-arm64. Note: latest-arm64 has no clamav support AIO_TOKEN: 123456 # Has no function but needs to be set! AIO_URL: localhost # Has no function but needs to be set! +APACHE_IP_BINDING: 0.0.0.0 # This can be changed to e.g. 127.0.0.1 if you want to run AIO behind a reverse proxy and if that is running on the same host and using localhost to connect APACHE_MAX_SIZE: 10737418240 # This needs to be an integer and in sync with NEXTCLOUD_UPLOAD_LIMIT APACHE_PORT: 443 # Changing this to a different value than 443 will allow you to run it behind a reverse proxy. CLAMAV_ENABLED: no # Setting this to yes enables the option in Nextcloud automatically. Note: latest-arm64 has no clamav support @@ -30,5 +31,4 @@ TALK_PORT: 3478 # This allows to adjust the port that the talk containe TIMEZONE: Europe/Berlin # TODO! This is the timezone that your containers will use. TURN_SECRET: # TODO! This needs to be a unique and good password! UPDATE_NEXTCLOUD_APPS: no # When setting to yes, it will automatically update all installed Nextcloud apps upon container startup on saturdays. -MAX_STORAGE_SIZE: 10Gi # You can adjust the max storage that each volume can use with this value STORAGE_CLASS: # By setting this, you can adjust the storage class for your volumes