diff --git a/kubernetes/41-deposit-loaders.yml b/kubernetes/41-deposit-loaders.yml new file mode 100644 index 0000000..c0fa579 --- /dev/null +++ b/kubernetes/41-deposit-loaders.yml @@ -0,0 +1,140 @@ +--- +apiVersion: v1 +kind: ConfigMap +metadata: + name: deposit-loaders +data: + config.yml: | + default_filename: archive.tar + storage: + cls: pipeline + steps: + - cls: buffer + min_batch_size: + content: 10000 + content_bytes: 104857600 + directory: 1000 + revision: 1000 + - cls: filter + - cls: retry + - cls: remote + url: http://storage:5002/ + + celery: + task_broker: amqp://guest:guest@amqp// + task_queues: + - swh.loader.package.deposit.tasks.LoadDeposit + - swh.deposit.loader.tasks.ChecksDepositTsk + + deposit: + url: http://deposit:5006/1/private + auth: + username: test + password: test + + url: http://deposit:5006 + entrypoint-init.sh: | + #!/bin/bash + + set -e + + # echo Waiting for RabbitMQ to start + wait-for-it amqp:5672 -s --timeout=0 + wait-for-it deposit:5006 -s --timeout=0 + wait-for-it scheduler:5008 -s --timeout=0 + + # echo Register task types in scheduler database + swh scheduler --url http://scheduler:5008 task-type register + entrypoint.sh: | + #!/bin/bash + + set -e + + echo Starting the swh Celery worker + exec python -m celery \ + --app=swh.scheduler.celery_backend.config.app \ + worker \ + --pool=prefork --events \ + --concurrency=${CONCURRENCY} \ + --max-tasks-per-child=${MAX_TASKS_PER_CHILD} \ + -Ofair --loglevel=${LOGLEVEL} \ + --hostname "${HOSTNAME}" + +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: deposit-loaders + labels: + app: deposit-loaders +spec: + replicas: 1 + selector: + matchLabels: + app: deposit-loaders + strategy: + type: RollingUpdate + rollingUpdate: + maxSurge: 1 + template: + metadata: + labels: + app: deposit-loaders + spec: + initContainers: + - name: loaders-deposit-init + image: swh/loaders:latest + imagePullPolicy: Always + command: + - /entrypoint.sh + volumeMounts: + - name: config + mountPath: /etc/softwareheritage/config.yml + subPath: config.yml + readOnly: true + - name: config + mountPath: /entrypoint.sh + subPath: entrypoint-init.sh + readOnly: true + containers: + - name: deposit-loaders + image: swh/loaders:latest + imagePullPolicy: Always + command: + - /entrypoint.sh + ports: + - containerPort: 5002 + resources: + requests: + memory: "256Mi" + cpu: "200m" + limits: + memory: "512Mi" + cpu: "400m" + lifecycle: + preStop: + exec: + command: ["kill", "1"] + env: + - name: CONCURRENCY + value: "1" + - name: MAX_TASKS_PER_CHILD + value: "5" + - name: LOGLEVEL + value: "INFO" + - name: SWH_CONFIG_FILENAME + value: /etc/softwareheritage/config.yml + volumeMounts: + - name: config + mountPath: /etc/softwareheritage/config.yml + subPath: config.yml + readOnly: true + - name: config + mountPath: /entrypoint.sh + subPath: entrypoint.sh + readOnly: true + volumes: + - name: config + configMap: + name: deposit-loaders + defaultMode: 0777 diff --git a/skaffold.yaml b/skaffold.yaml index d81151e..c815aac 100644 --- a/skaffold.yaml +++ b/skaffold.yaml @@ -1,115 +1,116 @@ apiVersion: skaffold/v2beta13 kind: Config metadata: name: swh-environment build: local: useBuildkit: true concurrency: 2 artifacts: - image: swh/stack-base context: docker docker: dockerfile: Dockerfile - image: swh/objstorage docker: dockerfile: Dockerfile.objstorage requires: - image: swh/stack-base alias: BASE - image: swh/storage docker: dockerfile: Dockerfile.storage requires: - image: swh/stack-base alias: BASE - image: swh/scheduler docker: dockerfile: Dockerfile.scheduler requires: - image: swh/stack-base alias: BASE - image: swh/webapp docker: dockerfile: Dockerfile.webapp requires: - image: swh/stack-base alias: BASE - image: swh/loaders docker: dockerfile: Dockerfile.loaders requires: - image: swh/stack-base alias: BASE - image: swh/listers docker: dockerfile: Dockerfile.listers requires: - image: swh/stack-base alias: BASE - image: swh/grafana docker: dockerfile: Dockerfile.grafana - image: swh/search docker: dockerfile: Dockerfile.search requires: - image: swh/stack-base alias: BASE - image: swh/counters docker: dockerfile: Dockerfile.counters requires: - image: swh/stack-base alias: BASE - image: swh/indexers docker: dockerfile: Dockerfile.indexers requires: - image: swh/stack-base alias: BASE - image: swh/vault docker: dockerfile: Dockerfile.vault requires: - image: swh/stack-base alias: BASE - image: swh/deposit docker: dockerfile: Dockerfile.deposit requires: - image: swh/stack-base alias: BASE deploy: kubectl: manifests: - kubernetes/01-journal.yml - kubernetes/02-monitoring.yml - kubernetes/05-storage-db.yml - kubernetes/10-objstorage.yml - kubernetes/11-storage.yml - kubernetes/15-scheduler-db.yml - kubernetes/16-rabbitmq.yml - kubernetes/20-scheduler.yml - kubernetes/21-scheduler-runner.yml - kubernetes/22-scheduler-listener.yml - kubernetes/23-scheduler-journal-client.yml - kubernetes/29-web-db.yml - kubernetes/30-webapp.yml - kubernetes/40-loaders.yml + - kubernetes/41-deposit-loaders.yml - kubernetes/45-listers.yml - kubernetes/50-elasticsearch.yml - kubernetes/55-search.yml - kubernetes/56-search-journal-client.yml - kubernetes/60-redis.yml - kubernetes/61-counters.yml - kubernetes/62-counters-journal-client.yml - kubernetes/70-idx-storage-db.yml - kubernetes/71-idx-storage.yml - kubernetes/72-indexers.yml - kubernetes/73-indexer-journal-client.yml - kubernetes/80-vault-db.yml - kubernetes/81-vault.yml - kubernetes/82-cookers.yml - kubernetes/90-deposit-db.yml - kubernetes/91-deposit.yml