diff --git a/swh/templates/listers/configmap.yaml b/swh/templates/listers/configmap.yaml index d90e47d..6089526 100644 --- a/swh/templates/listers/configmap.yaml +++ b/swh/templates/listers/configmap.yaml @@ -1,51 +1,41 @@ {{ if .Values.listers.enabled -}} {{- range $lister_type, $deployment_config := .Values.listers.deployments -}} {{- $lister_name := ( print "lister-" $lister_type ) -}} --- apiVersion: v1 kind: ConfigMap metadata: - name: {{ $lister_name }} + name: {{ $lister_name }}-template namespace: {{ $.Values.namespace }} data: - config.yml: | + config.yml.template: | storage: cls: remote url: http://{{ $.Values.listers.storage.host }}:{{ $.Values.listers.storage.port }}/ scheduler: cls: remote url: http://{{ $.Values.listers.scheduler.host }}:{{ $.Values.listers.scheduler.port }}/ - celery: - task_broker: ##amqp_host## + task_broker: ${host} task_queues: {{- range $queue := get $deployment_config "queues" }} - {{ $queue }} {{- end }} - entrypoint.sh: | + credentials: + init-container-entrypoint.sh: | #!/bin/bash set -e - # Create the full config filename - cat /etc/softwareheritage/config.yml > $SWH_CONFIG_FILENAME - # contains required credentials for lister - cat /etc/credentials/listers/data >> $SWH_CONFIG_FILENAME + CONFIG_FILE=/etc/swh/config.yml + + # substitute environment variables when creating the default config.yml + eval echo \""$( $CONFIG_FILE - # Install the rabbitmq host information - sed -i 's,##amqp_host##,'$RABBITMQ_HOST',g' $SWH_CONFIG_FILENAME + CREDS_LISTER_PATH=/etc/credentials/listers/credentials + [ -f $CREDS_LISTER_PATH ] && \ + sed 's/^/ /g' $CREDS_LISTER_PATH >> $CONFIG_FILE - echo Starting the swh Celery worker - exec python -m celery \ - --app=swh.scheduler.celery_backend.config.app \ - worker \ - --pool=prefork \ - --concurrency=${CONCURRENCY} \ - --max-tasks-per-child=${MAX_TASKS_PER_CHILD} \ - -Ofair --loglevel=${LOGLEVEL} \ - --without-gossip \ - --without-mingle \ - --without-heartbeat \ - --hostname "${HOSTNAME}" {{ end }} {{- end -}} diff --git a/swh/templates/listers/deployment.yaml b/swh/templates/listers/deployment.yaml index 8c82b70..2c8e021 100644 --- a/swh/templates/listers/deployment.yaml +++ b/swh/templates/listers/deployment.yaml @@ -1,107 +1,119 @@ {{ if .Values.listers.enabled -}} {{- $configurationChecksum := include (print $.Template.BasePath "/listers/configmap.yaml") . -}} {{- range $lister_type, $deployment_config := .Values.listers.deployments -}} {{- $lister_name := ( print "lister-" $lister_type ) -}} --- apiVersion: apps/v1 kind: Deployment metadata: name: {{ $lister_name }} namespace: {{ $.Values.namespace }} labels: app: {{ $lister_name }} spec: selector: matchLabels: app: {{ $lister_name }} strategy: type: RollingUpdate rollingUpdate: maxSurge: 1 template: metadata: labels: app: {{ $lister_name }} annotations: # Force a rollout upgrade if the configuration changes checksum/config: {{ $configurationChecksum | sha256sum }} spec: {{- if $.Values.listers.affinity }} affinity: {{ toYaml $.Values.listers.affinity | nindent 8 }} {{- end }} + initContainers: + - name: prepare-configuration + image: debian:bullseye + imagePullPolicy: Always + envFrom: + - secretRef: + # define the ${host) values for configuration "celery > task_broker: " key + name: amqp-access-credentials + command: + - /entrypoint.sh + volumeMounts: + - name: configuration-template + mountPath: /entrypoint.sh + subPath: "init-container-entrypoint.sh" + readOnly: true + - name: configuration + mountPath: /etc/swh + - name: configuration-template + mountPath: /etc/swh/configuration-template + - name: lister-credentials-secrets + mountPath: /etc/credentials/listers + readOnly: true containers: - name: listers - image: {{ $.Values.swh_listers_image }}:{{ $.Values.swh_listers_image_version }} - imagePullPolicy: Always - command: - - /entrypoint.sh resources: requests: memory: {{ get $deployment_config "requestedMemory" | default "512Mi" }} cpu: {{ get $deployment_config "requestedCpu" | default "500m" }} limits: memory: "4000Mi" cpu: "1200m" + image: {{ $.Values.swh_listers_image }}:{{ $.Values.swh_listers_image_version }} + imagePullPolicy: Always + command: + - /bin/bash + args: + - -c + - /opt/swh/entrypoint.sh lifecycle: preStop: exec: command: ["kill", "1"] env: - name: STATSD_HOST value: {{ $.Values.statsdExternalHost | default "prometheus-statsd-exporter" }} - name: STATSD_PORT value: {{ $.Values.statsdPort | default "9125" | quote }} - name: CONCURRENCY value: {{ get $deployment_config "concurrency" | default 1 | quote }} - name: MAX_TASKS_PER_CHILD value: {{ get $deployment_config "maxTasksPerChild" | default 1 | quote }} - name: LOGLEVEL - value: {{ get $deployment_config "logLevel" | default "INFO" }} + value: {{ get $deployment_config "logLevel" | default "INFO" | quote }} - name: SWH_CONFIG_FILENAME - # FIXME: built by entrypoint.sh, determine how to properly declare this - value: /tmp/config.yml + value: /etc/swh/config.yml - name: SWH_SENTRY_ENVIRONMENT value: {{ $.Values.sentry.environment }} - name: SWH_MAIN_PACKAGE value: {{ $.Values.listers.sentrySwhPackage }} - name: SWH_SENTRY_DSN valueFrom: secretKeyRef: name: lister-sentry-secrets key: sentry-dsn # 'name' secret must exist & include key "host" optional: false - - name: RABBITMQ_HOST - valueFrom: - secretKeyRef: - name: amqp-access-credentials - key: host - # 'name' secret must exist & include key "host" - optional: false volumeMounts: - - name: config - mountPath: /etc/softwareheritage/config.yml - subPath: config.yml - readOnly: true - - name: config - mountPath: /entrypoint.sh - subPath: entrypoint.sh - readOnly: true - - name: lister-credentials-secrets - mountPath: /etc/credentials/listers - readOnly: true - - mountPath: /tmp - name: tmp-volume + - name: configuration + mountPath: /etc/swh volumes: - - name: config - configMap: - name: {{ $lister_name }} - defaultMode: 0777 - - name: tmp-volume - emptyDir: {} - - name: lister-credentials-secrets - secret: - secretName: lister-credentials-secrets + - name: configuration + emptyDir: {} + - name: configuration-template + configMap: + name: {{ $lister_name }}-template + defaultMode: 0777 + items: + - key: "config.yml.template" + path: "config.yml.template" + - key: "init-container-entrypoint.sh" + path: "init-container-entrypoint.sh" + - name: lister-credentials-secrets + secret: + secretName: lister-credentials-secrets + optional: true {{ end }} {{- end -}} diff --git a/swh/values/staging.yaml b/swh/values/staging.yaml index f544134..68c004a 100644 --- a/swh/values/staging.yaml +++ b/swh/values/staging.yaml @@ -1,147 +1,148 @@ sentry: environment: staging loaders: enabled: true storage: host: storage1.internal.staging.swh.network port: 5002 amqp: host: scheduler0.internal.staging.swh.network deployments: # bzr: # requestedMemory: 256Mi # requestedCpu: 200m # queues: # - swh.loader.bzr.tasks.LoadBazaar # autoScaling: # queueThreshold: 10 # maxReplicaCount: 3 # sentrySwhPackage: swh.loader.bzr # cvs: # requestedMemory: 256Mi # requestedCpu: 200m # queues: # - swh.loader.cvs.tasks.LoadCvsRepository # autoScaling: # queueThreshold: 10 # maxReplicaCount: 3 # sentrySwhPackage: swh.loader.cvs # hg: # requestedMemory: 256Mi # requestedCpu: 200m # queues: # - swh.loader.mercurial.tasks.LoadArchiveMercurial # - swh.loader.mercurial.tasks.LoadMercurial # autoScaling: # queueThreshold: 10 # maxReplicaCount: 3 # sentrySwhPackage: swh.loader.mercurial highpriority: requestedMemory: 256Mi requestedCpu: 200m queues: - save_code_now:swh.loader.bzr.tasks.LoadBazaar - save_code_now:swh.loader.git.tasks.UpdateGitRepository - save_code_now:swh.loader.git.tasks.LoadDiskGitRepository - save_code_now:swh.loader.git.tasks.UncompressAndLoadDiskGitRepository - save_code_now:swh.loader.mercurial.tasks.LoadArchiveMercurial - save_code_now:swh.loader.mercurial.tasks.LoadMercurial - save_code_now:swh.loader.svn.tasks.LoadSvnRepository - save_code_now:swh.loader.svn.tasks.MountAndLoadSvnRepository - save_code_now:swh.loader.svn.tasks.DumpMountAndLoadSvnRepository - save_code_now:swh.loader.package.archive.tasks.LoadArchive autoScaling: queueThreshold: 10 maxReplicaCount: 3 sentrySwhPackage: swh.loader.highpriority git: requestedMemory: 256Mi requestedCpu: 200m queues: - swh.loader.git.tasks.UpdateGitRepository - swh.loader.git.tasks.LoadDiskGitRepository - swh.loader.git.tasks.UncompressAndLoadDiskGitRepository autoScaling: queueThreshold: 5 # spawn worker per increment of `value` messages maxReplicaCount: 3 sentrySwhPackage: swh.loader.git # maven: # requestedMemory: 256Mi # requestedCpu: 200m # queues: # - swh.loader.package.maven.tasks.LoadMaven # autoScaling: # queueThreshold: 10 # maxReplicaCount: 3 # sentrySwhPackage: swh.loader.core # npm: # requestedMemory: 256Mi # requestedCpu: 200m # queues: # - swh.loader.package.npm.tasks.LoadNpm # autoScaling: # queueThreshold: 10 # maxReplicaCount: 3 # sentrySwhPackage: swh.loader.core pypi: requestedMemory: 256Mi requestedCpu: 200m queues: - swh.loader.package.pypi.tasks.LoadPyPI autoScaling: queueThreshold: 10 maxReplicaCount: 1 sentrySwhPackage: swh.loader.core # svn: # requestedMemory: 256Mi # requestedCpu: 200m # queues: # - swh.loader.svn.tasks.LoadSvnRepository # - swh.loader.svn.tasks.MountAndLoadSvnRepository # - swh.loader.svn.tasks.DumpMountAndLoadSvnRepository # autoScaling: # queueThreshold: 10 # maxReplicaCount: 3 # sentrySwhPackage: swh.loader.svn listers: enabled: true sentrySwhPackage: swh.lister storage: host: storage1.internal.staging.swh.network port: 5002 scheduler: host: scheduler0.internal.staging.swh.network port: 5008 amqp: host: scheduler0.internal.staging.swh.network deployments: gnu-full: queues: - swh.lister.gnu.tasks.GNUListerTask autoScaling: queueThreshold: 10 + minReplicaCount: 0 maxReplicaCount: 1 graphql: enabled: true sentry_enabled: true backends: storage: host: webapp.internal.staging.swh.network port: 5002 search: host: search0.internal.staging.swh.network port: 5010 replicas: 1 gunicorn: threads: 4 workers: 2 timeout: 3600 ingress: enabled: true httpPath: / host: graphql.staging.swh.network logLevel: DEBUG diff --git a/values-swh-application-versions.yaml b/values-swh-application-versions.yaml index 2a4ebff..416a039 100644 --- a/values-swh-application-versions.yaml +++ b/values-swh-application-versions.yaml @@ -1,14 +1,13 @@ # This file references the last version of all the softwareheritage images # It's used to manage the automatic update of the environments swh_storage_replayer_image: softwareheritage/storage-replayer swh_storage_replayer_image_version: "20220819.1" swh_loaders_image: softwareheritage/loaders swh_loaders_image_version: "20220826.1" swh_loader_git_image: softwareheritage/loader_git swh_loader_git_image_version: "20220906.1" swh_graphql_image: softwareheritage/graphql swh_graphql_image_version: "20220826.1" swh_listers_image: softwareheritage/lister -swh_listers_image_version: "20220906.1" - +swh_listers_image_version: "20220907.2"