diff --git a/swh/templates/loaders/configmap.yaml b/swh/templates/loaders/configmap.yaml index 4e849b2..f6522cc 100644 --- a/swh/templates/loaders/configmap.yaml +++ b/swh/templates/loaders/configmap.yaml @@ -1,64 +1,64 @@ {{ if .Values.loaders.enabled -}} {{- range $loader_type, $deployment_config := .Values.loaders.deployments -}} {{- $loader_name := ( print "loader-" $loader_type ) -}} --- apiVersion: v1 kind: ConfigMap metadata: name: {{ $loader_name }} namespace: {{ $.Values.namespace }} data: config.yml: | storage: cls: pipeline steps: - cls: buffer min_batch_size: content: 1000 content_bytes: 52428800 directory: 1000 directory_entries: 12000 revision: 1000 revision_parents: 2000 revision_bytes: 52428800 release: 1000 release_bytes: 52428800 extid: 1000 - cls: filter - cls: retry - cls: remote - url: http://storage-loaders:{{ $.Values.loaders.storage.port }}/ + url: http://{{ .Values.loaders.storage.host }}:{{ $.Values.loaders.storage.port }}/ celery: task_broker: ##amqp_host## task_queues: {{- range $queue := get $deployment_config "queues" }} - {{ $queue }} {{- end }} entrypoint.sh: | #!/bin/bash set -e # Create the full config filename cat /etc/softwareheritage/config.yml > $SWH_CONFIG_FILENAME # contains required credentials for git loader (with metadata loader inside) # ignored by the other loaders cat /etc/credentials/metadata-fetcher/data >> $SWH_CONFIG_FILENAME # Install the rabbitmq host information sed -i 's,##amqp_host##,'$RABBITMQ_HOST',g' $SWH_CONFIG_FILENAME 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 \ --hostname "${HOSTNAME}" {{ end }} {{- end -}} diff --git a/swh/templates/loaders/services.yaml b/swh/templates/loaders/services.yaml deleted file mode 100644 index ad5da9c..0000000 --- a/swh/templates/loaders/services.yaml +++ /dev/null @@ -1,11 +0,0 @@ -{{ if .Values.loaders.enabled -}} ---- -apiVersion: v1 -kind: Service -metadata: - name: storage-loaders - namespace: {{ $.Values.namespace }} -spec: - type: ExternalName - externalName: {{ .Values.loaders.storage.host }} -{{- end -}}