diff --git a/charts/phraseanet/Chart.yaml b/charts/phraseanet/Chart.yaml index 3c8c1e4..fc38bd4 100644 --- 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 index 1383cb9..1fb5f6e 100644 --- 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 index f667fc7..50e8d7b 100644 --- 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 index 69b55af..96a19f6 100644 --- 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 index 3b6e243..a876844 100644 --- 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 index 0c09983..960d7f9 100644 --- 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 index 89a0f36..7c91a73 100644 --- 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 index 38e4ccc..8bdba1d 100644 --- 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 index 95494b1..87ec98d 100644 --- 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 index 2cd8cbf..ffe0a20 100644 --- 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 index 26c692d..4ae6dd6 100644 --- 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 index ce62061..5364270 100644 --- 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 index e77d24c..90bbf0c 100644 --- 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 index 4ec6306..45fecf8 100644 --- 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 index 6f28db3..e668b33 100644 --- 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 index 06a79ca..c9d465d 100644 --- 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 index 2155053..e9b4ae4 100644 --- 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 index f0056c7..80124de 100644 --- 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 index 2675d75..63703ce 100644 --- 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