nextcloud/all-in-one
1
1
Fork 0
mirror of https://github.com/nextcloud/all-in-one.git synced 2024-09-20 14:56:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

Reflect changes in update-helm.sh and fix templating for unset values

Browse source 
Signed-off-by: Dennis R <dennis@elsysweyr.com>
This commit is contained in:
Dennis R 2024-03-11 23:33:56 +01:00 committed by Simon L
parent f9e78ba35e
commit 5b3658c6a0
9 changed files with 73 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
nextcloud-aio-helm-chart/templates/nextcloud-aio-apache-deployment.yaml
View file

@ -26,7 +26,11 @@ spec:
spec: spec:
initContainers: initContainers:
- name: init-volumes - name: init-volumes
{{- if or .Values.IMAGE_MIRROR_PREFIX .Values.ALPINE_IMAGE_ORG }}
image: "{{ .Values.IMAGE_MIRROR_PREFIX }}{{ .Values.ALPINE_IMAGE_ORG}}/alpine" image: "{{ .Values.IMAGE_MIRROR_PREFIX }}{{ .Values.ALPINE_IMAGE_ORG}}/alpine"
{{- else }}
image: alpine
{{- end }}
command: command:
- chmod - chmod
- "777" - "777"
@ -50,7 +54,7 @@ spec:
- name: COLLABORA_HOST - name: COLLABORA_HOST
value: nextcloud-aio-collabora value: nextcloud-aio-collabora
- name: NC_DOMAIN - name: NC_DOMAIN
value: "{{ .Values.NC_DOMAIN }}"FF value: "{{ .Values.NC_DOMAIN }}"
- name: NEXTCLOUD_HOST - name: NEXTCLOUD_HOST
value: nextcloud-aio-nextcloud value: nextcloud-aio-nextcloud
- name: NOTIFY_PUSH_HOST - name: NOTIFY_PUSH_HOST

8
nextcloud-aio-helm-chart/templates/nextcloud-aio-clamav-deployment.yaml
View file

@ -27,7 +27,11 @@ spec:
spec: spec:
initContainers: initContainers:
- name: init-subpath - name: init-subpath
{{- if or .Values.IMAGE_MIRROR_PREFIX .Values.ALPINE_IMAGE_ORG }}
image: "{{ .Values.IMAGE_MIRROR_PREFIX }}{{ .Values.ALPINE_IMAGE_ORG}}/alpine" image: "{{ .Values.IMAGE_MIRROR_PREFIX }}{{ .Values.ALPINE_IMAGE_ORG}}/alpine"
{{- else }}
image: alpine
{{- end }}
command: command:
- mkdir - mkdir
- "-p" - "-p"
@ -37,7 +41,11 @@ spec:
- name: nextcloud-aio-clamav - name: nextcloud-aio-clamav
mountPath: /nextcloud-aio-clamav mountPath: /nextcloud-aio-clamav
- name: init-volumes - name: init-volumes
{{- if or .Values.IMAGE_MIRROR_PREFIX .Values.ALPINE_IMAGE_ORG }}
image: "{{ .Values.IMAGE_MIRROR_PREFIX }}{{ .Values.ALPINE_IMAGE_ORG}}/alpine" image: "{{ .Values.IMAGE_MIRROR_PREFIX }}{{ .Values.ALPINE_IMAGE_ORG}}/alpine"
{{- else }}
image: alpine
{{- end }}
command: command:
- chown - chown
- 100:100 - 100:100

8
nextcloud-aio-helm-chart/templates/nextcloud-aio-database-deployment.yaml
View file

@ -26,7 +26,11 @@ spec:
spec: spec:
initContainers: initContainers:
- name: init-subpath - name: init-subpath
{{- if or .Values.IMAGE_MIRROR_PREFIX .Values.ALPINE_IMAGE_ORG }}
image: "{{ .Values.IMAGE_MIRROR_PREFIX }}{{ .Values.ALPINE_IMAGE_ORG}}/alpine" image: "{{ .Values.IMAGE_MIRROR_PREFIX }}{{ .Values.ALPINE_IMAGE_ORG}}/alpine"
{{- else }}
image: alpine
{{- end }}
command: command:
- mkdir - mkdir
- "-p" - "-p"
@ -39,7 +43,11 @@ spec:
- name: nextcloud-aio-database - name: nextcloud-aio-database
mountPath: /nextcloud-aio-database mountPath: /nextcloud-aio-database
- name: init-volumes - name: init-volumes
{{- if or .Values.IMAGE_MIRROR_PREFIX .Values.ALPINE_IMAGE_ORG }}
image: "{{ .Values.IMAGE_MIRROR_PREFIX }}{{ .Values.ALPINE_IMAGE_ORG}}/alpine" image: "{{ .Values.IMAGE_MIRROR_PREFIX }}{{ .Values.ALPINE_IMAGE_ORG}}/alpine"
{{- else }}
image: alpine
{{- end }}
command: command:
- chown - chown
- 999:999 - 999:999

4
nextcloud-aio-helm-chart/templates/nextcloud-aio-fulltextsearch-deployment.yaml
View file

@ -27,7 +27,11 @@ spec:
spec: spec:
initContainers: initContainers:
- name: init-volumes - name: init-volumes
{{- if or .Values.IMAGE_MIRROR_PREFIX .Values.ALPINE_IMAGE_ORG }}
image: "{{ .Values.IMAGE_MIRROR_PREFIX }}{{ .Values.ALPINE_IMAGE_ORG}}/alpine" image: "{{ .Values.IMAGE_MIRROR_PREFIX }}{{ .Values.ALPINE_IMAGE_ORG}}/alpine"
{{- else }}
image: alpine
{{- end }}
command: command:
- chmod - chmod
- "777" - "777"

8
nextcloud-aio-helm-chart/templates/nextcloud-aio-nextcloud-deployment.yaml
View file

@ -26,7 +26,11 @@ spec:
spec: spec:
initContainers: initContainers:
- name: "delete-lost-found" - name: "delete-lost-found"
{{- if or .Values.IMAGE_MIRROR_PREFIX .Values.ALPINE_IMAGE_ORG }}
image: "{{ .Values.IMAGE_MIRROR_PREFIX }}{{ .Values.ALPINE_IMAGE_ORG}}/alpine" image: "{{ .Values.IMAGE_MIRROR_PREFIX }}{{ .Values.ALPINE_IMAGE_ORG}}/alpine"
{{- else }}
image: alpine
{{- end }}
command: command:
- rm - rm
- "-rf" - "-rf"
@ -37,7 +41,11 @@ spec:
- name: nextcloud-aio-nextcloud - name: nextcloud-aio-nextcloud
mountPath: /nextcloud-aio-nextcloud mountPath: /nextcloud-aio-nextcloud
- name: init-volumes - name: init-volumes
{{- if or .Values.IMAGE_MIRROR_PREFIX .Values.ALPINE_IMAGE_ORG }}
image: "{{ .Values.IMAGE_MIRROR_PREFIX }}{{ .Values.ALPINE_IMAGE_ORG}}/alpine" image: "{{ .Values.IMAGE_MIRROR_PREFIX }}{{ .Values.ALPINE_IMAGE_ORG}}/alpine"
{{- else }}
image: alpine
{{- end }}
command: command:
- chmod - chmod
- "777" - "777"

4
nextcloud-aio-helm-chart/templates/nextcloud-aio-notify-push-deployment.yaml
View file

@ -26,7 +26,11 @@ spec:
spec: spec:
initContainers: initContainers:
- name: init-volumes - name: init-volumes
{{- if or .Values.IMAGE_MIRROR_PREFIX .Values.ALPINE_IMAGE_ORG }}
image: "{{ .Values.IMAGE_MIRROR_PREFIX }}{{ .Values.ALPINE_IMAGE_ORG}}/alpine" image: "{{ .Values.IMAGE_MIRROR_PREFIX }}{{ .Values.ALPINE_IMAGE_ORG}}/alpine"
{{- else }}
image: alpine
{{- end }}
command: command:
- chmod - chmod
- "777" - "777"

4
nextcloud-aio-helm-chart/templates/nextcloud-aio-onlyoffice-deployment.yaml
View file

@ -27,7 +27,11 @@ spec:
spec: spec:
initContainers: initContainers:
- name: init-volumes - name: init-volumes
{{- if or .Values.IMAGE_MIRROR_PREFIX .Values.ALPINE_IMAGE_ORG }}
image: "{{ .Values.IMAGE_MIRROR_PREFIX }}{{ .Values.ALPINE_IMAGE_ORG}}/alpine" image: "{{ .Values.IMAGE_MIRROR_PREFIX }}{{ .Values.ALPINE_IMAGE_ORG}}/alpine"
{{- else }}
image: alpine
{{- end }}
command: command:
- chmod - chmod
- "777" - "777"

4
nextcloud-aio-helm-chart/templates/nextcloud-aio-redis-deployment.yaml
View file

@ -26,7 +26,11 @@ spec:
spec: spec:
initContainers: initContainers:
- name: init-volumes - name: init-volumes
{{- if or .Values.IMAGE_MIRROR_PREFIX .Values.ALPINE_IMAGE_ORG }}
image: "{{ .Values.IMAGE_MIRROR_PREFIX }}{{ .Values.ALPINE_IMAGE_ORG}}/alpine" image: "{{ .Values.IMAGE_MIRROR_PREFIX }}{{ .Values.ALPINE_IMAGE_ORG}}/alpine"
{{- else }}
image: alpine
{{- end }}
command: command:
- chmod - chmod
- "777" - "777"

28
nextcloud-aio-helm-chart/update-helm.sh
View file

@ -59,7 +59,11 @@ find ./ -name '*networkpolicy.yaml' -exec sed -i "s|manual-install-nextcloud-aio
cat << EOL > /tmp/initcontainers cat << EOL > /tmp/initcontainers
initContainers: initContainers:
- name: init-volumes - name: init-volumes
{{- if or .Values.IMAGE_MIRROR_PREFIX .Values.ALPINE_IMAGE_ORG }}
image: "{{ .Values.IMAGE_MIRROR_PREFIX }}{{ .Values.ALPINE_IMAGE_ORG}}/alpine"
{{- else }}
image: alpine image: alpine
{{- end }}
command: command:
- chmod - chmod
- "777" - "777"
@ -68,14 +72,22 @@ EOL
cat << EOL > /tmp/initcontainers.database cat << EOL > /tmp/initcontainers.database
initContainers: initContainers:
- name: init-subpath - name: init-subpath
{{- if or .Values.IMAGE_MIRROR_PREFIX .Values.ALPINE_IMAGE_ORG }}
image: "{{ .Values.IMAGE_MIRROR_PREFIX }}{{ .Values.ALPINE_IMAGE_ORG}}/alpine"
{{- else }}
image: alpine image: alpine
{{- end }}
command: command:
- mkdir - mkdir
- "-p" - "-p"
- /nextcloud-aio-database/data - /nextcloud-aio-database/data
volumeMountsInitContainer: volumeMountsInitContainer:
- name: init-volumes - name: init-volumes
{{- if or .Values.IMAGE_MIRROR_PREFIX .Values.ALPINE_IMAGE_ORG }}
image: "{{ .Values.IMAGE_MIRROR_PREFIX }}{{ .Values.ALPINE_IMAGE_ORG}}/alpine"
{{- else }}
image: alpine image: alpine
{{- end }}
command: command:
- chown - chown
- 999:999 - 999:999
@ -85,14 +97,22 @@ EOL
cat << EOL > /tmp/initcontainers.clamav cat << EOL > /tmp/initcontainers.clamav
initContainers: initContainers:
- name: init-subpath - name: init-subpath
{{- if or .Values.IMAGE_MIRROR_PREFIX .Values.ALPINE_IMAGE_ORG }}
image: "{{ .Values.IMAGE_MIRROR_PREFIX }}{{ .Values.ALPINE_IMAGE_ORG}}/alpine"
{{- else }}
image: alpine image: alpine
{{- end }}
command: command:
- mkdir - mkdir
- "-p" - "-p"
- /nextcloud-aio-clamav/data - /nextcloud-aio-clamav/data
volumeMountsInitContainer: volumeMountsInitContainer:
- name: init-volumes - name: init-volumes
{{- if or .Values.IMAGE_MIRROR_PREFIX .Values.ALPINE_IMAGE_ORG }}
image: "{{ .Values.IMAGE_MIRROR_PREFIX }}{{ .Values.ALPINE_IMAGE_ORG}}/alpine"
{{- else }}
image: alpine image: alpine
{{- end }}
command: command:
- chown - chown
- 100:100 - 100:100
@ -102,14 +122,22 @@ EOL
cat << EOL > /tmp/initcontainers.nextcloud cat << EOL > /tmp/initcontainers.nextcloud
initContainers: initContainers:
- name: "delete-lost-found" - name: "delete-lost-found"
{{- if or .Values.IMAGE_MIRROR_PREFIX .Values.ALPINE_IMAGE_ORG }}
image: "{{ .Values.IMAGE_MIRROR_PREFIX }}{{ .Values.ALPINE_IMAGE_ORG}}/alpine"
{{- else }}
image: alpine image: alpine
{{- end }}
command: command:
- rm - rm
- "-rf" - "-rf"
- "/nextcloud-aio-nextcloud/lost+found" - "/nextcloud-aio-nextcloud/lost+found"
volumeMountsInitRmLostFound: volumeMountsInitRmLostFound:
- name: init-volumes - name: init-volumes
{{- if or .Values.IMAGE_MIRROR_PREFIX .Values.ALPINE_IMAGE_ORG }}
image: "{{ .Values.IMAGE_MIRROR_PREFIX }}{{ .Values.ALPINE_IMAGE_ORG}}/alpine"
{{- else }}
image: alpine image: alpine
{{- end }}
command: command:
- chmod - chmod
- "777" - "777"