diff --git a/swh/templates/cookers/configmap.yaml b/swh/templates/cookers/configmap.yaml index 2a342f3..a38d7a1 100644 --- a/swh/templates/cookers/configmap.yaml +++ b/swh/templates/cookers/configmap.yaml @@ -1,68 +1,70 @@ {{ if .Values.cookers.enabled -}} --- apiVersion: v1 kind: ConfigMap metadata: name: cooker-utils namespace: {{ $.Values.namespace }} data: pre-stop-idempotent.sh: | #!/bin/bash # pre-stop hook can be triggered multiple times but we want it to be applied only # once so container can warm-shutdown properly. # When celery receives multiple times the sigterm signal, this ends up doing an # immediate shutdown which prevents long-standing tasks to finish properly. set -ex WITNESS_FILE=/tmp/already-stopped # to support near-immediate concurrent calls sleep $(echo | awk '{print rand()}) if [ ! -e $WITNESS_FILE ]; then touch $WITNESS_FILE kill 1 fi {{ range $cooker_type, $deployment_config := .Values.cookers.deployments }} {{ $cooker_name := ( print "cooker-" $cooker_type ) }} --- apiVersion: v1 kind: ConfigMap metadata: name: {{ $cooker_name }}-template namespace: {{ $.Values.namespace }} data: config.yml.template: | max_bundle_size: 1073741824 storage: cls: retry storage: cls: remote url: http://{{ $.Values.cookers.storage.host }}:{{ $.Values.cookers.storage.port }}/ vault: cls: remote url: http://{{ $.Values.cookers.vault.host }}:{{ $.Values.cookers.vault.port }}/ celery: task_broker: amqp://${AMQP_USERNAME}:${AMQP_PASSWORD}@{{ $.Values.loaders.amqp.host }}:{{ $.Values.loaders.amqp.port }}/ + task_modules: + - swh.vault.cooking_tasks task_queues: {{- range $queue := get $deployment_config "queues" }} - {{ $queue }} {{- end }} init-container-entrypoint.sh: | #!/bin/bash set -e CONFIG_FILE=/etc/swh/config.yml # substitute environment variables when creating the default config.yml eval echo \""$( $CONFIG_FILE exit 0 {{ end }} {{- end -}} diff --git a/values-swh-application-versions.yaml b/values-swh-application-versions.yaml index 616ca3e..ef60452 100644 --- a/values-swh-application-versions.yaml +++ b/values-swh-application-versions.yaml @@ -1,27 +1,27 @@ # This file references the last version of all the softwareheritage images # It's used to manage the automatic update of the environments swh_cookers_image: softwareheritage/vault_cookers -swh_cookers_image_version: "20220926.1" +swh_cookers_image_version: "20220926.2" swh_storage_replayer_image: softwareheritage/storage-replayer swh_storage_replayer_image_version: "20220819.1" swh_graphql_image: softwareheritage/graphql swh_graphql_image_version: "20220913.2" swh_listers_image: softwareheritage/lister swh_listers_image_version: "20220921.1" swh_loaders_image: softwareheritage/loaders swh_loaders_image_version: "20220826.1" swh_loader_bzr_image: softwareheritage/loader_bzr swh_loader_bzr_image_version: "20220909.1" swh_loader_cvs_image: softwareheritage/loader_cvs swh_loader_cvs_image_version: "20220919.2" swh_loader_git_image: softwareheritage/loader_git swh_loader_git_image_version: "20220908.1" swh_loader_highpriority_image: softwareheritage/loader_highpriority swh_loader_highpriority_image_version: "20220908.1" swh_loader_mercurial_image: softwareheritage/loader_mercurial swh_loader_mercurial_image_version: "20220919.1" swh_loader_package_image: softwareheritage/loader_package swh_loader_package_image_version: "20220921.1" swh_loader_svn_image: softwareheritage/loader_svn swh_loader_svn_image_version: "20220919.1"