Merge remote-tracking branch 'origin/maven/fixes/8.3' into maven/rele…

…ase/8.3
edu-sharing · Nov 27, 2024 · 84048e9 · 84048e9
2 parents 1853c09 + 4139883
commit 84048e9
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 5 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: 8.1.9998
-appVersion: 0.1.0
+version: 8.3.0-RC4
+appVersion: 8.3.0
diff --git a/deploy/docker/helm/src/main/chart/templates/statefulset.yml b/deploy/docker/helm/src/main/chart/templates/statefulset.yml
@@ -15,7 +15,11 @@ spec:
     spec:
       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 }}
+        imagePullPolicy: {{ .Values.global.image.pullPolicy }}
+        {{- with .Values.securityContext }}
+        securityContext: {{ toYaml . | nindent 10 }}
+        {{- end }}
         imagePullPolicy: Always
         env:
         - name: HOST_EXTERNAL
@@ -102,7 +106,7 @@ spec:
     spec:
       containers:
       - name: edu-sharing-connector-db
-        image: docker.edu-sharing.com/community/edu_sharing-community-services-edu-connector-deploy-docker-build-postgresql:{{ .Values.version }}
+        image: {{ .Values.image.custom.postgresql }}
         env:
         - name: POSTGRESQL_DATABASE
           value: connector

diff --git a/deploy/docker/helm/src/main/chart/values.yaml b/deploy/docker/helm/src/main/chart/values.yaml
@@ -1,4 +1,11 @@
 baseUrl: 
 storageClassName:
 clusterIssuer: letsencrypt
-version: maven-fixes-8.1-SNAPSHOT
+version: 8.3.0-RC1
+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