Merge pull request #47 from alchemy-fr/PHRAS-4102_imagePullPolicy

PHRAS-4102 Image pull policy now driven by values.yaml PHRAS-4100 revert PHP_UPLOAD_TMP_DIR on workers and cronjob
alchemy-fr · Oct 10, 2024 · fc29c41 · fc29c41
2 parents 9c8d2fb + 505465c
commit fc29c41
Show file tree

Hide file tree

Showing 19 changed files with 21 additions and 42 deletions.
diff --git a/charts/phraseanet/Chart.yaml b/charts/phraseanet/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: 0.46.0
+version: 0.47.0
 
 
 # This is the version number of the application being deployed. This version number should be

diff --git a/charts/phraseanet/templates/cronjob_phraseanet.yaml b/charts/phraseanet/templates/cronjob_phraseanet.yaml
@@ -85,8 +85,6 @@ spec:
                 value: {{ $.Values.php.php_cli_memory_limit | quote }}
               - name: PHP_LOG_LEVEL
                 value: {{ $.Values.php.log_level | quote }}
-              - name: PHP_UPLOAD_TMP_DIR
-                value: "/var/alchemy/Phraseanet/tmp/php_upload_tmp"
               - name: SESSION_CACHE_LIMITER
                 value: {{ $.Values.php.session_cache_limiter | quote }}
               - name: SESSION_SAVE_HANDLER

diff --git a/charts/phraseanet/templates/database.yml b/charts/phraseanet/templates/database.yml
@@ -31,7 +31,7 @@ spec:
       containers:
       - name: db
         image: {{ .Values.image.registry }}/phraseanet-db:{{ .Values.image.tag.phraseanet }}
-        imagePullPolicy: Always
+        imagePullPolicy: {{ .Values.image.imagePullPolicy }}
         terminationMessagePolicy: FallbackToLogsOnError
         env:
         - name: MYSQL_ROOT_PASSWORD

diff --git a/charts/phraseanet/templates/elasticsearch.yml b/charts/phraseanet/templates/elasticsearch.yml
@@ -31,7 +31,7 @@ spec:
       containers:
       - name: elasticsearch
         image: {{ .Values.image.registry }}/phraseanet-elasticsearch:{{ .Values.image.tag.phraseanet }}
-        imagePullPolicy: Always
+        imagePullPolicy: {{ .Values.image.imagePullPolicy }}
         terminationMessagePolicy: FallbackToLogsOnError
         resources:
 {{ toYaml .Values.elasticsearch.resources | indent 12 }}

diff --git a/charts/phraseanet/templates/gateway.yml b/charts/phraseanet/templates/gateway.yml
@@ -38,7 +38,7 @@ spec:
       containers:
       - name: gateway
         image: {{ .Values.image.registry }}/phraseanet-nginx:{{ .Values.image.tag.phraseanet }}
-        imagePullPolicy: Always
+        imagePullPolicy: {{ .Values.image.imagePullPolicy }}
         terminationMessagePolicy: FallbackToLogsOnError
         resources:
 {{ toYaml .Values.app.gateway.resources | indent 12 }}

diff --git a/charts/phraseanet/templates/phraseanet-saml-sp.yml b/charts/phraseanet/templates/phraseanet-saml-sp.yml
@@ -47,7 +47,7 @@ spec:
       containers:
       - name: phraseanet-saml-sp
         image: {{ .Values.image.registry }}/phraseanet-saml-sp:{{ .Values.image.tag.phraseanet_saml_sp }}
-        imagePullPolicy: Always
+        imagePullPolicy: {{ .Values.image.imagePullPolicy }}
         terminationMessagePolicy: FallbackToLogsOnError
         resources:
 {{ toYaml .Values.app.web.resources | indent 12 }}

diff --git a/charts/phraseanet/templates/phraseanet-setup.yml b/charts/phraseanet/templates/phraseanet-setup.yml
@@ -48,7 +48,7 @@ spec:
       containers:
       - name: phraseanet-setup
         image: {{ .Values.image.registry }}/phraseanet-setup:{{ .Values.image.tag.phraseanet }}
-        imagePullPolicy: Always
+        imagePullPolicy: {{ .Values.image.imagePullPolicy }}
         terminationMessagePolicy: FallbackToLogsOnError
         resources:
 {{ toYaml .Values.app.web.resources | indent 12 }}

diff --git a/charts/phraseanet/templates/phraseanet.yml b/charts/phraseanet/templates/phraseanet.yml
@@ -56,7 +56,7 @@ spec:
       containers:
       - name: phraseanet-fpm
         image: {{ .Values.image.registry }}/phraseanet-fpm:{{ .Values.image.tag.phraseanet }}
-        imagePullPolicy: Always
+        imagePullPolicy: {{ .Values.image.imagePullPolicy }}
         terminationMessagePolicy: FallbackToLogsOnError
         resources:
 {{ toYaml .Values.app.web.resources | indent 12 }}

diff --git a/charts/phraseanet/templates/worker-cmd.yml b/charts/phraseanet/templates/worker-cmd.yml
@@ -50,7 +50,7 @@ spec:
       containers:
       - name: phraseanet-worker
         image: {{ .Values.image.registry }}/phraseanet-worker:{{ .Values.image.tag.phraseanet }}
-        imagePullPolicy: Always
+        imagePullPolicy: {{ .Values.image.imagePullPolicy }}
         terminationMessagePolicy: FallbackToLogsOnError
         resources:
 {{ toYaml .Values.app.worker.resources | indent 12 }}
@@ -90,8 +90,6 @@ spec:
           value: {{ .Values.php.opcache_enabled | quote }}
         - name: PHP_LOG_LEVEL
           value: {{ .Values.php.log_level | quote }}
-        - name: PHP_UPLOAD_TMP_DIR
-          value: {{ .Values.php.php_upload_tmp_dir | quote }}
         - name: PHP_CLI_MEMORY_LIMIT
           value: {{ .Values.php.php_cli_memory_limit | quote }}
         - name: SESSION_CACHE_LIMITER

diff --git a/charts/phraseanet/templates/worker-exportemail.yml b/charts/phraseanet/templates/worker-exportemail.yml
@@ -44,7 +44,7 @@ spec:
       containers:
       - name: phraseanet-worker
         image: {{ .Values.image.registry }}/phraseanet-worker:{{ .Values.image.tag.phraseanet }}
-        imagePullPolicy: Always
+        imagePullPolicy: {{ .Values.image.imagePullPolicy }}
         terminationMessagePolicy: FallbackToLogsOnError
         resources:
 {{ toYaml .Values.app.worker.resources | indent 12 }}
@@ -82,8 +82,6 @@ spec:
           value: {{ .Values.php.opcache_enabled | quote }}
         - name: PHP_LOG_LEVEL
           value: {{ .Values.php.log_level | quote }}
-        - name: PHP_UPLOAD_TMP_DIR
-          value: {{ .Values.php.php_upload_tmp_dir | quote }}
         - name: PHP_CLI_MEMORY_LIMIT
           value: {{ .Values.php.php_cli_memory_limit | quote }}
         - name: SESSION_CACHE_LIMITER

diff --git a/charts/phraseanet/templates/worker-exportftp.yml b/charts/phraseanet/templates/worker-exportftp.yml
@@ -44,7 +44,7 @@ spec:
       containers:
       - name: phraseanet-worker
         image: {{ .Values.image.registry }}/phraseanet-worker:{{ .Values.image.tag.phraseanet }}
-        imagePullPolicy: Always
+        imagePullPolicy: {{ .Values.image.imagePullPolicy }}
         terminationMessagePolicy: FallbackToLogsOnError
         resources:
 {{ toYaml .Values.app.worker.resources | indent 12 }}
@@ -80,8 +80,6 @@ spec:
           value: {{ .Values.php.opcache_enabled | quote }}
         - name: PHP_LOG_LEVEL
           value: {{ .Values.php.log_level | quote }}
-        - name: PHP_UPLOAD_TMP_DIR
-          value: {{ .Values.php.php_upload_tmp_dir | quote }}
         - name: PHP_CLI_MEMORY_LIMIT
           value: {{ .Values.php.php_cli_memory_limit | quote }}
         - name: SESSION_CACHE_LIMITER

diff --git a/charts/phraseanet/templates/worker-noscalable.yml b/charts/phraseanet/templates/worker-noscalable.yml
@@ -44,7 +44,7 @@ spec:
       containers:
       - name: phraseanet-worker
         image: {{ .Values.image.registry }}/phraseanet-worker:{{ .Values.image.tag.phraseanet }}
-        imagePullPolicy: Always
+        imagePullPolicy: {{ .Values.image.imagePullPolicy }}
         terminationMessagePolicy: FallbackToLogsOnError
         resources:
 {{ toYaml .Values.app.worker.resources | indent 12 }}
@@ -84,8 +84,6 @@ spec:
           value: {{ .Values.php.opcache_enabled | quote }}
         - name: PHP_LOG_LEVEL
           value: {{ .Values.php.log_level | quote }}
-        - name: PHP_UPLOAD_TMP_DIR
-          value: {{ .Values.php.php_upload_tmp_dir | quote }}
         - name: PHP_CLI_MEMORY_LIMIT
           value: {{ .Values.php.php_cli_memory_limit | quote }}
         - name: SESSION_CACHE_LIMITER

diff --git a/charts/phraseanet/templates/worker-ps.yml b/charts/phraseanet/templates/worker-ps.yml
@@ -44,7 +44,7 @@ spec:
       containers:
       - name: phraseanet-worker
         image: {{ .Values.image.registry }}/phraseanet-worker:{{ .Values.image.tag.phraseanet }}
-        imagePullPolicy: Always
+        imagePullPolicy: {{ .Values.image.imagePullPolicy }}
         terminationMessagePolicy: FallbackToLogsOnError
         resources:
 {{ toYaml .Values.app.worker.resources | indent 12 }}
@@ -84,8 +84,6 @@ spec:
           value: {{ .Values.php.opcache_enabled | quote }}
         - name: PHP_LOG_LEVEL
           value: {{ .Values.php.log_level | quote }}
-        - name: PHP_UPLOAD_TMP_DIR
-          value: {{ .Values.php.php_upload_tmp_dir | quote }}
         - name: PHP_CLI_MEMORY_LIMIT
           value: {{ .Values.php.php_cli_memory_limit | quote }}
         - name: SESSION_CACHE_LIMITER

diff --git a/charts/phraseanet/templates/worker-records.yml b/charts/phraseanet/templates/worker-records.yml
@@ -44,7 +44,7 @@ spec:
       containers:
       - name: phraseanet-worker
         image: {{ .Values.image.registry }}/phraseanet-worker:{{ .Values.image.tag.phraseanet }}
-        imagePullPolicy: Always
+        imagePullPolicy: {{ .Values.image.imagePullPolicy }}
         terminationMessagePolicy: FallbackToLogsOnError
         resources:
 {{ toYaml .Values.app.worker.resources | indent 12 }}
@@ -90,8 +90,6 @@ spec:
           value: {{ .Values.php.opcache_enabled | quote }}
         - name: PHP_LOG_LEVEL
           value: {{ .Values.php.log_level | quote }}
-        - name: PHP_UPLOAD_TMP_DIR
-          value: {{ .Values.php.php_upload_tmp_dir | quote }}
         - name: PHP_CLI_MEMORY_LIMIT
           value: {{ .Values.php.php_cli_memory_limit | quote }}
         - name: SESSION_CACHE_LIMITER

diff --git a/charts/phraseanet/templates/worker-scheduler.yaml b/charts/phraseanet/templates/worker-scheduler.yaml
@@ -47,7 +47,7 @@ spec:
       containers:
       - name: phraseanet-worker
         image: {{ .Values.image.registry }}/phraseanet-worker:{{ .Values.image.tag.phraseanet }}
-        imagePullPolicy: Always
+        imagePullPolicy: {{ .Values.image.imagePullPolicy }}
         terminationMessagePolicy: FallbackToLogsOnError
         resources:
 {{ toYaml .Values.app.worker.resources | indent 12 }}
@@ -81,8 +81,6 @@ spec:
           value: {{ .Values.php.opcache_enabled | quote }}
         - name: PHP_LOG_LEVEL
           value: {{ .Values.php.log_level | quote }}
-        - name: PHP_UPLOAD_TMP_DIR
-          value: {{ .Values.php.php_upload_tmp_dir | quote }}
         - name: PHP_CLI_MEMORY_LIMIT
           value: {{ .Values.php.php_cli_memory_limit | quote }}
         - name: SESSION_CACHE_LIMITER

diff --git a/charts/phraseanet/templates/worker-subdefcreation.yml b/charts/phraseanet/templates/worker-subdefcreation.yml
@@ -44,7 +44,7 @@ spec:
       containers:
       - name: phraseanet-worker
         image: {{ .Values.image.registry }}/phraseanet-worker:{{ .Values.image.tag.phraseanet }}
-        imagePullPolicy: Always
+        imagePullPolicy: {{ .Values.image.imagePullPolicy }}
         terminationMessagePolicy: FallbackToLogsOnError
         resources:
 {{ toYaml .Values.app.worker.resources | indent 12 }}
@@ -80,8 +80,6 @@ spec:
           value: {{ .Values.php.opcache_enabled | quote }}
         - name: PHP_LOG_LEVEL
           value: {{ .Values.php.log_level | quote }}
-        - name: PHP_UPLOAD_TMP_DIR
-          value: {{ .Values.php.php_upload_tmp_dir | quote }}
         - name: PHP_CLI_MEMORY_LIMIT
           value: {{ .Values.php.php_cli_memory_limit | quote }}
         - name: SESSION_CACHE_LIMITER

diff --git a/charts/phraseanet/templates/worker-writemetadatas.yml b/charts/phraseanet/templates/worker-writemetadatas.yml
@@ -44,7 +44,7 @@ spec:
       containers:
       - name: phraseanet-worker
         image: {{ .Values.image.registry }}/phraseanet-worker:{{ .Values.image.tag.phraseanet }}
-        imagePullPolicy: Always
+        imagePullPolicy: {{ .Values.image.imagePullPolicy }}
         terminationMessagePolicy: FallbackToLogsOnError
         resources:
 {{ toYaml .Values.app.worker.resources | indent 12 }}
@@ -80,8 +80,6 @@ spec:
           value: {{ .Values.php.opcache_enabled | quote }}
         - name: PHP_LOG_LEVEL
           value: {{ .Values.php.log_level | quote }}
-        - name: PHP_UPLOAD_TMP_DIR
-          value: "/var/alchemy/Phraseanet/tmp/php_upload_tmp"
         - name: PHP_CLI_MEMORY_LIMIT
           value: {{ .Values.php.php_cli_memory_limit | quote }}
         - name: SESSION_CACHE_LIMITER

diff --git a/charts/phraseanet/templates/worker.yml b/charts/phraseanet/templates/worker.yml
@@ -50,7 +50,7 @@ spec:
       containers:
       - name: phraseanet-worker
         image: {{ .Values.image.registry }}/phraseanet-worker:{{ .Values.image.tag.phraseanet }}
-        imagePullPolicy: Always
+        imagePullPolicy: {{ .Values.image.imagePullPolicy }}
         terminationMessagePolicy: FallbackToLogsOnError
         resources:
 {{ toYaml .Values.app.worker.resources | indent 12 }}
@@ -122,8 +122,6 @@ spec:
           value: {{ .Values.php.opcache_enabled | quote }}
         - name: PHP_LOG_LEVEL
           value: {{ .Values.php.log_level | quote }}
-        - name: PHP_UPLOAD_TMP_DIR
-          value: {{ .Values.php.php_upload_tmp_dir | quote }}
         - name: PHP_CLI_MEMORY_LIMIT
           value: {{ .Values.php.php_cli_memory_limit | quote }}
         - name: SESSION_CACHE_LIMITER

diff --git a/charts/phraseanet/values.yaml b/charts/phraseanet/values.yaml
@@ -3,11 +3,12 @@ running: true
 
 image:
   registry: alchemyfr
+  imagePullPolicy: IfNotPresent
   tag:
-      phraseanet: 4.1.8-rc7
+      phraseanet: 4.1.9
       phraseanet_saml_sp: latest
-      database: 4.1.8-rc7
-      elasticsearch: 4.1.8-rc7
+      database: 4.1.9
+      elasticsearch: 4.1.9
   pullSecret:
     enabled: false
     name: registry-secret