From fb6ca4b6af5f8196ef055e1936911725139abb92 Mon Sep 17 00:00:00 2001 From: szaimen Date: Thu, 20 Jul 2023 13:54:51 +0000 Subject: [PATCH] Helm Chart updates Signed-off-by: GitHub --- nextcloud-aio-helm-chart/Chart.yaml | 2 +- .../nextcloud-aio-apache-deployment.yaml | 53 ++++++++++++++-- ...loud-aio-apache-persistentvolumeclaim.yaml | 1 + .../nextcloud-aio-apache-service.yaml | 9 ++- .../nextcloud-aio-clamav-deployment.yaml | 15 +++-- ...loud-aio-clamav-persistentvolumeclaim.yaml | 1 + .../nextcloud-aio-clamav-service.yaml | 5 +- .../nextcloud-aio-collabora-deployment.yaml | 13 ++-- .../nextcloud-aio-collabora-service.yaml | 5 +- .../nextcloud-aio-database-deployment.yaml | 25 ++++++-- ...o-database-dump-persistentvolumeclaim.yaml | 1 + ...ud-aio-database-persistentvolumeclaim.yaml | 1 + .../nextcloud-aio-database-service.yaml | 5 +- ...o-elasticsearch-persistentvolumeclaim.yaml | 1 + ...xtcloud-aio-fulltextsearch-deployment.yaml | 13 ++-- .../nextcloud-aio-fulltextsearch-service.yaml | 5 +- .../nextcloud-aio-imaginary-deployment.yaml | 30 +++++++-- .../nextcloud-aio-imaginary-service.yaml | 5 +- .../nextcloud-aio-namespace-namespace.yaml | 6 ++ .../nextcloud-aio-networkpolicy.yaml | 13 ---- ...-nextcloud-data-persistentvolumeclaim.yaml | 1 + .../nextcloud-aio-nextcloud-deployment.yaml | 13 ++-- ...d-aio-nextcloud-persistentvolumeclaim.yaml | 1 + .../nextcloud-aio-nextcloud-service.yaml | 5 +- ...trusted-cacerts-persistentvolumeclaim.yaml | 1 + .../nextcloud-aio-notify-push-deployment.yaml | 15 +++-- .../nextcloud-aio-notify-push-service.yaml | 5 +- .../nextcloud-aio-onlyoffice-deployment.yaml | 13 ++-- ...-aio-onlyoffice-persistentvolumeclaim.yaml | 1 + .../nextcloud-aio-onlyoffice-service.yaml | 5 +- .../nextcloud-aio-redis-deployment.yaml | 15 +++-- ...cloud-aio-redis-persistentvolumeclaim.yaml | 1 + .../nextcloud-aio-redis-service.yaml | 5 +- .../nextcloud-aio-talk-deployment.yaml | 62 +++++++++++++++++-- ...xtcloud-aio-talk-recording-deployment.yaml | 38 ++++++++++-- .../nextcloud-aio-talk-recording-service.yaml | 5 +- .../templates/nextcloud-aio-talk-service.yaml | 10 +-- nextcloud-aio-helm-chart/values.yaml | 1 + 38 files changed, 306 insertions(+), 100 deletions(-) create mode 100755 nextcloud-aio-helm-chart/templates/nextcloud-aio-namespace-namespace.yaml delete mode 100755 nextcloud-aio-helm-chart/templates/nextcloud-aio-networkpolicy.yaml diff --git a/nextcloud-aio-helm-chart/Chart.yaml b/nextcloud-aio-helm-chart/Chart.yaml index 5a3378c3a2e..73791c8b8f6 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.2.1 +version: 6.3.0 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 4b4b81048cb..50e8d2a06ff 100755 --- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-apache-deployment.yaml +++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-apache-deployment.yaml @@ -2,11 +2,12 @@ apiVersion: apps/v1 kind: Deployment metadata: annotations: - kompose.cmd: kompose convert -c -f latest.yml - kompose.version: 1.28.0 (c4137012e) + kompose.cmd: kompose convert -c -f latest.yml --namespace {{ values.NAMESPACE }} + kompose.version: 1.30.0 (9d8dcb518) labels: io.kompose.service: nextcloud-aio-apache name: nextcloud-aio-apache + namespace: {{ values.NAMESPACE }} spec: replicas: 1 selector: @@ -15,8 +16,8 @@ spec: template: metadata: annotations: - kompose.cmd: kompose convert -c -f latest.yml - kompose.version: 1.28.0 (c4137012e) + kompose.cmd: kompose convert -c -f latest.yml --namespace {{ values.NAMESPACE }} + kompose.version: 1.30.0 (9d8dcb518) labels: io.kompose.network/nextcloud-aio: "true" io.kompose.service: nextcloud-aio-apache @@ -29,7 +30,22 @@ spec: - "777" - /nextcloud-aio-nextcloud - /nextcloud-aio-apache + - /nextcloud-aio-apache-tmpfs0 + - /nextcloud-aio-apache-tmpfs1 + - /nextcloud-aio-apache-tmpfs2 + - /nextcloud-aio-apache-tmpfs3 + - /nextcloud-aio-apache-tmpfs4 volumeMounts: + - name: nextcloud-aio-apache-tmpfs4 + mountPath: /nextcloud-aio-apache-tmpfs4 + - name: nextcloud-aio-apache-tmpfs3 + mountPath: /nextcloud-aio-apache-tmpfs3 + - name: nextcloud-aio-apache-tmpfs2 + mountPath: /nextcloud-aio-apache-tmpfs2 + - name: nextcloud-aio-apache-tmpfs1 + mountPath: /nextcloud-aio-apache-tmpfs1 + - name: nextcloud-aio-apache-tmpfs0 + mountPath: /nextcloud-aio-apache-tmpfs0 - name: nextcloud-aio-apache mountPath: /nextcloud-aio-apache - name: nextcloud-aio-nextcloud @@ -56,16 +72,33 @@ spec: value: nextcloud-aio-talk - name: TZ value: "{{ .Values.TIMEZONE }}" - image: nextcloud/aio-apache:20230626_101439-latest + image: nextcloud/aio-apache:20230720_134150-latest name: nextcloud-aio-apache ports: - containerPort: {{ .Values.APACHE_PORT }} + hostPort: {{ .Values.APACHE_PORT }} + protocol: TCP + - containerPort: {{ .Values.APACHE_PORT }} + hostPort: {{ .Values.APACHE_PORT }} + protocol: UDP + securityContext: + readOnlyRootFilesystem: true volumeMounts: - mountPath: /var/www/html name: nextcloud-aio-nextcloud readOnly: true - mountPath: /mnt/data name: nextcloud-aio-apache + - mountPath: /var/log/supervisord + name: nextcloud-aio-apache-tmpfs0 + - mountPath: /var/run/supervisord + name: nextcloud-aio-apache-tmpfs1 + - mountPath: /usr/local/apache2/logs + name: nextcloud-aio-apache-tmpfs2 + - mountPath: /tmp + name: nextcloud-aio-apache-tmpfs3 + - mountPath: /home/www-data + name: nextcloud-aio-apache-tmpfs4 volumes: - name: nextcloud-aio-nextcloud persistentVolumeClaim: @@ -73,3 +106,13 @@ spec: - name: nextcloud-aio-apache persistentVolumeClaim: claimName: nextcloud-aio-apache + - emptyDir: {} + name: nextcloud-aio-apache-tmpfs0 + - emptyDir: {} + name: nextcloud-aio-apache-tmpfs1 + - emptyDir: {} + name: nextcloud-aio-apache-tmpfs2 + - emptyDir: {} + name: nextcloud-aio-apache-tmpfs3 + - emptyDir: {} + name: nextcloud-aio-apache-tmpfs4 diff --git a/nextcloud-aio-helm-chart/templates/nextcloud-aio-apache-persistentvolumeclaim.yaml b/nextcloud-aio-helm-chart/templates/nextcloud-aio-apache-persistentvolumeclaim.yaml index 35c851a6e08..9e1c054f7b0 100755 --- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-apache-persistentvolumeclaim.yaml +++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-apache-persistentvolumeclaim.yaml @@ -4,6 +4,7 @@ metadata: labels: io.kompose.service: nextcloud-aio-apache name: nextcloud-aio-apache + namespace: {{ values.NAMESPACE }} spec: {{- if .Values.STORAGE_CLASS }} storageClassName: {{ .Values.STORAGE_CLASS }} diff --git a/nextcloud-aio-helm-chart/templates/nextcloud-aio-apache-service.yaml b/nextcloud-aio-helm-chart/templates/nextcloud-aio-apache-service.yaml index 62403fac51f..d2335482512 100755 --- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-apache-service.yaml +++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-apache-service.yaml @@ -2,16 +2,21 @@ apiVersion: v1 kind: Service metadata: annotations: - kompose.cmd: kompose convert -c -f latest.yml - kompose.version: 1.28.0 (c4137012e) + kompose.cmd: kompose convert -c -f latest.yml --namespace {{ values.NAMESPACE }} + kompose.version: 1.30.0 (9d8dcb518) labels: io.kompose.service: nextcloud-aio-apache name: nextcloud-aio-apache + namespace: {{ values.NAMESPACE }} spec: type: LoadBalancer ports: - name: "{{ .Values.APACHE_PORT }}" port: {{ .Values.APACHE_PORT }} targetPort: {{ .Values.APACHE_PORT }} + - name: {{ .Values.APACHE_PORT }}-udp + port: {{ .Values.APACHE_PORT }} + protocol: UDP + targetPort: {{ .Values.APACHE_PORT }} selector: io.kompose.service: nextcloud-aio-apache 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 7e70fbbb106..1ce4053dbc1 100755 --- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-clamav-deployment.yaml +++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-clamav-deployment.yaml @@ -3,11 +3,12 @@ apiVersion: apps/v1 kind: Deployment metadata: annotations: - kompose.cmd: kompose convert -c -f latest.yml - kompose.version: 1.28.0 (c4137012e) + kompose.cmd: kompose convert -c -f latest.yml --namespace {{ values.NAMESPACE }} + kompose.version: 1.30.0 (9d8dcb518) labels: io.kompose.service: nextcloud-aio-clamav name: nextcloud-aio-clamav + namespace: {{ values.NAMESPACE }} spec: replicas: 1 selector: @@ -16,8 +17,8 @@ spec: template: metadata: annotations: - kompose.cmd: kompose convert -c -f latest.yml - kompose.version: 1.28.0 (c4137012e) + kompose.cmd: kompose convert -c -f latest.yml --namespace {{ values.NAMESPACE }} + kompose.version: 1.30.0 (9d8dcb518) labels: io.kompose.network/nextcloud-aio: "true" io.kompose.service: nextcloud-aio-clamav @@ -47,10 +48,14 @@ spec: value: "90" - name: TZ value: "{{ .Values.TIMEZONE }}" - image: nextcloud/aio-clamav:20230626_101439-latest + image: nextcloud/aio-clamav:20230720_134150-latest name: nextcloud-aio-clamav ports: - containerPort: 3310 + hostPort: 3310 + protocol: TCP + securityContext: + readOnlyRootFilesystem: true volumeMounts: - mountPath: /var/lib/clamav name: nextcloud-aio-clamav diff --git a/nextcloud-aio-helm-chart/templates/nextcloud-aio-clamav-persistentvolumeclaim.yaml b/nextcloud-aio-helm-chart/templates/nextcloud-aio-clamav-persistentvolumeclaim.yaml index 68709d1ff2b..f0f624fb9b4 100755 --- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-clamav-persistentvolumeclaim.yaml +++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-clamav-persistentvolumeclaim.yaml @@ -4,6 +4,7 @@ metadata: labels: io.kompose.service: nextcloud-aio-clamav name: nextcloud-aio-clamav + namespace: {{ values.NAMESPACE }} spec: {{- if .Values.STORAGE_CLASS }} storageClassName: {{ .Values.STORAGE_CLASS }} diff --git a/nextcloud-aio-helm-chart/templates/nextcloud-aio-clamav-service.yaml b/nextcloud-aio-helm-chart/templates/nextcloud-aio-clamav-service.yaml index 908a7baedc8..c7368821024 100755 --- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-clamav-service.yaml +++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-clamav-service.yaml @@ -3,11 +3,12 @@ apiVersion: v1 kind: Service metadata: annotations: - kompose.cmd: kompose convert -c -f latest.yml - kompose.version: 1.28.0 (c4137012e) + kompose.cmd: kompose convert -c -f latest.yml --namespace {{ values.NAMESPACE }} + kompose.version: 1.30.0 (9d8dcb518) labels: io.kompose.service: nextcloud-aio-clamav name: nextcloud-aio-clamav + namespace: {{ values.NAMESPACE }} spec: ports: - name: "3310" 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 1c6fccbd4d9..963a565dfe5 100755 --- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-collabora-deployment.yaml +++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-collabora-deployment.yaml @@ -3,11 +3,12 @@ apiVersion: apps/v1 kind: Deployment metadata: annotations: - kompose.cmd: kompose convert -c -f latest.yml - kompose.version: 1.28.0 (c4137012e) + kompose.cmd: kompose convert -c -f latest.yml --namespace {{ values.NAMESPACE }} + kompose.version: 1.30.0 (9d8dcb518) labels: io.kompose.service: nextcloud-aio-collabora name: nextcloud-aio-collabora + namespace: {{ values.NAMESPACE }} spec: replicas: 1 selector: @@ -16,8 +17,8 @@ spec: template: metadata: annotations: - kompose.cmd: kompose convert -c -f latest.yml - kompose.version: 1.28.0 (c4137012e) + kompose.cmd: kompose convert -c -f latest.yml --namespace {{ values.NAMESPACE }} + kompose.version: 1.30.0 (9d8dcb518) labels: io.kompose.network/nextcloud-aio: "true" io.kompose.service: nextcloud-aio-collabora @@ -36,8 +37,10 @@ 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:20230626_101439-latest + image: nextcloud/aio-collabora:20230720_134150-latest name: nextcloud-aio-collabora ports: - containerPort: 9980 + hostPort: 9980 + protocol: TCP {{- end }} diff --git a/nextcloud-aio-helm-chart/templates/nextcloud-aio-collabora-service.yaml b/nextcloud-aio-helm-chart/templates/nextcloud-aio-collabora-service.yaml index 3e953d72a9a..ec0cce0ab75 100755 --- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-collabora-service.yaml +++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-collabora-service.yaml @@ -3,11 +3,12 @@ apiVersion: v1 kind: Service metadata: annotations: - kompose.cmd: kompose convert -c -f latest.yml - kompose.version: 1.28.0 (c4137012e) + kompose.cmd: kompose convert -c -f latest.yml --namespace {{ values.NAMESPACE }} + kompose.version: 1.30.0 (9d8dcb518) labels: io.kompose.service: nextcloud-aio-collabora name: nextcloud-aio-collabora + namespace: {{ values.NAMESPACE }} spec: ports: - name: "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 eff50ee695d..4725049eeae 100755 --- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-database-deployment.yaml +++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-database-deployment.yaml @@ -2,11 +2,12 @@ apiVersion: apps/v1 kind: Deployment metadata: annotations: - kompose.cmd: kompose convert -c -f latest.yml - kompose.version: 1.28.0 (c4137012e) + kompose.cmd: kompose convert -c -f latest.yml --namespace {{ values.NAMESPACE }} + kompose.version: 1.30.0 (9d8dcb518) labels: io.kompose.service: nextcloud-aio-database name: nextcloud-aio-database + namespace: {{ values.NAMESPACE }} spec: replicas: 1 selector: @@ -15,8 +16,8 @@ spec: template: metadata: annotations: - kompose.cmd: kompose convert -c -f latest.yml - kompose.version: 1.28.0 (c4137012e) + kompose.cmd: kompose convert -c -f latest.yml --namespace {{ values.NAMESPACE }} + kompose.version: 1.30.0 (9d8dcb518) labels: io.kompose.network/nextcloud-aio: "true" io.kompose.service: nextcloud-aio-database @@ -30,7 +31,10 @@ spec: - /nextcloud-aio-database/data - /nextcloud-aio-database - /nextcloud-aio-database-dump + - /nextcloud-aio-database-tmpfs0 volumeMounts: + - name: nextcloud-aio-database-tmpfs0 + mountPath: /nextcloud-aio-database-tmpfs0 - name: nextcloud-aio-database-dump mountPath: /nextcloud-aio-database-dump - name: nextcloud-aio-database @@ -43,7 +47,10 @@ spec: - "-R" - /nextcloud-aio-database - /nextcloud-aio-database-dump + - /nextcloud-aio-database-tmpfs0 volumeMounts: + - name: nextcloud-aio-database-tmpfs0 + mountPath: /nextcloud-aio-database-tmpfs0 - name: nextcloud-aio-database-dump mountPath: /nextcloud-aio-database-dump - name: nextcloud-aio-database @@ -60,16 +67,22 @@ spec: value: nextcloud - name: TZ value: "{{ .Values.TIMEZONE }}" - image: nextcloud/aio-postgresql:20230626_101439-latest + image: nextcloud/aio-postgresql:20230720_134150-latest name: nextcloud-aio-database ports: - containerPort: 5432 + hostPort: 5432 + protocol: TCP + securityContext: + readOnlyRootFilesystem: true volumeMounts: - mountPath: /var/lib/postgresql/data subPath: data name: nextcloud-aio-database - mountPath: /mnt/data name: nextcloud-aio-database-dump + - mountPath: /var/run/postgresql + name: nextcloud-aio-database-tmpfs0 terminationGracePeriodSeconds: 1800 volumes: - name: nextcloud-aio-database @@ -78,3 +91,5 @@ spec: - name: nextcloud-aio-database-dump persistentVolumeClaim: claimName: nextcloud-aio-database-dump + - emptyDir: {} + name: nextcloud-aio-database-tmpfs0 diff --git a/nextcloud-aio-helm-chart/templates/nextcloud-aio-database-dump-persistentvolumeclaim.yaml b/nextcloud-aio-helm-chart/templates/nextcloud-aio-database-dump-persistentvolumeclaim.yaml index 78ff674201b..2e37c19cde7 100755 --- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-database-dump-persistentvolumeclaim.yaml +++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-database-dump-persistentvolumeclaim.yaml @@ -4,6 +4,7 @@ metadata: labels: io.kompose.service: nextcloud-aio-database-dump name: nextcloud-aio-database-dump + namespace: {{ values.NAMESPACE }} spec: {{- if .Values.STORAGE_CLASS }} storageClassName: {{ .Values.STORAGE_CLASS }} diff --git a/nextcloud-aio-helm-chart/templates/nextcloud-aio-database-persistentvolumeclaim.yaml b/nextcloud-aio-helm-chart/templates/nextcloud-aio-database-persistentvolumeclaim.yaml index a8522aaec00..6c55b56fb96 100755 --- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-database-persistentvolumeclaim.yaml +++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-database-persistentvolumeclaim.yaml @@ -4,6 +4,7 @@ metadata: labels: io.kompose.service: nextcloud-aio-database name: nextcloud-aio-database + namespace: {{ values.NAMESPACE }} spec: {{- if .Values.STORAGE_CLASS }} storageClassName: {{ .Values.STORAGE_CLASS }} diff --git a/nextcloud-aio-helm-chart/templates/nextcloud-aio-database-service.yaml b/nextcloud-aio-helm-chart/templates/nextcloud-aio-database-service.yaml index f32b53c81a4..c3586446815 100755 --- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-database-service.yaml +++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-database-service.yaml @@ -2,11 +2,12 @@ apiVersion: v1 kind: Service metadata: annotations: - kompose.cmd: kompose convert -c -f latest.yml - kompose.version: 1.28.0 (c4137012e) + kompose.cmd: kompose convert -c -f latest.yml --namespace {{ values.NAMESPACE }} + kompose.version: 1.30.0 (9d8dcb518) labels: io.kompose.service: nextcloud-aio-database name: nextcloud-aio-database + namespace: {{ values.NAMESPACE }} spec: ports: - name: "5432" diff --git a/nextcloud-aio-helm-chart/templates/nextcloud-aio-elasticsearch-persistentvolumeclaim.yaml b/nextcloud-aio-helm-chart/templates/nextcloud-aio-elasticsearch-persistentvolumeclaim.yaml index 8ec6bbb48b2..74ee81e9d1f 100755 --- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-elasticsearch-persistentvolumeclaim.yaml +++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-elasticsearch-persistentvolumeclaim.yaml @@ -4,6 +4,7 @@ metadata: labels: io.kompose.service: nextcloud-aio-elasticsearch name: nextcloud-aio-elasticsearch + namespace: {{ values.NAMESPACE }} spec: {{- if .Values.STORAGE_CLASS }} storageClassName: {{ .Values.STORAGE_CLASS }} 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 99ca8d787b3..2dbe316b48b 100755 --- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-fulltextsearch-deployment.yaml +++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-fulltextsearch-deployment.yaml @@ -3,11 +3,12 @@ apiVersion: apps/v1 kind: Deployment metadata: annotations: - kompose.cmd: kompose convert -c -f latest.yml - kompose.version: 1.28.0 (c4137012e) + kompose.cmd: kompose convert -c -f latest.yml --namespace {{ values.NAMESPACE }} + kompose.version: 1.30.0 (9d8dcb518) labels: io.kompose.service: nextcloud-aio-fulltextsearch name: nextcloud-aio-fulltextsearch + namespace: {{ values.NAMESPACE }} spec: replicas: 1 selector: @@ -16,8 +17,8 @@ spec: template: metadata: annotations: - kompose.cmd: kompose convert -c -f latest.yml - kompose.version: 1.28.0 (c4137012e) + kompose.cmd: kompose convert -c -f latest.yml --namespace {{ values.NAMESPACE }} + kompose.version: 1.30.0 (9d8dcb518) labels: io.kompose.network/nextcloud-aio: "true" io.kompose.service: nextcloud-aio-fulltextsearch @@ -42,10 +43,12 @@ spec: value: "{{ .Values.TIMEZONE }}" - name: discovery.type value: single-node - image: nextcloud/aio-fulltextsearch:20230626_101439-latest + image: nextcloud/aio-fulltextsearch:20230720_134150-latest name: nextcloud-aio-fulltextsearch ports: - containerPort: 9200 + hostPort: 9200 + protocol: TCP volumeMounts: - mountPath: /usr/share/elasticsearch/data name: nextcloud-aio-elasticsearch diff --git a/nextcloud-aio-helm-chart/templates/nextcloud-aio-fulltextsearch-service.yaml b/nextcloud-aio-helm-chart/templates/nextcloud-aio-fulltextsearch-service.yaml index 9f7618615b0..f0a4a491ab3 100755 --- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-fulltextsearch-service.yaml +++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-fulltextsearch-service.yaml @@ -3,11 +3,12 @@ apiVersion: v1 kind: Service metadata: annotations: - kompose.cmd: kompose convert -c -f latest.yml - kompose.version: 1.28.0 (c4137012e) + kompose.cmd: kompose convert -c -f latest.yml --namespace {{ values.NAMESPACE }} + kompose.version: 1.30.0 (9d8dcb518) labels: io.kompose.service: nextcloud-aio-fulltextsearch name: nextcloud-aio-fulltextsearch + namespace: {{ values.NAMESPACE }} spec: ports: - name: "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 661eab83966..9d7960f739d 100755 --- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-imaginary-deployment.yaml +++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-imaginary-deployment.yaml @@ -3,11 +3,12 @@ apiVersion: apps/v1 kind: Deployment metadata: annotations: - kompose.cmd: kompose convert -c -f latest.yml - kompose.version: 1.28.0 (c4137012e) + kompose.cmd: kompose convert -c -f latest.yml --namespace {{ values.NAMESPACE }} + kompose.version: 1.30.0 (9d8dcb518) labels: io.kompose.service: nextcloud-aio-imaginary name: nextcloud-aio-imaginary + namespace: {{ values.NAMESPACE }} spec: replicas: 1 selector: @@ -16,22 +17,41 @@ spec: template: metadata: annotations: - kompose.cmd: kompose convert -c -f latest.yml - kompose.version: 1.28.0 (c4137012e) + kompose.cmd: kompose convert -c -f latest.yml --namespace {{ values.NAMESPACE }} + kompose.version: 1.30.0 (9d8dcb518) labels: io.kompose.network/nextcloud-aio: "true" io.kompose.service: nextcloud-aio-imaginary spec: + initContainers: + - name: init-volumes + image: alpine + command: + - chmod + - "777" + - /nextcloud-aio-imaginary-tmpfs0 + volumeMounts: + - name: nextcloud-aio-imaginary-tmpfs0 + mountPath: /nextcloud-aio-imaginary-tmpfs0 containers: - env: - name: TZ value: "{{ .Values.TIMEZONE }}" - image: nextcloud/aio-imaginary:20230626_101439-latest + image: nextcloud/aio-imaginary:20230720_134150-latest name: nextcloud-aio-imaginary ports: - containerPort: 9000 + hostPort: 9000 + protocol: TCP securityContext: capabilities: add: - SYS_NICE + readOnlyRootFilesystem: true + volumeMounts: + - mountPath: /tmp + name: nextcloud-aio-imaginary-tmpfs0 + volumes: + - emptyDir: {} + name: nextcloud-aio-imaginary-tmpfs0 {{- end }} diff --git a/nextcloud-aio-helm-chart/templates/nextcloud-aio-imaginary-service.yaml b/nextcloud-aio-helm-chart/templates/nextcloud-aio-imaginary-service.yaml index 824f7285f1e..f670890ee14 100755 --- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-imaginary-service.yaml +++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-imaginary-service.yaml @@ -3,11 +3,12 @@ apiVersion: v1 kind: Service metadata: annotations: - kompose.cmd: kompose convert -c -f latest.yml - kompose.version: 1.28.0 (c4137012e) + kompose.cmd: kompose convert -c -f latest.yml --namespace {{ values.NAMESPACE }} + kompose.version: 1.30.0 (9d8dcb518) labels: io.kompose.service: nextcloud-aio-imaginary name: nextcloud-aio-imaginary + namespace: {{ values.NAMESPACE }} spec: ports: - name: "9000" diff --git a/nextcloud-aio-helm-chart/templates/nextcloud-aio-namespace-namespace.yaml b/nextcloud-aio-helm-chart/templates/nextcloud-aio-namespace-namespace.yaml new file mode 100755 index 00000000000..092deeaf80e --- /dev/null +++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-namespace-namespace.yaml @@ -0,0 +1,6 @@ +apiVersion: v1 +kind: Namespace +metadata: + name: {{ values.NAMESPACE }} + namespace: {{ values.NAMESPACE }} +spec: {} diff --git a/nextcloud-aio-helm-chart/templates/nextcloud-aio-networkpolicy.yaml b/nextcloud-aio-helm-chart/templates/nextcloud-aio-networkpolicy.yaml deleted file mode 100755 index 6f63b3c063c..00000000000 --- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-networkpolicy.yaml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: networking.k8s.io/v1 -kind: NetworkPolicy -metadata: - name: nextcloud-aio -spec: - ingress: - - from: - - podSelector: - matchLabels: - io.kompose.network/nextcloud-aio: "true" - podSelector: - matchLabels: - io.kompose.network/nextcloud-aio: "true" diff --git a/nextcloud-aio-helm-chart/templates/nextcloud-aio-nextcloud-data-persistentvolumeclaim.yaml b/nextcloud-aio-helm-chart/templates/nextcloud-aio-nextcloud-data-persistentvolumeclaim.yaml index 50594a1f9bb..08cccf5bce8 100755 --- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-nextcloud-data-persistentvolumeclaim.yaml +++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-nextcloud-data-persistentvolumeclaim.yaml @@ -4,6 +4,7 @@ metadata: labels: io.kompose.service: nextcloud-aio-nextcloud-data name: nextcloud-aio-nextcloud-data + namespace: {{ values.NAMESPACE }} spec: {{- if .Values.STORAGE_CLASS }} storageClassName: {{ .Values.STORAGE_CLASS }} 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 a1352fabbf2..effce8811b5 100755 --- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-nextcloud-deployment.yaml +++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-nextcloud-deployment.yaml @@ -2,11 +2,12 @@ apiVersion: apps/v1 kind: Deployment metadata: annotations: - kompose.cmd: kompose convert -c -f latest.yml - kompose.version: 1.28.0 (c4137012e) + kompose.cmd: kompose convert -c -f latest.yml --namespace {{ values.NAMESPACE }} + kompose.version: 1.30.0 (9d8dcb518) labels: io.kompose.service: nextcloud-aio-nextcloud name: nextcloud-aio-nextcloud + namespace: {{ values.NAMESPACE }} spec: replicas: 1 selector: @@ -15,8 +16,8 @@ spec: template: metadata: annotations: - kompose.cmd: kompose convert -c -f latest.yml - kompose.version: 1.28.0 (c4137012e) + kompose.cmd: kompose convert -c -f latest.yml --namespace {{ values.NAMESPACE }} + kompose.version: 1.30.0 (9d8dcb518) labels: io.kompose.network/nextcloud-aio: "true" io.kompose.service: nextcloud-aio-nextcloud @@ -116,10 +117,12 @@ spec: value: "{{ .Values.TIMEZONE }}" - name: UPDATE_NEXTCLOUD_APPS value: "{{ .Values.UPDATE_NEXTCLOUD_APPS }}" - image: nextcloud/aio-nextcloud:20230626_101439-latest + image: nextcloud/aio-nextcloud:20230720_134150-latest name: nextcloud-aio-nextcloud ports: - containerPort: 9000 + hostPort: 9000 + protocol: TCP volumeMounts: - mountPath: /var/www/html name: nextcloud-aio-nextcloud diff --git a/nextcloud-aio-helm-chart/templates/nextcloud-aio-nextcloud-persistentvolumeclaim.yaml b/nextcloud-aio-helm-chart/templates/nextcloud-aio-nextcloud-persistentvolumeclaim.yaml index d07e3b61675..5b118c819ee 100755 --- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-nextcloud-persistentvolumeclaim.yaml +++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-nextcloud-persistentvolumeclaim.yaml @@ -4,6 +4,7 @@ metadata: labels: io.kompose.service: nextcloud-aio-nextcloud name: nextcloud-aio-nextcloud + namespace: {{ values.NAMESPACE }} spec: {{- if .Values.STORAGE_CLASS }} storageClassName: {{ .Values.STORAGE_CLASS }} 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 a5de6eefd95..687444e888c 100755 --- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-nextcloud-service.yaml +++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-nextcloud-service.yaml @@ -2,11 +2,12 @@ apiVersion: v1 kind: Service metadata: annotations: - kompose.cmd: kompose convert -c -f latest.yml - kompose.version: 1.28.0 (c4137012e) + kompose.cmd: kompose convert -c -f latest.yml --namespace {{ values.NAMESPACE }} + kompose.version: 1.30.0 (9d8dcb518) labels: io.kompose.service: nextcloud-aio-nextcloud name: nextcloud-aio-nextcloud + namespace: {{ values.NAMESPACE }} spec: ports: - name: "9000" diff --git a/nextcloud-aio-helm-chart/templates/nextcloud-aio-nextcloud-trusted-cacerts-persistentvolumeclaim.yaml b/nextcloud-aio-helm-chart/templates/nextcloud-aio-nextcloud-trusted-cacerts-persistentvolumeclaim.yaml index 58384bde24a..16ea936be76 100755 --- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-nextcloud-trusted-cacerts-persistentvolumeclaim.yaml +++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-nextcloud-trusted-cacerts-persistentvolumeclaim.yaml @@ -4,6 +4,7 @@ metadata: labels: io.kompose.service: nextcloud-aio-nextcloud-trusted-cacerts name: nextcloud-aio-nextcloud-trusted-cacerts + namespace: {{ values.NAMESPACE }} spec: {{- if .Values.STORAGE_CLASS }} storageClassName: {{ .Values.STORAGE_CLASS }} 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 index 67d50d18f11..d0ee6bc0b54 100755 --- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-notify-push-deployment.yaml +++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-notify-push-deployment.yaml @@ -2,11 +2,12 @@ apiVersion: apps/v1 kind: Deployment metadata: annotations: - kompose.cmd: kompose convert -c -f latest.yml - kompose.version: 1.28.0 (c4137012e) + kompose.cmd: kompose convert -c -f latest.yml --namespace {{ values.NAMESPACE }} + kompose.version: 1.30.0 (9d8dcb518) labels: io.kompose.service: nextcloud-aio-notify-push name: nextcloud-aio-notify-push + namespace: {{ values.NAMESPACE }} spec: replicas: 1 selector: @@ -15,8 +16,8 @@ spec: template: metadata: annotations: - kompose.cmd: kompose convert -c -f latest.yml - kompose.version: 1.28.0 (c4137012e) + kompose.cmd: kompose convert -c -f latest.yml --namespace {{ values.NAMESPACE }} + kompose.version: 1.30.0 (9d8dcb518) labels: io.kompose.network/nextcloud-aio: "true" io.kompose.service: nextcloud-aio-notify-push @@ -49,10 +50,14 @@ spec: value: nextcloud-aio-redis - name: REDIS_HOST_PASSWORD value: "{{ .Values.REDIS_PASSWORD }}" - image: nextcloud/aio-notify-push:20230626_101439-latest + image: nextcloud/aio-notify-push:20230720_134150-latest name: nextcloud-aio-notify-push ports: - containerPort: 7867 + hostPort: 7867 + protocol: TCP + securityContext: + readOnlyRootFilesystem: true volumeMounts: - mountPath: /nextcloud name: 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 index 6a7d17ddace..7f709528d3d 100755 --- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-notify-push-service.yaml +++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-notify-push-service.yaml @@ -2,11 +2,12 @@ apiVersion: v1 kind: Service metadata: annotations: - kompose.cmd: kompose convert -c -f latest.yml - kompose.version: 1.28.0 (c4137012e) + kompose.cmd: kompose convert -c -f latest.yml --namespace {{ values.NAMESPACE }} + kompose.version: 1.30.0 (9d8dcb518) labels: io.kompose.service: nextcloud-aio-notify-push name: nextcloud-aio-notify-push + namespace: {{ values.NAMESPACE }} spec: ports: - name: "7867" 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 33536e82c17..5d6c562f86d 100755 --- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-onlyoffice-deployment.yaml +++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-onlyoffice-deployment.yaml @@ -3,11 +3,12 @@ apiVersion: apps/v1 kind: Deployment metadata: annotations: - kompose.cmd: kompose convert -c -f latest.yml - kompose.version: 1.28.0 (c4137012e) + kompose.cmd: kompose convert -c -f latest.yml --namespace {{ values.NAMESPACE }} + kompose.version: 1.30.0 (9d8dcb518) labels: io.kompose.service: nextcloud-aio-onlyoffice name: nextcloud-aio-onlyoffice + namespace: {{ values.NAMESPACE }} spec: replicas: 1 selector: @@ -16,8 +17,8 @@ spec: template: metadata: annotations: - kompose.cmd: kompose convert -c -f latest.yml - kompose.version: 1.28.0 (c4137012e) + kompose.cmd: kompose convert -c -f latest.yml --namespace {{ values.NAMESPACE }} + kompose.version: 1.30.0 (9d8dcb518) labels: io.kompose.network/nextcloud-aio: "true" io.kompose.service: nextcloud-aio-onlyoffice @@ -42,10 +43,12 @@ spec: value: "{{ .Values.ONLYOFFICE_SECRET }}" - name: TZ value: "{{ .Values.TIMEZONE }}" - image: nextcloud/aio-onlyoffice:20230626_101439-latest + image: nextcloud/aio-onlyoffice:20230720_134150-latest name: nextcloud-aio-onlyoffice ports: - containerPort: 80 + hostPort: 80 + protocol: TCP volumeMounts: - mountPath: /var/lib/onlyoffice name: nextcloud-aio-onlyoffice diff --git a/nextcloud-aio-helm-chart/templates/nextcloud-aio-onlyoffice-persistentvolumeclaim.yaml b/nextcloud-aio-helm-chart/templates/nextcloud-aio-onlyoffice-persistentvolumeclaim.yaml index 674ad7b656b..4ed689e33ef 100755 --- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-onlyoffice-persistentvolumeclaim.yaml +++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-onlyoffice-persistentvolumeclaim.yaml @@ -4,6 +4,7 @@ metadata: labels: io.kompose.service: nextcloud-aio-onlyoffice name: nextcloud-aio-onlyoffice + namespace: {{ values.NAMESPACE }} spec: {{- if .Values.STORAGE_CLASS }} storageClassName: {{ .Values.STORAGE_CLASS }} diff --git a/nextcloud-aio-helm-chart/templates/nextcloud-aio-onlyoffice-service.yaml b/nextcloud-aio-helm-chart/templates/nextcloud-aio-onlyoffice-service.yaml index d324453e27a..391b723f670 100755 --- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-onlyoffice-service.yaml +++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-onlyoffice-service.yaml @@ -3,11 +3,12 @@ apiVersion: v1 kind: Service metadata: annotations: - kompose.cmd: kompose convert -c -f latest.yml - kompose.version: 1.28.0 (c4137012e) + kompose.cmd: kompose convert -c -f latest.yml --namespace {{ values.NAMESPACE }} + kompose.version: 1.30.0 (9d8dcb518) labels: io.kompose.service: nextcloud-aio-onlyoffice name: nextcloud-aio-onlyoffice + namespace: {{ values.NAMESPACE }} spec: ports: - name: "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 3661e40882f..0fd0e7472f9 100755 --- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-redis-deployment.yaml +++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-redis-deployment.yaml @@ -2,11 +2,12 @@ apiVersion: apps/v1 kind: Deployment metadata: annotations: - kompose.cmd: kompose convert -c -f latest.yml - kompose.version: 1.28.0 (c4137012e) + kompose.cmd: kompose convert -c -f latest.yml --namespace {{ values.NAMESPACE }} + kompose.version: 1.30.0 (9d8dcb518) labels: io.kompose.service: nextcloud-aio-redis name: nextcloud-aio-redis + namespace: {{ values.NAMESPACE }} spec: replicas: 1 selector: @@ -15,8 +16,8 @@ spec: template: metadata: annotations: - kompose.cmd: kompose convert -c -f latest.yml - kompose.version: 1.28.0 (c4137012e) + kompose.cmd: kompose convert -c -f latest.yml --namespace {{ values.NAMESPACE }} + kompose.version: 1.30.0 (9d8dcb518) labels: io.kompose.network/nextcloud-aio: "true" io.kompose.service: nextcloud-aio-redis @@ -37,10 +38,14 @@ spec: value: "{{ .Values.REDIS_PASSWORD }}" - name: TZ value: "{{ .Values.TIMEZONE }}" - image: nextcloud/aio-redis:20230626_101439-latest + image: nextcloud/aio-redis:20230720_134150-latest name: nextcloud-aio-redis ports: - containerPort: 6379 + hostPort: 6379 + protocol: TCP + securityContext: + readOnlyRootFilesystem: true volumeMounts: - mountPath: /data name: nextcloud-aio-redis diff --git a/nextcloud-aio-helm-chart/templates/nextcloud-aio-redis-persistentvolumeclaim.yaml b/nextcloud-aio-helm-chart/templates/nextcloud-aio-redis-persistentvolumeclaim.yaml index 10f3e7dad3c..8e21d6d4e31 100755 --- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-redis-persistentvolumeclaim.yaml +++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-redis-persistentvolumeclaim.yaml @@ -4,6 +4,7 @@ metadata: labels: io.kompose.service: nextcloud-aio-redis name: nextcloud-aio-redis + namespace: {{ values.NAMESPACE }} spec: {{- if .Values.STORAGE_CLASS }} storageClassName: {{ .Values.STORAGE_CLASS }} diff --git a/nextcloud-aio-helm-chart/templates/nextcloud-aio-redis-service.yaml b/nextcloud-aio-helm-chart/templates/nextcloud-aio-redis-service.yaml index 82147c73cf0..9561d4217dd 100755 --- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-redis-service.yaml +++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-redis-service.yaml @@ -2,11 +2,12 @@ apiVersion: v1 kind: Service metadata: annotations: - kompose.cmd: kompose convert -c -f latest.yml - kompose.version: 1.28.0 (c4137012e) + kompose.cmd: kompose convert -c -f latest.yml --namespace {{ values.NAMESPACE }} + kompose.version: 1.30.0 (9d8dcb518) labels: io.kompose.service: nextcloud-aio-redis name: nextcloud-aio-redis + namespace: {{ values.NAMESPACE }} spec: ports: - name: "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 b2c47c6ec6d..ead28271eec 100755 --- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-talk-deployment.yaml +++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-talk-deployment.yaml @@ -3,11 +3,12 @@ apiVersion: apps/v1 kind: Deployment metadata: annotations: - kompose.cmd: kompose convert -c -f latest.yml - kompose.version: 1.28.0 (c4137012e) + kompose.cmd: kompose convert -c -f latest.yml --namespace {{ values.NAMESPACE }} + kompose.version: 1.30.0 (9d8dcb518) labels: io.kompose.service: nextcloud-aio-talk name: nextcloud-aio-talk + namespace: {{ values.NAMESPACE }} spec: replicas: 1 selector: @@ -16,12 +17,34 @@ spec: template: metadata: annotations: - kompose.cmd: kompose convert -c -f latest.yml - kompose.version: 1.28.0 (c4137012e) + kompose.cmd: kompose convert -c -f latest.yml --namespace {{ values.NAMESPACE }} + kompose.version: 1.30.0 (9d8dcb518) labels: io.kompose.network/nextcloud-aio: "true" io.kompose.service: nextcloud-aio-talk spec: + initContainers: + - name: init-volumes + image: alpine + command: + - chmod + - "777" + - /nextcloud-aio-talk-tmpfs0 + - /nextcloud-aio-talk-tmpfs1 + - /nextcloud-aio-talk-tmpfs2 + - /nextcloud-aio-talk-tmpfs3 + - /nextcloud-aio-talk-tmpfs4 + volumeMounts: + - name: nextcloud-aio-talk-tmpfs4 + mountPath: /nextcloud-aio-talk-tmpfs4 + - name: nextcloud-aio-talk-tmpfs3 + mountPath: /nextcloud-aio-talk-tmpfs3 + - name: nextcloud-aio-talk-tmpfs2 + mountPath: /nextcloud-aio-talk-tmpfs2 + - name: nextcloud-aio-talk-tmpfs1 + mountPath: /nextcloud-aio-talk-tmpfs1 + - name: nextcloud-aio-talk-tmpfs0 + mountPath: /nextcloud-aio-talk-tmpfs0 containers: - env: - name: INTERNAL_SECRET @@ -36,11 +59,40 @@ spec: value: "{{ .Values.TURN_SECRET }}" - name: TZ value: "{{ .Values.TIMEZONE }}" - image: nextcloud/aio-talk:20230626_101439-latest + image: nextcloud/aio-talk:20230720_134150-latest name: nextcloud-aio-talk ports: - containerPort: {{ .Values.TALK_PORT }} + hostPort: {{ .Values.TALK_PORT }} + protocol: TCP - containerPort: {{ .Values.TALK_PORT }} + hostPort: {{ .Values.TALK_PORT }} protocol: UDP - containerPort: 8081 + hostPort: 8081 + protocol: TCP + securityContext: + readOnlyRootFilesystem: true + volumeMounts: + - mountPath: /var/log/supervisord + name: nextcloud-aio-talk-tmpfs0 + - mountPath: /var/run/supervisord + name: nextcloud-aio-talk-tmpfs1 + - mountPath: /conf + name: nextcloud-aio-talk-tmpfs2 + - mountPath: /var/lib/turn + name: nextcloud-aio-talk-tmpfs3 + - mountPath: /tmp + name: nextcloud-aio-talk-tmpfs4 + volumes: + - emptyDir: {} + name: nextcloud-aio-talk-tmpfs0 + - emptyDir: {} + name: nextcloud-aio-talk-tmpfs1 + - emptyDir: {} + name: nextcloud-aio-talk-tmpfs2 + - emptyDir: {} + name: nextcloud-aio-talk-tmpfs3 + - emptyDir: {} + name: nextcloud-aio-talk-tmpfs4 {{- end }} 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 8b8a671f7ee..1f15ec0f6bc 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 @@ -3,11 +3,12 @@ apiVersion: apps/v1 kind: Deployment metadata: annotations: - kompose.cmd: kompose convert -c -f latest.yml - kompose.version: 1.28.0 (c4137012e) + kompose.cmd: kompose convert -c -f latest.yml --namespace {{ values.NAMESPACE }} + kompose.version: 1.30.0 (9d8dcb518) labels: io.kompose.service: nextcloud-aio-talk-recording name: nextcloud-aio-talk-recording + namespace: {{ values.NAMESPACE }} spec: replicas: 1 selector: @@ -16,12 +17,25 @@ spec: template: metadata: annotations: - kompose.cmd: kompose convert -c -f latest.yml - kompose.version: 1.28.0 (c4137012e) + kompose.cmd: kompose convert -c -f latest.yml --namespace {{ values.NAMESPACE }} + kompose.version: 1.30.0 (9d8dcb518) labels: io.kompose.network/nextcloud-aio: "true" io.kompose.service: nextcloud-aio-talk-recording spec: + initContainers: + - name: init-volumes + image: alpine + command: + - chmod + - "777" + - /nextcloud-aio-talk-recording-tmpfs0 + - /nextcloud-aio-talk-recording-tmpfs1 + volumeMounts: + - name: nextcloud-aio-talk-recording-tmpfs1 + mountPath: /nextcloud-aio-talk-recording-tmpfs1 + - name: nextcloud-aio-talk-recording-tmpfs0 + mountPath: /nextcloud-aio-talk-recording-tmpfs0 containers: - env: - name: INTERNAL_SECRET @@ -32,8 +46,22 @@ spec: value: "{{ .Values.RECORDING_SECRET }}" - name: TZ value: "{{ .Values.TIMEZONE }}" - image: nextcloud/aio-talk-recording:20230626_101439-latest + image: nextcloud/aio-talk-recording:20230720_134150-latest name: nextcloud-aio-talk-recording ports: - containerPort: 1234 + hostPort: 1234 + protocol: TCP + securityContext: + readOnlyRootFilesystem: true + volumeMounts: + - mountPath: /tmp + name: nextcloud-aio-talk-recording-tmpfs0 + - mountPath: /conf + name: nextcloud-aio-talk-recording-tmpfs1 + volumes: + - emptyDir: {} + name: nextcloud-aio-talk-recording-tmpfs0 + - emptyDir: {} + name: nextcloud-aio-talk-recording-tmpfs1 {{- end }} diff --git a/nextcloud-aio-helm-chart/templates/nextcloud-aio-talk-recording-service.yaml b/nextcloud-aio-helm-chart/templates/nextcloud-aio-talk-recording-service.yaml index 6315bd83a2e..0273319d130 100755 --- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-talk-recording-service.yaml +++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-talk-recording-service.yaml @@ -3,11 +3,12 @@ apiVersion: v1 kind: Service metadata: annotations: - kompose.cmd: kompose convert -c -f latest.yml - kompose.version: 1.28.0 (c4137012e) + kompose.cmd: kompose convert -c -f latest.yml --namespace {{ values.NAMESPACE }} + kompose.version: 1.30.0 (9d8dcb518) labels: io.kompose.service: nextcloud-aio-talk-recording name: nextcloud-aio-talk-recording + namespace: {{ values.NAMESPACE }} spec: ports: - name: "1234" diff --git a/nextcloud-aio-helm-chart/templates/nextcloud-aio-talk-service.yaml b/nextcloud-aio-helm-chart/templates/nextcloud-aio-talk-service.yaml index 22598b4bbd6..920fc8e7e3d 100755 --- a/nextcloud-aio-helm-chart/templates/nextcloud-aio-talk-service.yaml +++ b/nextcloud-aio-helm-chart/templates/nextcloud-aio-talk-service.yaml @@ -4,11 +4,12 @@ apiVersion: v1 kind: Service metadata: annotations: - kompose.cmd: kompose convert -c -f latest.yml - kompose.version: 1.28.0 (c4137012e) + kompose.cmd: kompose convert -c -f latest.yml --namespace {{ values.NAMESPACE }} + kompose.version: 1.30.0 (9d8dcb518) labels: io.kompose.service: nextcloud-aio-talk name: nextcloud-aio-talk-public + namespace: {{ values.NAMESPACE }} spec: type: LoadBalancer ports: @@ -26,11 +27,12 @@ apiVersion: v1 kind: Service metadata: annotations: - kompose.cmd: kompose convert -c -f latest.yml - kompose.version: 1.28.0 (c4137012e) + kompose.cmd: kompose convert -c -f latest.yml --namespace {{ values.NAMESPACE }} + kompose.version: 1.30.0 (9d8dcb518) labels: io.kompose.service: nextcloud-aio-talk name: nextcloud-aio-talk + namespace: {{ values.NAMESPACE }} spec: ports: - name: "8081" diff --git a/nextcloud-aio-helm-chart/values.yaml b/nextcloud-aio-helm-chart/values.yaml index 06e59ff74a0..76c39fed53a 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. +NAMESPACE: default # By changing this, you can adjust the namespace of the installation which allows to install multiple instances on one kubernetes cluster 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