helm:add registry options

edu-sharing · Nov 18, 2024 · f456b2d · f456b2d
1 parent 389b9d0
commit f456b2d
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/deploy/docker/helm/src/main/chart/Chart.yaml b/deploy/docker/helm/src/main/chart/Chart.yaml
@@ -3,5 +3,5 @@ apiVersion: v2
 name: edu-sharing-services-connector
 description: Helm chart for edu-sharing connector app
 type: application
-version: 9.0.1
-appVersion: 9.0.1
+version: 9.0.2
+appVersion: 9.0.2
diff --git a/deploy/docker/helm/src/main/chart/templates/statefulset.yml b/deploy/docker/helm/src/main/chart/templates/statefulset.yml
@@ -18,11 +18,11 @@ spec:
      {{- end }}
       containers:
       - name: edu-sharing-connector
-        image: docker.edu-sharing.com/community/edu_sharing-community-services-edu-connector-service:{{ .Values.version }}
+        image: {{ .Values.global.image.registry }}/community/edu_sharing-community-services-edu-connector-service:{{ .Values.version }}
         {{- with .Values.securityContext }}
         securityContext: {{ toYaml . | nindent 10 }}
         {{- end }}
-        imagePullPolicy: Always
+        imagePullPolicy: {{ .Values.global.image.pullPolicy }}
         env:
         - name: HOST_EXTERNAL
           value: {{ if .Values.absoluteUrl }}{{ .Values.absoluteUrl }}{{else}}"connector.services.{{ .Values.baseUrl }}"{{ end }}
@@ -113,7 +113,7 @@ spec:
       {{- end }}
       containers:
       - name: edu-sharing-connector-db
-        image: {{ .Values.images.postgresql }}
+        image: {{ .Values.image.custom.postgresql }}
         {{- with merge .Values.database.securityContext .Values.securityContext }}
         securityContext: {{ toYaml . | nindent 10 }}
         {{- end }}

diff --git a/deploy/docker/helm/src/main/chart/values.yaml b/deploy/docker/helm/src/main/chart/values.yaml
@@ -20,8 +20,14 @@ onlyofficeEdusharingPlugin:
   enabled: false
   label:
   url:
-images:
-  postgresql: docker.edu-sharing.com/community/common/edu_sharing-community-common-docker-postgresql:13.15.0
+
+global:
+  image:
+    registry: docker.edu-sharing.com
+    pullPolicy: Always
+image:
+  custom:
+    postgresql: docker.edu-sharing.com/community/common/edu_sharing-community-common-docker-postgresql:13.15.0
 
 podSecurityContext: