eightball/all-in-one
1
0
Fork 0
mirror of https://github.com/nextcloud/all-in-one.git synced 2025-12-20 06:26:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Merge pull request #5549 from nextcloud/enh/noid/remove-image-orgs

Browse source 
helm: remove IMAGE_MIRROR_PREFIX, NEXTCLOUD_IMAGE_ORG and ALPINE_IMAGE_ORG
This commit is contained in:
Simon L. 2024-11-08 10:20:53 +01:00 • committed by GitHub
commit 6625813b8c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
15 changed files with 31 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -25,7 +25,7 @@ spec:
spec: spec:
initContainers: initContainers:
- name: init-volumes - name: init-volumes
image: "{{ .Values.IMAGE_MIRROR_PREFIX }}{{ .Values.ALPINE_IMAGE_ORG }}alpine:3.20" image: "alpine:3.20"
command: command:
- chmod - chmod
- "777" - "777"
@ -64,7 +64,7 @@ spec:
value: "{{ .Values.TIMEZONE }}" value: "{{ .Values.TIMEZONE }}"
- name: WHITEBOARD_HOST - name: WHITEBOARD_HOST
value: nextcloud-aio-whiteboard value: nextcloud-aio-whiteboard
image: "{{ .Values.IMAGE_MIRROR_PREFIX }}{{ .Values.NEXTCLOUD_IMAGE_ORG }}/aio-apache:20241106_101604" image: "nextcloud/aio-apache:20241106_101604"
name: nextcloud-aio-apache name: nextcloud-aio-apache
ports: ports:
- containerPort: {{ .Values.APACHE_PORT }} - containerPort: {{ .Values.APACHE_PORT }}

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

@ -26,7 +26,7 @@ spec:
spec: spec:
initContainers: initContainers:
- name: init-subpath - name: init-subpath
image: "{{ .Values.IMAGE_MIRROR_PREFIX }}{{ .Values.ALPINE_IMAGE_ORG }}alpine:3.20" image: "alpine:3.20"
command: command:
- mkdir - mkdir
- "-p" - "-p"
@ -36,7 +36,7 @@ spec:
- name: nextcloud-aio-clamav - name: nextcloud-aio-clamav
mountPath: /nextcloud-aio-clamav mountPath: /nextcloud-aio-clamav
- name: init-volumes - name: init-volumes
image: "{{ .Values.IMAGE_MIRROR_PREFIX }}{{ .Values.ALPINE_IMAGE_ORG }}alpine:3.20" image: "alpine:3.20"
command: command:
- chown - chown
- 100:100 - 100:100
@ -53,7 +53,7 @@ spec:
value: "{{ .Values.NEXTCLOUD_UPLOAD_LIMIT }}" value: "{{ .Values.NEXTCLOUD_UPLOAD_LIMIT }}"
- name: TZ - name: TZ
value: "{{ .Values.TIMEZONE }}" value: "{{ .Values.TIMEZONE }}"
image: "{{ .Values.IMAGE_MIRROR_PREFIX }}{{ .Values.NEXTCLOUD_IMAGE_ORG }}/aio-clamav:20241106_101604" image: "nextcloud/aio-clamav:20241106_101604"
name: nextcloud-aio-clamav name: nextcloud-aio-clamav
ports: ports:
- containerPort: 3310 - containerPort: 3310

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

@ -36,7 +36,7 @@ spec:
value: --o:ssl.enable=false --o:ssl.termination=true --o:mount_jail_tree=false --o:logging.level=warning --o:home_mode.enable=true {{ .Values.COLLABORA_SECCOMP_POLICY }} --o:remote_font_config.url=https://{{ .Values.NC_DOMAIN }}/apps/richdocuments/settings/fonts.json 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 - name: server_name
value: "{{ .Values.NC_DOMAIN }}" value: "{{ .Values.NC_DOMAIN }}"
image: "{{ .Values.IMAGE_MIRROR_PREFIX }}{{ .Values.NEXTCLOUD_IMAGE_ORG }}/aio-collabora:20241106_101604" image: "nextcloud/aio-collabora:20241106_101604"
name: nextcloud-aio-collabora name: nextcloud-aio-collabora
ports: ports:
- containerPort: 9980 - containerPort: 9980

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

@ -25,7 +25,7 @@ spec:
spec: spec:
initContainers: initContainers:
- name: init-subpath - name: init-subpath
image: "{{ .Values.IMAGE_MIRROR_PREFIX }}{{ .Values.ALPINE_IMAGE_ORG }}alpine:3.20" image: "alpine:3.20"
command: command:
- mkdir - mkdir
- "-p" - "-p"
@ -38,7 +38,7 @@ spec:
- name: nextcloud-aio-database - name: nextcloud-aio-database
mountPath: /nextcloud-aio-database mountPath: /nextcloud-aio-database
- name: init-volumes - name: init-volumes
image: "{{ .Values.IMAGE_MIRROR_PREFIX }}{{ .Values.ALPINE_IMAGE_ORG }}alpine:3.20" image: "alpine:3.20"
command: command:
- chown - chown
- 999:999 - 999:999
@ -62,7 +62,7 @@ spec:
value: nextcloud value: nextcloud
- name: TZ - name: TZ
value: "{{ .Values.TIMEZONE }}" value: "{{ .Values.TIMEZONE }}"
image: "{{ .Values.IMAGE_MIRROR_PREFIX }}{{ .Values.NEXTCLOUD_IMAGE_ORG }}/aio-postgresql:20241106_101604" image: "nextcloud/aio-postgresql:20241106_101604"
name: nextcloud-aio-database name: nextcloud-aio-database
ports: ports:
- containerPort: 5432 - containerPort: 5432

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

@ -26,7 +26,7 @@ spec:
spec: spec:
initContainers: initContainers:
- name: init-volumes - name: init-volumes
image: "{{ .Values.IMAGE_MIRROR_PREFIX }}{{ .Values.ALPINE_IMAGE_ORG }}alpine:3.20" image: "alpine:3.20"
command: command:
- chmod - chmod
- "777" - "777"
@ -56,7 +56,7 @@ spec:
value: basic value: basic
- name: xpack.security.enabled - name: xpack.security.enabled
value: "false" value: "false"
image: "{{ .Values.IMAGE_MIRROR_PREFIX }}{{ .Values.NEXTCLOUD_IMAGE_ORG }}/aio-fulltextsearch:20241106_101604" image: "nextcloud/aio-fulltextsearch:20241106_101604"
name: nextcloud-aio-fulltextsearch name: nextcloud-aio-fulltextsearch
ports: ports:
- containerPort: 9200 - containerPort: 9200

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

@ -28,7 +28,7 @@ spec:
value: "{{ .Values.IMAGINARY_SECRET }}" value: "{{ .Values.IMAGINARY_SECRET }}"
- name: TZ - name: TZ
value: "{{ .Values.TIMEZONE }}" value: "{{ .Values.TIMEZONE }}"
image: "{{ .Values.IMAGE_MIRROR_PREFIX }}{{ .Values.NEXTCLOUD_IMAGE_ORG }}/aio-imaginary:20241106_101604" image: "nextcloud/aio-imaginary:20241106_101604"
name: nextcloud-aio-imaginary name: nextcloud-aio-imaginary
ports: ports:
- containerPort: 9000 - containerPort: 9000

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

@ -25,7 +25,7 @@ spec:
spec: spec:
initContainers: initContainers:
- name: "delete-lost-found" - name: "delete-lost-found"
image: "{{ .Values.IMAGE_MIRROR_PREFIX }}{{ .Values.ALPINE_IMAGE_ORG }}alpine:3.20" image: "alpine:3.20"
command: command:
- rm - rm
- "-rf" - "-rf"
@ -36,7 +36,7 @@ spec:
- name: nextcloud-aio-nextcloud - name: nextcloud-aio-nextcloud
mountPath: /nextcloud-aio-nextcloud mountPath: /nextcloud-aio-nextcloud
- name: init-volumes - name: init-volumes
image: "{{ .Values.IMAGE_MIRROR_PREFIX }}{{ .Values.ALPINE_IMAGE_ORG }}alpine:3.20" image: "alpine:3.20"
command: command:
- chmod - chmod
- "777" - "777"
@ -173,7 +173,7 @@ spec:
value: "{{ .Values.WHITEBOARD_ENABLED }}" value: "{{ .Values.WHITEBOARD_ENABLED }}"
- name: WHITEBOARD_SECRET - name: WHITEBOARD_SECRET
value: "{{ .Values.WHITEBOARD_SECRET }}" value: "{{ .Values.WHITEBOARD_SECRET }}"
image: "{{ .Values.IMAGE_MIRROR_PREFIX }}{{ .Values.NEXTCLOUD_IMAGE_ORG }}/aio-nextcloud:20241106_101604" image: "nextcloud/aio-nextcloud:20241106_101604"
name: nextcloud-aio-nextcloud name: nextcloud-aio-nextcloud
ports: ports:
- containerPort: 9000 - containerPort: 9000

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

@ -25,7 +25,7 @@ spec:
spec: spec:
initContainers: initContainers:
- name: init-volumes - name: init-volumes
image: "{{ .Values.IMAGE_MIRROR_PREFIX }}{{ .Values.ALPINE_IMAGE_ORG }}alpine:3.20" image: "alpine:3.20"
command: command:
- chmod - chmod
- "777" - "777"
@ -53,7 +53,7 @@ spec:
value: nextcloud-aio-redis value: nextcloud-aio-redis
- name: REDIS_HOST_PASSWORD - name: REDIS_HOST_PASSWORD
value: "{{ .Values.REDIS_PASSWORD }}" value: "{{ .Values.REDIS_PASSWORD }}"
image: "{{ .Values.IMAGE_MIRROR_PREFIX }}{{ .Values.NEXTCLOUD_IMAGE_ORG }}/aio-notify-push:20241106_101604" image: "nextcloud/aio-notify-push:20241106_101604"
name: nextcloud-aio-notify-push name: nextcloud-aio-notify-push
ports: ports:
- containerPort: 7867 - containerPort: 7867

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

@ -26,7 +26,7 @@ spec:
spec: spec:
initContainers: initContainers:
- name: init-volumes - name: init-volumes
image: "{{ .Values.IMAGE_MIRROR_PREFIX }}{{ .Values.ALPINE_IMAGE_ORG }}alpine:3.20" image: "alpine:3.20"
command: command:
- chmod - chmod
- "777" - "777"
@ -44,7 +44,7 @@ spec:
value: "{{ .Values.ONLYOFFICE_SECRET }}" value: "{{ .Values.ONLYOFFICE_SECRET }}"
- name: TZ - name: TZ
value: "{{ .Values.TIMEZONE }}" value: "{{ .Values.TIMEZONE }}"
image: "{{ .Values.IMAGE_MIRROR_PREFIX }}{{ .Values.NEXTCLOUD_IMAGE_ORG }}/aio-onlyoffice:20241106_101604" image: "nextcloud/aio-onlyoffice:20241106_101604"
name: nextcloud-aio-onlyoffice name: nextcloud-aio-onlyoffice
ports: ports:
- containerPort: 80 - containerPort: 80

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

@ -25,7 +25,7 @@ spec:
spec: spec:
initContainers: initContainers:
- name: init-volumes - name: init-volumes
image: "{{ .Values.IMAGE_MIRROR_PREFIX }}{{ .Values.ALPINE_IMAGE_ORG }}alpine:3.20" image: "alpine:3.20"
command: command:
- chmod - chmod
- "777" - "777"
@ -39,7 +39,7 @@ spec:
value: "{{ .Values.REDIS_PASSWORD }}" value: "{{ .Values.REDIS_PASSWORD }}"
- name: TZ - name: TZ
value: "{{ .Values.TIMEZONE }}" value: "{{ .Values.TIMEZONE }}"
image: "{{ .Values.IMAGE_MIRROR_PREFIX }}{{ .Values.NEXTCLOUD_IMAGE_ORG }}/aio-redis:20241106_101604" image: "nextcloud/aio-redis:20241106_101604"
name: nextcloud-aio-redis name: nextcloud-aio-redis
ports: ports:
- containerPort: 6379 - containerPort: 6379

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

@ -42,7 +42,7 @@ spec:
value: "{{ .Values.TURN_SECRET }}" value: "{{ .Values.TURN_SECRET }}"
- name: TZ - name: TZ
value: "{{ .Values.TIMEZONE }}" value: "{{ .Values.TIMEZONE }}"
image: "{{ .Values.IMAGE_MIRROR_PREFIX }}{{ .Values.NEXTCLOUD_IMAGE_ORG }}/aio-talk:20241106_101604" image: "nextcloud/aio-talk:20241106_101604"
name: nextcloud-aio-talk name: nextcloud-aio-talk
ports: ports:
- containerPort: {{ .Values.TALK_PORT }} - containerPort: {{ .Values.TALK_PORT }}

2
nextcloud-aio-helm-chart/templates/nextcloud-aio-talk-recording-deployment.yaml
View file

@ -32,7 +32,7 @@ spec:
value: "{{ .Values.RECORDING_SECRET }}" value: "{{ .Values.RECORDING_SECRET }}"
- name: TZ - name: TZ
value: "{{ .Values.TIMEZONE }}" value: "{{ .Values.TIMEZONE }}"
image: "{{ .Values.IMAGE_MIRROR_PREFIX }}{{ .Values.NEXTCLOUD_IMAGE_ORG }}/aio-talk-recording:20241106_101604" image: "nextcloud/aio-talk-recording:20241106_101604"
name: nextcloud-aio-talk-recording name: nextcloud-aio-talk-recording
ports: ports:
- containerPort: 1234 - containerPort: 1234

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

@ -36,7 +36,7 @@ spec:
value: redis value: redis
- name: TZ - name: TZ
value: "{{ .Values.TIMEZONE }}" value: "{{ .Values.TIMEZONE }}"
image: "{{ .Values.IMAGE_MIRROR_PREFIX }}{{ .Values.NEXTCLOUD_IMAGE_ORG }}/aio-whiteboard:20241106_101604" image: "nextcloud/aio-whiteboard:20241106_101604"
name: nextcloud-aio-whiteboard name: nextcloud-aio-whiteboard
ports: ports:
- containerPort: 3002 - containerPort: 3002

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

@ -62,7 +62,7 @@ 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
image: "{{ .Values.IMAGE_MIRROR_PREFIX }}{{ .Values.ALPINE_IMAGE_ORG }}alpine:3.20" image: "alpine:3.20"
command: command:
- chmod - chmod
- "777" - "777"
@ -71,14 +71,14 @@ EOL
cat << EOL > /tmp/initcontainers.database cat << EOL > /tmp/initcontainers.database
initContainers: initContainers:
- name: init-subpath - name: init-subpath
image: "{{ .Values.IMAGE_MIRROR_PREFIX }}{{ .Values.ALPINE_IMAGE_ORG }}alpine:3.20" image: "alpine:3.20"
command: command:
- mkdir - mkdir
- "-p" - "-p"
- /nextcloud-aio-database/data - /nextcloud-aio-database/data
volumeMountsInitContainer: volumeMountsInitContainer:
- name: init-volumes - name: init-volumes
image: "{{ .Values.IMAGE_MIRROR_PREFIX }}{{ .Values.ALPINE_IMAGE_ORG }}alpine:3.20" image: "alpine:3.20"
command: command:
- chown - chown
- 999:999 - 999:999
@ -88,14 +88,14 @@ EOL
cat << EOL > /tmp/initcontainers.clamav cat << EOL > /tmp/initcontainers.clamav
initContainers: initContainers:
- name: init-subpath - name: init-subpath
image: "{{ .Values.IMAGE_MIRROR_PREFIX }}{{ .Values.ALPINE_IMAGE_ORG }}alpine:3.20" image: "alpine:3.20"
command: command:
- mkdir - mkdir
- "-p" - "-p"
- /nextcloud-aio-clamav/data - /nextcloud-aio-clamav/data
volumeMountsInitContainer: volumeMountsInitContainer:
- name: init-volumes - name: init-volumes
image: "{{ .Values.IMAGE_MIRROR_PREFIX }}{{ .Values.ALPINE_IMAGE_ORG }}alpine:3.20" image: "alpine:3.20"
command: command:
- chown - chown
- 100:100 - 100:100
@ -105,14 +105,14 @@ EOL
cat << EOL > /tmp/initcontainers.nextcloud cat << EOL > /tmp/initcontainers.nextcloud
initContainers: initContainers:
- name: "delete-lost-found" - name: "delete-lost-found"
image: "{{ .Values.IMAGE_MIRROR_PREFIX }}{{ .Values.ALPINE_IMAGE_ORG }}alpine:3.20" image: "alpine:3.20"
command: command:
- rm - rm
- "-rf" - "-rf"
- "/nextcloud-aio-nextcloud/lost+found" - "/nextcloud-aio-nextcloud/lost+found"
volumeMountsInitRmLostFound: volumeMountsInitRmLostFound:
- name: init-volumes - name: init-volumes
image: "{{ .Values.IMAGE_MIRROR_PREFIX }}{{ .Values.ALPINE_IMAGE_ORG }}alpine:3.20" image: "alpine:3.20"
command: command:
- chmod - chmod
- "777" - "777"
@ -289,9 +289,6 @@ EOL
# shellcheck disable=SC1083 # shellcheck disable=SC1083
find ./ -name '*talk-deployment.yaml' -exec sed -i "/^.*\- env:/r /tmp/additional-talk.config" \{} \; find ./ -name '*talk-deployment.yaml' -exec sed -i "/^.*\- env:/r /tmp/additional-talk.config" \{} \;
# shellcheck disable=SC1083
find ./ -name '*deployment.yaml' -exec sed -i '/image: nextcloud/s/$/"/;s|image: nextcloud/|image: "{{ .Values.IMAGE_MIRROR_PREFIX }}{{ .Values.NEXTCLOUD_IMAGE_ORG }}/|;' \{} \;
cat << EOL > templates/nextcloud-aio-networkpolicy.yaml cat << EOL > templates/nextcloud-aio-networkpolicy.yaml
{{- if eq .Values.NETWORK_POLICY_ENABLED "yes" }} {{- if eq .Values.NETWORK_POLICY_ENABLED "yes" }}
# https://github.com/ahmetb/kubernetes-network-policy-recipes/blob/master/04-deny-traffic-from-other-namespaces.md # https://github.com/ahmetb/kubernetes-network-policy-recipes/blob/master/04-deny-traffic-from-other-namespaces.md
@ -389,10 +386,6 @@ MAIL_FROM_ADDRESS: # (not set by default): Set the local-part for the 'f
MAIL_DOMAIN: # (not set by default): Set a different domain for the emails than the domain where Nextcloud is installed. MAIL_DOMAIN: # (not set by default): Set a different domain for the emails than the domain where Nextcloud is installed.
TALK_MAX_STREAM_BITRATE: "1048576" # This allows to adjust the max stream bitrate of the talk hpb TALK_MAX_STREAM_BITRATE: "1048576" # This allows to adjust the max stream bitrate of the talk hpb
TALK_MAX_SCREEN_BITRATE: "2097152" # This allows to adjust the max stream bitrate of the talk hpb TALK_MAX_SCREEN_BITRATE: "2097152" # This allows to adjust the max stream bitrate of the talk hpb
IMAGE_MIRROR_PREFIX: # Setting this allows you to pull Nextcloud images through a mirror registry. It needs a trailing slash!
NEXTCLOUD_IMAGE_ORG: nextcloud # Setting this allows you to change the image's org name in case a different image needs to be used e.g. for compliance reasons.
ALPINE_IMAGE_ORG: # Setting this allows you to change the image's org name in case a different image needs to be used e.g. for compliance reasons. It needs a trailing slash!
ADDITIONAL_CONFIG ADDITIONAL_CONFIG
mv /tmp/sample.conf ../helm-chart/values.yaml mv /tmp/sample.conf ../helm-chart/values.yaml

4
nextcloud-aio-helm-chart/values.yaml
View file

@ -69,7 +69,3 @@ MAIL_FROM_ADDRESS: # (not set by default): Set the local-part for the 'f
MAIL_DOMAIN: # (not set by default): Set a different domain for the emails than the domain where Nextcloud is installed. MAIL_DOMAIN: # (not set by default): Set a different domain for the emails than the domain where Nextcloud is installed.
TALK_MAX_STREAM_BITRATE: "1048576" # This allows to adjust the max stream bitrate of the talk hpb TALK_MAX_STREAM_BITRATE: "1048576" # This allows to adjust the max stream bitrate of the talk hpb
TALK_MAX_SCREEN_BITRATE: "2097152" # This allows to adjust the max stream bitrate of the talk hpb TALK_MAX_SCREEN_BITRATE: "2097152" # This allows to adjust the max stream bitrate of the talk hpb
IMAGE_MIRROR_PREFIX: # Setting this allows you to pull Nextcloud images through a mirror registry. It needs a trailing slash!
NEXTCLOUD_IMAGE_ORG: nextcloud # Setting this allows you to change the image's org name in case a different image needs to be used e.g. for compliance reasons.
ALPINE_IMAGE_ORG: # Setting this allows you to change the image's org name in case a different image needs to be used e.g. for compliance reasons. It needs a trailing slash!