From 4139883a4081dfdab330303bf3ee94c41eea6722 Mon Sep 17 00:00:00 2001 From: Torsten Simon Date: Mon, 18 Nov 2024 09:45:35 +0100 Subject: [PATCH] helm:add registry options --- deploy/docker/helm/src/main/chart/Chart.yaml | 4 ++-- .../docker/helm/src/main/chart/templates/statefulset.yml | 8 ++++++-- deploy/docker/helm/src/main/chart/values.yaml | 9 ++++++++- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/deploy/docker/helm/src/main/chart/Chart.yaml b/deploy/docker/helm/src/main/chart/Chart.yaml index 55b9843..eca1017 100644 --- 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 \ No newline at end of file +version: 8.3.0-RC4 +appVersion: 8.3.0 \ No newline at end of file diff --git a/deploy/docker/helm/src/main/chart/templates/statefulset.yml b/deploy/docker/helm/src/main/chart/templates/statefulset.yml index 433cf95..ad98861 100644 --- 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 index 64b3097..c2fc455 100644 --- 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