Skip to content

Commit

Permalink
Merge pull request #2998 from nextcloud/aio-helm-update
Browse files Browse the repository at this point in the history
Helm Chart updates
  • Loading branch information
szaimen authored Jul 20, 2023
2 parents b5831bf + fb6ca4b commit 40dfd4c
Show file tree
Hide file tree
Showing 38 changed files with 306 additions and 100 deletions.
2 changes: 1 addition & 1 deletion nextcloud-aio-helm-chart/Chart.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand All @@ -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
Expand All @@ -56,20 +72,47 @@ 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:
claimName: nextcloud-aio-nextcloud
- 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
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand All @@ -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 }}
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -78,3 +91,5 @@ spec:
- name: nextcloud-aio-database-dump
persistentVolumeClaim:
claimName: nextcloud-aio-database-dump
- emptyDir: {}
name: nextcloud-aio-database-tmpfs0
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
Loading

0 comments on commit 40dfd4c

Please sign in to comment.