Skip to content

Commit 2bb522d

Browse files
committed
feat: Add busybox image configuration with global registry support
- Add busybox image configuration to values.yaml - Update all hardcoded busybox references to use image helpers - Now all images (including utility images) respect global.image.registry This ensures air-gapped environments can use a private registry for all container images.
1 parent ad68b47 commit 2bb522d

File tree

4 files changed

+30
-7
lines changed

4 files changed

+30
-7
lines changed

charts/opencloud/templates/collaboration/deployment.yaml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,15 @@ spec:
2626
initContainers:
2727
# Wait for OpenCloud to be ready
2828
- name: wait-for-opencloud
29-
image: busybox
29+
image: {{ include "opencloud.image" (dict "imageValues" .Values.busybox.image "global" .Values.global) | quote }}
30+
imagePullPolicy: {{ include "opencloud.image.pullPolicy" (dict "pullPolicy" .Values.busybox.image.pullPolicy "global" .Values.global) | quote }}
3031
command: ['sh', '-c', 'until wget -q -O- http://{{ include "opencloud.opencloud.fullname" . }}:9200/health; do echo waiting for opencloud; sleep 5; done;']
3132

3233
{{- if not .Values.opencloud.persistence.enabled }}
3334
# Copy config from OpenCloud API if persistence is disabled
3435
- name: copy-config
35-
image: busybox
36+
image: {{ include "opencloud.image" (dict "imageValues" .Values.busybox.image "global" .Values.global) | quote }}
37+
imagePullPolicy: {{ include "opencloud.image.pullPolicy" (dict "pullPolicy" .Values.busybox.image.pullPolicy "global" .Values.global) | quote }}
3638
command: ['sh', '-c', 'mkdir -p /etc/opencloud && wget -q -O /etc/opencloud/config.json http://{{ include "opencloud.opencloud.fullname" . }}:9200/api/v1/config/secrets || echo "Failed to get config from OpenCloud"']
3739
volumeMounts:
3840
- name: etc-opencloud
@@ -42,13 +44,15 @@ spec:
4244
{{- if .Values.onlyoffice.enabled }}
4345
# Wait for OnlyOffice to be ready
4446
- name: wait-for-onlyoffice
45-
image: busybox
47+
image: {{ include "opencloud.image" (dict "imageValues" .Values.busybox.image "global" .Values.global) | quote }}
48+
imagePullPolicy: {{ include "opencloud.image.pullPolicy" (dict "pullPolicy" .Values.busybox.image.pullPolicy "global" .Values.global) | quote }}
4649
command: ['sh', '-c', 'until wget -q -O- http://{{ include "opencloud.fullname" . }}-onlyoffice:80/hosting/discovery; do echo waiting for onlyoffice; sleep 2; done;']
4750
{{- end }}
4851
{{- if .Values.collabora.enabled }}
4952
# Wait for Collabora to be ready
5053
- name: wait-for-collabora
51-
image: busybox
54+
image: {{ include "opencloud.image" (dict "imageValues" .Values.busybox.image "global" .Values.global) | quote }}
55+
imagePullPolicy: {{ include "opencloud.image.pullPolicy" (dict "pullPolicy" .Values.busybox.image.pullPolicy "global" .Values.global) | quote }}
5256
command: ['sh', '-c', 'until wget -q -O- http://{{ include "opencloud.fullname" . }}-collabora:9980/hosting/discovery; do echo waiting for collabora; sleep 2; done;']
5357
{{- end }}
5458
containers:

charts/opencloud/templates/minio/deployment.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@ spec:
2424
fsGroup: 1000
2525
initContainers:
2626
- name: init-minio-bucket
27-
image: busybox
27+
image: {{ include "opencloud.image" (dict "imageValues" .Values.busybox.image "global" .Values.global) | quote }}
28+
imagePullPolicy: {{ include "opencloud.image.pullPolicy" (dict "pullPolicy" .Values.busybox.image.pullPolicy "global" .Values.global) | quote }}
2829
securityContext:
2930
runAsUser: 1000
3031
runAsGroup: 1000

charts/opencloud/templates/opencloud/deployment.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@ spec:
3535
fsGroup: 1000
3636
initContainers:
3737
- name: init-config
38-
image: busybox
38+
image: {{ include "opencloud.image" (dict "imageValues" .Values.busybox.image "global" .Values.global) | quote }}
39+
imagePullPolicy: {{ include "opencloud.image.pullPolicy" (dict "pullPolicy" .Values.busybox.image.pullPolicy "global" .Values.global) | quote }}
3940
command: ['sh', '-c', 'mkdir -p /etc/opencloud /var/lib/opencloud']
4041
volumeMounts:
4142
- name: config
@@ -94,7 +95,8 @@ spec:
9495
{{- end }}
9596
# Final init container to copy all extensions to the apps directory
9697
- name: init-web-extensions
97-
image: busybox
98+
image: {{ include "opencloud.image" (dict "imageValues" .Values.busybox.image "global" .Values.global) | quote }}
99+
imagePullPolicy: {{ include "opencloud.image.pullPolicy" (dict "pullPolicy" .Values.busybox.image.pullPolicy "global" .Values.global) | quote }}
98100
command: ['sh', '/scripts/init-web-extensions.sh']
99101
volumeMounts:
100102
- name: extensions

charts/opencloud/values.yaml

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,22 @@ global:
6161
# Options: Always, IfNotPresent, Never
6262
pullPolicy: ""
6363

64+
# =====================================================================
65+
# UTILITY IMAGES
66+
# =====================================================================
67+
68+
# Busybox image settings (used for init containers)
69+
busybox:
70+
image:
71+
# Busybox image registry
72+
registry: docker.io
73+
# Busybox image repository
74+
repository: library/busybox
75+
# Busybox image tag
76+
tag: "1.36"
77+
# Image pull policy
78+
pullPolicy: IfNotPresent
79+
6480
# =====================================================================
6581
# IDENTITY PROVIDER (KEYCLOAK)
6682
# =====================================================================

0 commit comments

Comments
 (0)