Merge pull request #61 from alchemy-fr/PS-687_imagesPullPolicy

PS-687 imagePullPolicy driven by values.yaml
alchemy-fr · Jan 30, 2025 · 0c44a9c · 0c44a9c
2 parents 654f8ce + bd35e97
commit 0c44a9c
Show file tree

Hide file tree

Showing 16 changed files with 16 additions and 43 deletions.
diff --git a/charts/phrasea/Chart.yaml b/charts/phrasea/Chart.yaml
@@ -14,7 +14,7 @@ type: application
 
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
-version: 2.3.0
+version: 2.4.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application.

diff --git a/charts/phrasea/templates/_helpers.tpl b/charts/phrasea/templates/_helpers.tpl
@@ -220,9 +220,7 @@ networking.k8s.io/v1beta1
 {{- define "configurator.containerSpecs" -}}
 name: configurator
 image: {{ .Values.repository.baseurl }}/ps-configurator:{{ .Values.repository.tag }}
-{{- if not (eq "latest" .Values.repository.tag) }}
-imagePullPolicy: Always
-{{- end }}
+imagePullPolicy: .Values.repository.imagePullPolicy
 terminationMessagePolicy: FallbackToLogsOnError
 volumeMounts:
 - name: configs

diff --git a/charts/phrasea/templates/api-nginx-deployment.yaml b/charts/phrasea/templates/api-nginx-deployment.yaml
@@ -25,9 +25,7 @@ spec:
       containers:
       - name: {{ $appName }}-api-nginx
         image: {{ $.Values.repository.baseurl }}/ps-{{ $appName }}-api-nginx:{{ $.Values.repository.tag }}
-        {{- if not (eq "latest" $.Values.repository.tag) }}
-        imagePullPolicy: Always
-        {{- end }}
+        imagePullPolicy: $.Values.repository.imagePullPolicy
         terminationMessagePolicy: FallbackToLogsOnError
         env:
       {{- if .api.subnet }}

diff --git a/charts/phrasea/templates/api-php-deployment.yml b/charts/phrasea/templates/api-php-deployment.yml
@@ -31,9 +31,7 @@ spec:
       containers:
       - name: {{ $appName }}-api-php
         image: {{ $.Values.repository.baseurl }}/ps-{{ $appName }}-api-php:{{ $.Values.repository.tag }}
-        {{- if not (eq "latest" $.Values.repository.tag) }}
-        imagePullPolicy: Always
-        {{- end }}
+        imagePullPolicy: $.Values.repository.imagePullPolicy
         terminationMessagePolicy: FallbackToLogsOnError
         volumeMounts:
         - name: configs

diff --git a/charts/phrasea/templates/dashboard/dashboard-deployment.yaml b/charts/phrasea/templates/dashboard/dashboard-deployment.yaml
@@ -23,9 +23,7 @@ spec:
       containers:
       - name: dashboard
         image: {{ $.Values.repository.baseurl }}/ps-dashboard:{{ $.Values.repository.tag }}
-        {{- if not (eq "latest" $.Values.repository.tag) }}
-        imagePullPolicy: Always
-        {{- end }}
+        imagePullPolicy: $.Values.repository.imagePullPolicy
         terminationMessagePolicy: FallbackToLogsOnError
         envFrom:
         - configMapRef:

diff --git a/charts/phrasea/templates/databox/databox-client-deployment.yml b/charts/phrasea/templates/databox/databox-client-deployment.yml
@@ -26,9 +26,7 @@ spec:
       containers:
       - name: databox-client
         image: {{ $.Values.repository.baseurl }}/ps-databox-client:{{ $.Values.repository.tag }}
-        {{- if not (eq "latest" $.Values.repository.tag) }}
-        imagePullPolicy: Always
-        {{- end }}
+        imagePullPolicy: $.Values.repository.imagePullPolicy
         terminationMessagePolicy: FallbackToLogsOnError
         volumeMounts:
         - name: configs

diff --git a/charts/phrasea/templates/expose/expose-client-deployment.yml b/charts/phrasea/templates/expose/expose-client-deployment.yml
@@ -26,9 +26,7 @@ spec:
       containers:
       - name: expose-client
         image: {{ $.Values.repository.baseurl }}/ps-expose-client:{{ $.Values.repository.tag }}
-        {{- if not (eq "latest" $.Values.repository.tag) }}
-        imagePullPolicy: Always
-        {{- end }}
+        imagePullPolicy: $.Values.repository.imagePullPolicy
         terminationMessagePolicy: FallbackToLogsOnError
         volumeMounts:
         - name: configs

diff --git a/charts/phrasea/templates/keycloak/keycloak-deployment.yaml b/charts/phrasea/templates/keycloak/keycloak-deployment.yaml
@@ -25,9 +25,7 @@ spec:
           image: {{ $.Values.repository.baseurl }}/ps-keycloak:{{ $.Values.repository.tag }}
           args:
           - 'start'
-          {{- if not (eq "latest" $.Values.repository.tag) }}
-          imagePullPolicy: Always
-          {{- end }}
+          imagePullPolicy: $.Values.repository.imagePullPolicy
           terminationMessagePolicy: FallbackToLogsOnError
           envFrom:
             - secretRef:

diff --git a/charts/phrasea/templates/matomo/matomo-phraseanet-cronjob.yaml b/charts/phrasea/templates/matomo/matomo-phraseanet-cronjob.yaml
@@ -23,12 +23,10 @@ spec:
           containers:
           - name: {{ $appName }}-api-php
             image: {{ $.Values.repository.baseurl }}/ps-{{ $appName }}-api-php:{{ $.Values.repository.tag }}
-            {{- if not (eq "latest" $.Values.repository.tag) }}
+            imagePullPolicy: $.Values.repository.imagePullPolicy
             command:
               - bin/console
               - app:matomo:sync-phraseanet
-            imagePullPolicy: Always
-            {{- end }}
             volumeMounts:
             - name: configs
               mountPath: /configs

diff --git a/charts/phrasea/templates/migrate-job.yaml b/charts/phrasea/templates/migrate-job.yaml
@@ -23,9 +23,7 @@ spec:
       containers:
       - name: {{ $appName }}-php-job
         image: {{ $.Values.repository.baseurl }}/ps-{{ $appName }}-api-php:{{ $.Values.repository.tag }}
-        {{- if not (eq "latest" $.Values.repository.tag) }}
-        imagePullPolicy: Always
-        {{- end }}
+        imagePullPolicy: $.Values.repository.imagePullPolicy
         args: ["bin/migrate.sh"]
         terminationMessagePolicy: FallbackToLogsOnError
         volumeMounts:

diff --git a/charts/phrasea/templates/report/report-deployment.yml b/charts/phrasea/templates/report/report-deployment.yml
@@ -23,9 +23,7 @@ spec:
       containers:
       - name: report-api
         image: {{ $.Values.repository.baseurl }}/ps-report-api:{{ $.Values.repository.tag }}
-        {{- if not (eq "latest" $.Values.repository.tag) }}
-        imagePullPolicy: Always
-        {{- end }}
+        imagePullPolicy: $.Values.repository.imagePullPolicy
         terminationMessagePolicy: FallbackToLogsOnError
         envFrom:
         - configMapRef:

diff --git a/charts/phrasea/templates/setup-job.yaml b/charts/phrasea/templates/setup-job.yaml
@@ -24,9 +24,7 @@ spec:
       containers:
       - name: {{ $appName }}-php-job
         image: {{ $.Values.repository.baseurl }}/ps-{{ $appName }}-api-php:{{ $.Values.repository.tag }}
-        {{- if not (eq "latest" $.Values.repository.tag) }}
-        imagePullPolicy: Always
-        {{- end }}
+        imagePullPolicy: $.Values.repository.imagePullPolicy
         args: ["bin/setup.sh"]
         terminationMessagePolicy: FallbackToLogsOnError
         volumeMounts:

diff --git a/charts/phrasea/templates/uploader/jobs/create-databox-target-job.yaml b/charts/phrasea/templates/uploader/jobs/create-databox-target-job.yaml
@@ -35,9 +35,7 @@ spec:
       containers:
       - name: {{ $jobName }}
         image: {{ $.Values.repository.baseurl }}/ps-uploader-api-php:{{ $.Values.repository.tag }}
-        {{- if not (eq "latest" $.Values.repository.tag) }}
-        imagePullPolicy: Always
-        {{- end }}
+        imagePullPolicy: $.Values.repository.imagePullPolicy
         args: ["/setup/job.sh"]
         terminationMessagePolicy: FallbackToLogsOnError
         volumeMounts:

diff --git a/charts/phrasea/templates/uploader/uploader-client-deployment.yml b/charts/phrasea/templates/uploader/uploader-client-deployment.yml
@@ -26,9 +26,7 @@ spec:
       containers:
       - name: uploader-client
         image: {{ $.Values.repository.baseurl }}/ps-uploader-client:{{ $.Values.repository.tag }}
-        {{- if not (eq "latest" $.Values.repository.tag) }}
-        imagePullPolicy: Always
-        {{- end }}
+        imagePullPolicy: $.Values.repository.imagePullPolicy
         terminationMessagePolicy: FallbackToLogsOnError
         volumeMounts:
         - name: configs

diff --git a/charts/phrasea/templates/worker-deployment.yml b/charts/phrasea/templates/worker-deployment.yml
@@ -29,9 +29,7 @@ spec:
       containers:
       - name: {{ $appName }}-worker
         image: {{ $.Values.repository.baseurl }}/ps-{{ $appName }}-worker:{{ $.Values.repository.tag }}
-        {{- if not (eq "latest" $.Values.repository.tag) }}
-        imagePullPolicy: Always
-        {{- end }}
+        imagePullPolicy: $.Values.repository.imagePullPolicy
         terminationMessagePolicy: FallbackToLogsOnError
         volumeMounts:
         - name: configs

diff --git a/charts/phrasea/values.yaml b/charts/phrasea/values.yaml
@@ -1,6 +1,7 @@
 repository:
   baseurl: alchemyfr
   tag: latest
+  imagePullPolicy: IfNotPresent
 
 acme:
   enabled: false