storage: Make template multi-instance
In effect, this just renames the current storage instances. That will trigger a new deployment of all storage instances. And as the service got renamed, this will also redeploy all loaders.
This will ease the work to deployment multiple instances (read-write, read-only, ...) on various backends (postgresql, cassandra, ...).
make swh-helm-diff
[swh] Comparing changes between branches production and make-template-storage-multi-instance (per environment)...
Your branch is up to date with 'origin/production'.
[swh] Generate config in production branch for environment staging, namespace swh...
[swh] Generate config in production branch for environment staging, namespace swh-cassandra...
[swh] Generate config in production branch for environment staging, namespace swh-cassandra-next-version...
[swh] Generate config in make-template-storage-multi-instance branch for environment staging...
[swh] Generate config in make-template-storage-multi-instance branch for environment staging...
[swh] Generate config in make-template-storage-multi-instance branch for environment staging...
Your branch is up to date with 'origin/production'.
[swh] Generate config in production branch for environment production, namespace swh...
[swh] Generate config in production branch for environment production, namespace swh-cassandra...
[swh] Generate config in production branch for environment production, namespace swh-cassandra-next-version...
[swh] Generate config in make-template-storage-multi-instance branch for environment production...
[swh] Generate config in make-template-storage-multi-instance branch for environment production...
[swh] Generate config in make-template-storage-multi-instance branch for environment production...
------------- diff for environment staging namespace swh -------------
--- /tmp/swh-chart.swh.qlneL08X/staging-swh.before 2023-11-29 15:47:46.492513337 +0100
+++ /tmp/swh-chart.swh.qlneL08X/staging-swh.after 2023-11-29 15:47:47.172513092 +0100
@@ -4106,21 +4106,21 @@
error_reporter:
db: 1
host: redis-postgresql.redis
port: 6379
---
# Source: swh/templates/storage/configmap.yaml
apiVersion: v1
kind: ConfigMap
metadata:
namespace: swh
- name: storage-configuration-template
+ name: storage-postgresql-configuration-template
data:
config.yml.template: |
storage:
cls: pipeline
steps:
- cls: record_references
- cls: postgresql
db: host=db1.internal.staging.swh.network port=5432 user=swh dbname=swh password=${POSTGRESQL_PASSWORD}
objstorage:
cls: remote
@@ -14357,26 +14357,26 @@
targetPort: 9125
protocol: UDP
- name: http
port: 9102
targetPort: 9102
---
# Source: swh/templates/storage/service.yaml
apiVersion: v1
kind: Service
metadata:
- name: storage
+ name: storage-postgresql
namespace: swh
spec:
type: ClusterIP
selector:
- app: storage
+ app: storage-postgresql
ports:
- port: 5002
targetPort: 5002
name: rpc
---
# Source: swh/templates/web/service.yaml
apiVersion: v1
kind: Service
metadata:
name: web
@@ -23533,39 +23533,39 @@
- name: database-utils
configMap:
name: database-utils
defaultMode: 0555
---
# Source: swh/templates/storage/deployment.yaml
apiVersion: apps/v1
kind: Deployment
metadata:
namespace: swh
- name: storage
+ name: storage-postgresql
labels:
- app: storage
+ app: storage-postgresql
spec:
revisionHistoryLimit: 2
selector:
matchLabels:
- app: storage
+ app: storage-postgresql
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
- app: storage
+ app: storage-postgresql
annotations:
- checksum/config: 8f088db9c5dbc10095a481e58ad8ec0752846e9da2e8d0ccbce5ad0a3f3b85fb
- checksum/config-utils: 95e3ec2d5d9a9195227631abff0736a8d94bcbcc795abf56981a586844da0c79
+ checksum/config: 3dc03240f4d235973642713fd9be1d8cbaa0a20e1754cf78843dc56baa61761c
+ checksum/database-utils: 95e3ec2d5d9a9195227631abff0736a8d94bcbcc795abf56981a586844da0c79
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/storage
operator: In
values:
- "true"
@@ -23590,21 +23590,21 @@
# 'name' secret must exist & include that ^ key
optional: false
volumeMounts:
- name: configuration
mountPath: /etc/swh
- name: configuration-template
mountPath: /etc/swh/configuration-template
containers:
- - name: storage
+ - name: storage-postgresql
resources:
requests:
memory: 1500Mi
cpu: 500m
image: container-registry.softwareheritage.org/swh/infra/swh-apps/storage:20231127.1
imagePullPolicy: IfNotPresent
ports:
- containerPort: 5002
name: rpc
readinessProbe:
@@ -23653,21 +23653,21 @@
- name: SWH_SENTRY_DISABLE_LOGGING_EVENTS
value: "true"
volumeMounts:
- name: configuration
mountPath: /etc/swh
volumes:
- name: configuration
emptyDir: {}
- name: configuration-template
configMap:
- name: storage-configuration-template
+ name: storage-postgresql-configuration-template
items:
- key: "config.yml.template"
path: "config.yml.template"
- name: database-utils
configMap:
name: database-utils
defaultMode: 0555
---
# Source: swh/templates/toolbox/deployment.yaml
apiVersion: apps/v1
@@ -24263,28 +24263,28 @@
name: cpu
target:
type: Utilization
averageUtilization: 75
---
# Source: swh/templates/storage/autoscaling.yaml
apiVersion: autoscaling/v2
kind: HorizontalPodAutoscaler
metadata:
namespace: swh
- name: storage
+ name: storage-postgresql
labels:
- app: storage
+ app: storage-postgresql
spec:
scaleTargetRef:
apiVersion: apps/v1
kind: Deployment
- name: storage
+ name: storage-postgresql
minReplicas: 2
maxReplicas: 10
metrics:
- type: Resource
resource:
name: cpu
target:
type: Utilization
averageUtilization: 150
---
@@ -24567,44 +24567,44 @@
service:
name: search-rpc
port:
number: 5010
---
# Source: swh/templates/storage/ingress.yaml
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
namespace: swh
- name: storage-ingress-default
+ name: storage-postgresql-ingress-default
annotations:
spec:
rules:
- host: storage-postgresql-rpc-ingress
http:
paths:
- path: /
pathType: Prefix
backend:
service:
- name: storage
+ name: storage-postgresql
port:
number: 5002
- host: storage-postgresql.internal.staging.swh.network
http:
paths:
- path: /
pathType: Prefix
backend:
service:
- name: storage
+ name: storage-postgresql
port:
number: 5002
---
# Source: swh/templates/web/ingress.yaml
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
namespace: swh
name: web-ingress-authenticated
annotations:
------------- diff for environment staging namespace swh-cassandra -------------
--- /tmp/swh-chart.swh.qlneL08X/staging-swh-cassandra.before 2023-11-29 15:47:46.712513258 +0100
+++ /tmp/swh-chart.swh.qlneL08X/staging-swh-cassandra.after 2023-11-29 15:47:47.396513011 +0100
@@ -350,24 +350,24 @@
data:
config.yml.template: |
instance_name: deposit-rpc-ingress
allowed_hosts:
- deposit-rpc-ingress
- deposit.staging.swh.network
- deposit-dynamic.internal.staging.swh.network
swh_authority_url: deposit-rpc-ingress
storage:
cls: remote
- url: http://storage:5002
+ url: http://storage-cassandra:5002
storage_metadata:
cls: remote
- url: http://storage:5002
+ url: http://storage-cassandra:5002
scheduler:
cls: remote
url: http://scheduler.internal.staging.swh.network
authentication_provider: keycloak
keycloak:
realm_name: SoftwareHeritageStaging
server_url: https://auth.softwareheritage.org/auth/
private:
secret_key: ${DJANGO_SECRET_KEY}
@@ -391,21 +391,21 @@
apiVersion: v1
kind: ConfigMap
metadata:
name: graphql
namespace: swh-cassandra
data:
# TODO: rename to not have a dot in the name to allow testing
config.yml: |
storage:
cls: remote
- url: http://storage:5002
+ url: http://storage-cassandra:5002
search:
cls: remote
url: http://search-rpc-ingress
debug: true
introspection: true
max_raw_content_size: 10000
@@ -463,21 +463,21 @@
directory_entries: 500
extid: 100
release: 100
release_bytes: 52428800
revision: 100
revision_bytes: 52428800
revision_parents: 200
- cls: filter
- cls: retry
- cls: remote
- url: http://storage:5002
+ url: http://storage-cassandra:5002
scheduler:
cls: remote
url: http://scheduler.internal.staging.swh.network
journal:
brokers:
- journal1.internal.staging.swh.network:9094
group_id: swh-archive-stg-loader_metadata.journal_client
prefix: swh.journal.objects
sasl.mechanism: SCRAM-SHA-512
@@ -552,21 +552,21 @@
directory_entries: 500
extid: 100
release: 100
release_bytes: 52428800
revision: 100
revision_bytes: 52428800
revision_parents: 200
- cls: filter
- cls: retry
- cls: remote
- url: http://storage:5002
+ url: http://storage-cassandra:5002
celery:
task_broker: amqp://swhconsumer:${AMQP_PASSWORD}@scheduler0.internal.staging.swh.network:5672/%2f
task_acks_late: true
task_queues:
- add_forge_now:swh.loader.git.tasks.UpdateGitRepository
sentry_settings_for_celery_tasks:
__sentry-settings-for-celery-tasks__
metadata_fetcher_credentials:
__metadata-fetcher-credentials__
@@ -655,21 +655,21 @@
directory_entries: 500
extid: 100
release: 100
release_bytes: 52428800
revision: 100
revision_bytes: 52428800
revision_parents: 200
- cls: filter
- cls: retry
- cls: remote
- url: http://storage:5002
+ url: http://storage-cassandra:5002
celery:
task_broker: amqp://swhconsumer:${AMQP_PASSWORD}@scheduler0.internal.staging.swh.network:5672/%2f
task_acks_late: true
task_queues:
- add_forge_now_slow:swh.loader.git.tasks.UpdateGitRepository
sentry_settings_for_celery_tasks:
__sentry-settings-for-celery-tasks__
metadata_fetcher_credentials:
__metadata-fetcher-credentials__
@@ -758,21 +758,21 @@
directory_entries: 500
extid: 100
release: 100
release_bytes: 52428800
revision: 100
revision_bytes: 52428800
revision_parents: 200
- cls: filter
- cls: retry
- cls: remote
- url: http://storage:5002
+ url: http://storage-cassandra:5002
celery:
task_broker: amqp://swhconsumer:${AMQP_PASSWORD}@scheduler0.internal.staging.swh.network:5672/%2f
task_acks_late: false
task_queues:
- swh.loader.package.arch.tasks.LoadArch
sentry_settings_for_celery_tasks:
__sentry-settings-for-celery-tasks__
metadata_fetcher_credentials:
__metadata-fetcher-credentials__
@@ -861,21 +861,21 @@
directory_entries: 500
extid: 100
release: 100
release_bytes: 52428800
revision: 100
revision_bytes: 52428800
revision_parents: 200
- cls: filter
- cls: retry
- cls: remote
- url: http://storage:5002
+ url: http://storage-cassandra:5002
celery:
task_broker: amqp://swhconsumer:${AMQP_PASSWORD}@scheduler0.internal.staging.swh.network:5672/%2f
task_acks_late: false
task_queues:
- swh.loader.package.archive.tasks.LoadTarball
sentry_settings_for_celery_tasks:
__sentry-settings-for-celery-tasks__
metadata_fetcher_credentials:
__metadata-fetcher-credentials__
@@ -964,21 +964,21 @@
directory_entries: 500
extid: 100
release: 100
release_bytes: 52428800
revision: 100
revision_bytes: 52428800
revision_parents: 200
- cls: filter
- cls: retry
- cls: remote
- url: http://storage:5002
+ url: http://storage-cassandra:5002
celery:
task_broker: amqp://swhconsumer:${AMQP_PASSWORD}@scheduler0.internal.staging.swh.network:5672/%2f
task_acks_late: false
task_queues:
- swh.loader.package.aur.tasks.LoadAur
sentry_settings_for_celery_tasks:
__sentry-settings-for-celery-tasks__
metadata_fetcher_credentials:
__metadata-fetcher-credentials__
@@ -1067,21 +1067,21 @@
directory_entries: 500
extid: 100
release: 100
release_bytes: 52428800
revision: 100
revision_bytes: 52428800
revision_parents: 200
- cls: filter
- cls: retry
- cls: remote
- url: http://storage:5002
+ url: http://storage-cassandra:5002
celery:
task_broker: amqp://swhconsumer:${AMQP_PASSWORD}@scheduler0.internal.staging.swh.network:5672/%2f
task_acks_late: false
task_queues:
- swh.loader.package.bioconductor.tasks.LoadBioconductor
sentry_settings_for_celery_tasks:
__sentry-settings-for-celery-tasks__
metadata_fetcher_credentials:
__metadata-fetcher-credentials__
@@ -1170,21 +1170,21 @@
directory_entries: 500
extid: 100
release: 100
release_bytes: 52428800
revision: 100
revision_bytes: 52428800
revision_parents: 200
- cls: filter
- cls: retry
- cls: remote
- url: http://storage:5002
+ url: http://storage-cassandra:5002
celery:
task_broker: amqp://swhconsumer:${AMQP_PASSWORD}@scheduler0.internal.staging.swh.network:5672/%2f
task_acks_late: false
task_queues:
- swh.loader.bzr.tasks.LoadBazaar
sentry_settings_for_celery_tasks:
__sentry-settings-for-celery-tasks__
metadata_fetcher_credentials:
__metadata-fetcher-credentials__
@@ -1273,21 +1273,21 @@
directory_entries: 500
extid: 100
release: 100
release_bytes: 52428800
revision: 100
revision_bytes: 52428800
revision_parents: 200
- cls: filter
- cls: retry
- cls: remote
- url: http://storage:5002
+ url: http://storage-cassandra:5002
celery:
task_broker: amqp://swhconsumer:${AMQP_PASSWORD}@scheduler0.internal.staging.swh.network:5672/%2f
task_acks_late: false
task_queues:
- swh.loader.core.tasks.LoadContent
sentry_settings_for_celery_tasks:
__sentry-settings-for-celery-tasks__
metadata_fetcher_credentials:
__metadata-fetcher-credentials__
@@ -1376,21 +1376,21 @@
directory_entries: 500
extid: 100
release: 100
release_bytes: 52428800
revision: 100
revision_bytes: 52428800
revision_parents: 200
- cls: filter
- cls: retry
- cls: remote
- url: http://storage:5002
+ url: http://storage-cassandra:5002
celery:
task_broker: amqp://swhconsumer:${AMQP_PASSWORD}@scheduler0.internal.staging.swh.network:5672/%2f
task_acks_late: false
task_queues:
- swh.loader.package.cran.tasks.LoadCRAN
sentry_settings_for_celery_tasks:
__sentry-settings-for-celery-tasks__
metadata_fetcher_credentials:
__metadata-fetcher-credentials__
@@ -1479,21 +1479,21 @@
directory_entries: 500
extid: 100
release: 100
release_bytes: 52428800
revision: 100
revision_bytes: 52428800
revision_parents: 200
- cls: filter
- cls: retry
- cls: remote
- url: http://storage:5002
+ url: http://storage-cassandra:5002
celery:
task_broker: amqp://swhconsumer:${AMQP_PASSWORD}@scheduler0.internal.staging.swh.network:5672/%2f
task_acks_late: false
task_queues:
- swh.loader.cvs.tasks.LoadCvsRepository
sentry_settings_for_celery_tasks:
__sentry-settings-for-celery-tasks__
metadata_fetcher_credentials:
__metadata-fetcher-credentials__
@@ -1582,21 +1582,21 @@
directory_entries: 500
extid: 100
release: 100
release_bytes: 52428800
revision: 100
revision_bytes: 52428800
revision_parents: 200
- cls: filter
- cls: retry
- cls: remote
- url: http://storage:5002
+ url: http://storage-cassandra:5002
celery:
task_broker: amqp://swhconsumer:${AMQP_PASSWORD}@scheduler0.internal.staging.swh.network:5672/%2f
task_acks_late: false
task_queues:
- swh.loader.package.debian.tasks.LoadDebian
sentry_settings_for_celery_tasks:
__sentry-settings-for-celery-tasks__
metadata_fetcher_credentials:
__metadata-fetcher-credentials__
@@ -1685,21 +1685,21 @@
directory_entries: 500
extid: 100
release: 100
release_bytes: 52428800
revision: 100
revision_bytes: 52428800
revision_parents: 200
- cls: filter
- cls: retry
- cls: remote
- url: http://storage:5002
+ url: http://storage-cassandra:5002
default_filename:
archive.tar
deposit:
auth:
password: ${DEPOSIT_PASSWORD}
username: ${DEPOSIT_USERNAME}
url: https://deposit-dynamic.internal.staging.swh.network/1/private
celery:
task_broker: amqp://swhconsumer:${AMQP_PASSWORD}@scheduler0.internal.staging.swh.network:5672/%2f
task_acks_late: false
@@ -1795,21 +1795,21 @@
directory_entries: 500
extid: 100
release: 100
release_bytes: 52428800
revision: 100
revision_bytes: 52428800
revision_parents: 200
- cls: filter
- cls: retry
- cls: remote
- url: http://storage:5002
+ url: http://storage-cassandra:5002
celery:
task_broker: amqp://swhconsumer:${AMQP_PASSWORD}@scheduler0.internal.staging.swh.network:5672/%2f
task_acks_late: false
task_queues:
- swh.loader.core.tasks.LoadTarballDirectory
sentry_settings_for_celery_tasks:
__sentry-settings-for-celery-tasks__
metadata_fetcher_credentials:
__metadata-fetcher-credentials__
@@ -1898,21 +1898,21 @@
directory_entries: 500
extid: 100
release: 100
release_bytes: 52428800
revision: 100
revision_bytes: 52428800
revision_parents: 200
- cls: filter
- cls: retry
- cls: remote
- url: http://storage:5002
+ url: http://storage-cassandra:5002
celery:
task_broker: amqp://swhconsumer:${AMQP_PASSWORD}@scheduler0.internal.staging.swh.network:5672/%2f
task_acks_late: false
task_queues:
- swh.loader.git.tasks.UpdateGitRepository
- swh.loader.git.tasks.LoadDiskGitRepository
- swh.loader.git.tasks.UncompressAndLoadDiskGitRepository
sentry_settings_for_celery_tasks:
__sentry-settings-for-celery-tasks__
@@ -2003,21 +2003,21 @@
directory_entries: 500
extid: 100
release: 100
release_bytes: 52428800
revision: 100
revision_bytes: 52428800
revision_parents: 200
- cls: filter
- cls: retry
- cls: remote
- url: http://storage:5002
+ url: http://storage-cassandra:5002
celery:
task_broker: amqp://swhconsumer:${AMQP_PASSWORD}@scheduler0.internal.staging.swh.network:5672/%2f
task_acks_late: false
task_queues:
- swh.loader.git.tasks.LoadGitCheckout
sentry_settings_for_celery_tasks:
__sentry-settings-for-celery-tasks__
metadata_fetcher_credentials:
__metadata-fetcher-credentials__
@@ -2106,21 +2106,21 @@
directory_entries: 500
extid: 100
release: 100
release_bytes: 52428800
revision: 100
revision_bytes: 52428800
revision_parents: 200
- cls: filter
- cls: retry
- cls: remote
- url: http://storage:5002
+ url: http://storage-cassandra:5002
celery:
task_broker: amqp://swhconsumer:${AMQP_PASSWORD}@scheduler0.internal.staging.swh.network:5672/%2f
task_acks_late: false
task_queues:
- swh.loader.package.golang.tasks.LoadGolang
sentry_settings_for_celery_tasks:
__sentry-settings-for-celery-tasks__
metadata_fetcher_credentials:
__metadata-fetcher-credentials__
@@ -2209,21 +2209,21 @@
directory_entries: 500
extid: 100
release: 100
release_bytes: 52428800
revision: 100
revision_bytes: 52428800
revision_parents: 200
- cls: filter
- cls: retry
- cls: remote
- url: http://storage:5002
+ url: http://storage-cassandra:5002
celery:
task_broker: amqp://swhconsumer:${AMQP_PASSWORD}@scheduler0.internal.staging.swh.network:5672/%2f
task_acks_late: false
task_queues:
- swh.loader.mercurial.tasks.LoadMercurialCheckout
sentry_settings_for_celery_tasks:
__sentry-settings-for-celery-tasks__
metadata_fetcher_credentials:
__metadata-fetcher-credentials__
@@ -2312,21 +2312,21 @@
directory_entries: 500
extid: 100
release: 100
release_bytes: 52428800
revision: 100
revision_bytes: 52428800
revision_parents: 200
- cls: filter
- cls: retry
- cls: remote
- url: http://storage:5002
+ url: http://storage-cassandra:5002
celery:
task_broker: amqp://swhconsumer:${AMQP_PASSWORD}@scheduler0.internal.staging.swh.network:5672/%2f
task_acks_late: false
task_queues:
- swh.loader.package.maven.tasks.LoadMaven
sentry_settings_for_celery_tasks:
__sentry-settings-for-celery-tasks__
metadata_fetcher_credentials:
__metadata-fetcher-credentials__
@@ -2415,21 +2415,21 @@
directory_entries: 500
extid: 100
release: 100
release_bytes: 52428800
revision: 100
revision_bytes: 52428800
revision_parents: 200
- cls: filter
- cls: retry
- cls: remote
- url: http://storage:5002
+ url: http://storage-cassandra:5002
celery:
task_broker: amqp://swhconsumer:${AMQP_PASSWORD}@scheduler0.internal.staging.swh.network:5672/%2f
task_acks_late: false
task_queues:
- swh.loader.mercurial.tasks.LoadArchiveMercurial
- swh.loader.mercurial.tasks.LoadMercurial
sentry_settings_for_celery_tasks:
__sentry-settings-for-celery-tasks__
metadata_fetcher_credentials:
@@ -2519,21 +2519,21 @@
directory_entries: 500
extid: 100
release: 100
release_bytes: 52428800
revision: 100
revision_bytes: 52428800
revision_parents: 200
- cls: filter
- cls: retry
- cls: remote
- url: http://storage:5002
+ url: http://storage-cassandra:5002
celery:
task_broker: amqp://swhconsumer:${AMQP_PASSWORD}@scheduler0.internal.staging.swh.network:5672/%2f
task_acks_late: false
task_queues:
- swh.loader.package.npm.tasks.LoadNpm
sentry_settings_for_celery_tasks:
__sentry-settings-for-celery-tasks__
metadata_fetcher_credentials:
__metadata-fetcher-credentials__
@@ -2622,21 +2622,21 @@
directory_entries: 500
extid: 100
release: 100
release_bytes: 52428800
revision: 100
revision_bytes: 52428800
revision_parents: 200
- cls: filter
- cls: retry
- cls: remote
- url: http://storage:5002
+ url: http://storage-cassandra:5002
celery:
task_broker: amqp://swhconsumer:${AMQP_PASSWORD}@scheduler0.internal.staging.swh.network:5672/%2f
task_acks_late: false
task_queues:
- swh.loader.package.opam.tasks.LoadOpam
sentry_settings_for_celery_tasks:
__sentry-settings-for-celery-tasks__
metadata_fetcher_credentials:
__metadata-fetcher-credentials__
@@ -2725,21 +2725,21 @@
directory_entries: 500
extid: 100
release: 100
release_bytes: 52428800
revision: 100
revision_bytes: 52428800
revision_parents: 200
- cls: filter
- cls: retry
- cls: remote
- url: http://storage:5002
+ url: http://storage-cassandra:5002
celery:
task_broker: amqp://swhconsumer:${AMQP_PASSWORD}@scheduler0.internal.staging.swh.network:5672/%2f
task_acks_late: false
task_queues:
- swh.loader.package.pubdev.tasks.LoadPubDev
sentry_settings_for_celery_tasks:
__sentry-settings-for-celery-tasks__
metadata_fetcher_credentials:
__metadata-fetcher-credentials__
@@ -2828,21 +2828,21 @@
directory_entries: 500
extid: 100
release: 100
release_bytes: 52428800
revision: 100
revision_bytes: 52428800
revision_parents: 200
- cls: filter
- cls: retry
- cls: remote
- url: http://storage:5002
+ url: http://storage-cassandra:5002
celery:
task_broker: amqp://swhconsumer:${AMQP_PASSWORD}@scheduler0.internal.staging.swh.network:5672/%2f
task_acks_late: false
task_queues:
- swh.loader.package.pypi.tasks.LoadPyPI
sentry_settings_for_celery_tasks:
__sentry-settings-for-celery-tasks__
metadata_fetcher_credentials:
__metadata-fetcher-credentials__
@@ -2931,21 +2931,21 @@
directory_entries: 500
extid: 100
release: 100
release_bytes: 52428800
revision: 100
revision_bytes: 52428800
revision_parents: 200
- cls: filter
- cls: retry
- cls: remote
- url: http://storage:5002
+ url: http://storage-cassandra:5002
celery:
task_broker: amqp://swhconsumer:${AMQP_PASSWORD}@scheduler0.internal.staging.swh.network:5672/%2f
task_acks_late: false
task_queues:
- swh.loader.package.rpm.tasks.LoadRpm
sentry_settings_for_celery_tasks:
__sentry-settings-for-celery-tasks__
metadata_fetcher_credentials:
__metadata-fetcher-credentials__
@@ -3034,21 +3034,21 @@
directory_entries: 500
extid: 100
release: 100
release_bytes: 52428800
revision: 100
revision_bytes: 52428800
revision_parents: 200
- cls: filter
- cls: retry
- cls: remote
- url: http://storage:5002
+ url: http://storage-cassandra:5002
celery:
task_broker: amqp://swhconsumer:${AMQP_PASSWORD}@scheduler0.internal.staging.swh.network:5672/%2f
task_acks_late: true
task_queues:
- save_code_now:swh.loader.bzr.tasks.LoadBazaar
- save_code_now:swh.loader.cvs.tasks.LoadCvsRepository
- 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
@@ -3147,21 +3147,21 @@
directory_entries: 500
extid: 100
release: 100
release_bytes: 52428800
revision: 100
revision_bytes: 52428800
revision_parents: 200
- cls: filter
- cls: retry
- cls: remote
- url: http://storage:5002
+ url: http://storage-cassandra:5002
celery:
task_broker: amqp://swhconsumer:${AMQP_PASSWORD}@scheduler0.internal.staging.swh.network:5672/%2f
task_acks_late: false
task_queues:
- swh.loader.svn.tasks.LoadSvnRepository
- swh.loader.svn.tasks.MountAndLoadSvnRepository
- swh.loader.svn.tasks.DumpMountAndLoadSvnRepository
sentry_settings_for_celery_tasks:
__sentry-settings-for-celery-tasks__
@@ -3252,21 +3252,21 @@
directory_entries: 500
extid: 100
release: 100
release_bytes: 52428800
revision: 100
revision_bytes: 52428800
revision_parents: 200
- cls: filter
- cls: retry
- cls: remote
- url: http://storage:5002
+ url: http://storage-cassandra:5002
celery:
task_broker: amqp://swhconsumer:${AMQP_PASSWORD}@scheduler0.internal.staging.swh.network:5672/%2f
task_acks_late: false
task_queues:
- swh.loader.svn.tasks.LoadSvnExport
sentry_settings_for_celery_tasks:
__sentry-settings-for-celery-tasks__
metadata_fetcher_credentials:
__metadata-fetcher-credentials__
@@ -3987,21 +3987,21 @@
error_reporter:
db: 1
host: redis.redis
port: 6379
---
# Source: swh/templates/storage/configmap.yaml
apiVersion: v1
kind: ConfigMap
metadata:
namespace: swh-cassandra
- name: storage-configuration-template
+ name: storage-cassandra-configuration-template
data:
config.yml.template: |
storage:
cls: cassandra
hosts:
- cassandra1.internal.staging.swh.network
- cassandra2.internal.staging.swh.network
- cassandra3.internal.staging.swh.network
keyspace: swh
consistency_level: LOCAL_QUORUM
@@ -4345,21 +4345,21 @@
namespace: swh-cassandra
name: web-configuration-template
data:
config.yml.template: |
instance_name: webapp.staging.swh.network
allowed_hosts:
- webapp.staging.swh.network
- webapp-cassandra.internal.staging.swh.network
storage:
cls: remote
- url: http://storage:5002
+ url: http://storage-cassandra:5002
search:
cls: remote
url: http://search-rpc-ingress
scheduler:
cls: remote
url: http://scheduler.internal.staging.swh.network
vault:
cls: remote
url: http://vault-rpc-ingress
indexer_storage:
@@ -14130,26 +14130,26 @@
targetPort: 9125
protocol: UDP
- name: http
port: 9102
targetPort: 9102
---
# Source: swh/templates/storage/service.yaml
apiVersion: v1
kind: Service
metadata:
- name: storage
+ name: storage-cassandra
namespace: swh-cassandra
spec:
type: ClusterIP
selector:
- app: storage
+ app: storage-cassandra
ports:
- port: 5002
targetPort: 5002
name: rpc
---
# Source: swh/templates/vault/rpc-service.yaml
apiVersion: v1
kind: Service
metadata:
name: vault-rpc
@@ -14818,21 +14818,21 @@
app: deposit
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: deposit
annotations:
- checksum/config: 0a566d92e3b85f3b9f0d2b33ce2d99ed82beabab16b215c8828e3e75331a6471
+ checksum/config: 045a70eef68ad40d6c8b1c67c2a91870b9300dc63d7f9c199327ed7b2949e8c8
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/deposit
operator: In
values:
- "true"
@@ -15028,21 +15028,21 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: graphql
annotations:
# Force a rollout upgrade if the configuration changes
- checksum/config: 69cb90bb582e0f8187da4170bdff4dd975bc9656604a8d4004b553f9d7be13cd
+ checksum/config: 8f834fd91760d3381135f4ee5774a574f4e13fed55154bc2ee115a8b5c63074d
spec:
priorityClassName: swh-cassandra-frontend-rpc
containers:
- name: graphql
image: container-registry.softwareheritage.org/swh/infra/swh-apps/graphql:20231127.1
imagePullPolicy: IfNotPresent
resources:
requests:
memory: 150Mi
@@ -15116,21 +15116,21 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: loader-metadata
annotations:
# Force a rollout upgrade if the configuration changes
- checksum/config: 5215d87438da93c3c0e51258c2bfa4385b1d3ee5017ef718bc9d90f782f0645a
+ checksum/config: ba8cf50cd132ba1e5fc0c55464abbb8036f6c2c40bf3e47f06e3db8b7f317578
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/loader-metadata
operator: In
values:
@@ -15243,21 +15243,21 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: loader-add-forge-now
annotations:
# Force a rollout upgrade if the configuration changes
- checksum/config: 62874254d1e65c6213dec69cd9b83304e42f441f1f9e9d4f8cfcd774020f2bb5
+ checksum/config: f8585badc23ab620c770fb09d9467037de6eda5b0bd0d08ad8e0627eb85601b9
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/loader
operator: In
values:
- "true"
@@ -15409,21 +15409,21 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: loader-add-forge-now-slow
annotations:
# Force a rollout upgrade if the configuration changes
- checksum/config: 1f7f03736929b85fdb04b5e752d90c163394ecda6acae5e8a1a90e497da2e4d4
+ checksum/config: bf7ffe29e45b6759b9ac9c8a4bac7c4089d4c273a65620730294c100f94a2088
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/loader
operator: In
values:
- "true"
@@ -15575,21 +15575,21 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: loader-arch
annotations:
# Force a rollout upgrade if the configuration changes
- checksum/config: ba6f9b7d08a2034d03c34836ffafb9e3678d46c44144c1d92081d0677503826b
+ checksum/config: 956cd24653e46d1f89d34863218c49c4020e7d72678ba78d7ef2840cd212ca31
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/loader
operator: In
values:
- "true"
@@ -15741,21 +15741,21 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: loader-archive
annotations:
# Force a rollout upgrade if the configuration changes
- checksum/config: 4ef91f4f77b56888763336865c2d1fc9be0a52c5e0ef86013317e283cd02e8d8
+ checksum/config: 36d74578ddac552ef42566e2a7cb231dc3327d43ef625adac2eee074aef40f28
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/loader
operator: In
values:
- "true"
@@ -15907,21 +15907,21 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: loader-aur
annotations:
# Force a rollout upgrade if the configuration changes
- checksum/config: 01340f9c16b54582c60b051e1252c90a717dec61b6f7c7ea1a846fe67075aee2
+ checksum/config: 8a6a796b86b96cc2882227977867acd66a822c98bdd6189d68b4c8952c0da3ea
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/loader
operator: In
values:
- "true"
@@ -16073,21 +16073,21 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: loader-bioconductor
annotations:
# Force a rollout upgrade if the configuration changes
- checksum/config: a337604646ca91b82300bee37eff2634ecbd111ff9ef895613924b87fd67d351
+ checksum/config: d466170e1eefce4c165ea7638325b8af56c37950d092466c01b71106826cf0dc
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/loader
operator: In
values:
- "true"
@@ -16239,21 +16239,21 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: loader-bzr
annotations:
# Force a rollout upgrade if the configuration changes
- checksum/config: 825666e78b38b7d3ae7a9af6cf77c855d8695949f0d9b88ceb71c4b27d9be1fe
+ checksum/config: d261696529af44b74596a9f20efd7b5e831f3f1260e3d9b7eaaf860940fd5b94
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/loader
operator: In
values:
- "true"
@@ -16405,21 +16405,21 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: loader-content
annotations:
# Force a rollout upgrade if the configuration changes
- checksum/config: 8d6ec49af1c6d661a776d78c4bb2173ea92175ba2624bd7220da3c6456b7925a
+ checksum/config: 0274290be8c31cb8b6b66903f5b4443b59a27a190806d13cbc0bee24ad86e342
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/loader
operator: In
values:
- "true"
@@ -16571,21 +16571,21 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: loader-cran
annotations:
# Force a rollout upgrade if the configuration changes
- checksum/config: 2648478593ba2fca2510787b5ad516ed8f49c7b840b87dc122626030062bb8f3
+ checksum/config: 58a957484c1b178193594f6c1b301672e8001fbd91e59b0ec79fcdf4ef86cdfa
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/loader
operator: In
values:
- "true"
@@ -16737,21 +16737,21 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: loader-cvs
annotations:
# Force a rollout upgrade if the configuration changes
- checksum/config: 85f7e0394cec9cc8c4d15d5acf5940bf46d1ae0f9d0b176e71837f66c85a3c10
+ checksum/config: 165f05a334d5568446fff6a0e0339a374182425007e1a7239149e8f9ae03ad9a
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/loader
operator: In
values:
- "true"
@@ -16903,21 +16903,21 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: loader-debian
annotations:
# Force a rollout upgrade if the configuration changes
- checksum/config: 2afe8d7e53ef2ad6e08e7e9884295d89aa001d8ba9c9ee60f59770c2a5c31c97
+ checksum/config: c8c2bbb3a534c5f2be4bd77a34d3087ec860784c2d7a0d3797290c4b6a7a8048
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/loader
operator: In
values:
- "true"
@@ -17069,21 +17069,21 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: loader-deposit
annotations:
# Force a rollout upgrade if the configuration changes
- checksum/config: 8fa9f0697c24fbff3e770a6709b008933a7c285656a17abe383ee382c756932d
+ checksum/config: 3a91e1ce68b18ecd384c6274cbd276c16f85b6db370abfd25a2011fadd26eff4
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/loader
operator: In
values:
- "true"
@@ -17249,21 +17249,21 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: loader-directory
annotations:
# Force a rollout upgrade if the configuration changes
- checksum/config: ef181df9151d37c6a35103fb5bc847f8c3343f917e149e512a2c8b1a0635d24d
+ checksum/config: f2586fe462230c204cc87ea1fd8c2854ae4c687d39c3cd63800f32a2d8be2adc
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/loader
operator: In
values:
- "true"
@@ -17418,21 +17418,21 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: loader-git
annotations:
# Force a rollout upgrade if the configuration changes
- checksum/config: f42421762ef3268c251e1d634204a9553b07c807cadab68dd8d5bcaa0be34591
+ checksum/config: 2891a2564f7cd2a435c0d6f71ad38a9a65b4d4ce6dbd6c685dd339a5a45c44ad
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/loader
operator: In
values:
- "true"
@@ -17583,21 +17583,21 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: loader-git-checkout
annotations:
# Force a rollout upgrade if the configuration changes
- checksum/config: f3b06562bbb077240fb383088701a87552f55d9bee0a672bda0248489df39ac5
+ checksum/config: 16a3e425869b19374b05f30b4e47835d043a350e1bb8b4f9cb0aa92daa880999
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/loader
operator: In
values:
- "true"
@@ -17749,21 +17749,21 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: loader-golang
annotations:
# Force a rollout upgrade if the configuration changes
- checksum/config: da1f47e8d70821ef21679cb681894d6d26dff5adaece3e73955c984963bff700
+ checksum/config: c78cb1f89e89064d29fd2e3c3813c670b0b06aa59dec220d93909f58cb2caf71
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/loader
operator: In
values:
- "true"
@@ -17915,21 +17915,21 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: loader-hg-checkout
annotations:
# Force a rollout upgrade if the configuration changes
- checksum/config: b12ba5db76e8073d04c58e7a694eba06eaa0a8bdb34efc4e7e8fc984f4ae72d9
+ checksum/config: 6d7036c221efa01784700e778548bd0bd16456ed7672c76e10db8767213462f8
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/loader
operator: In
values:
- "true"
@@ -18081,21 +18081,21 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: loader-maven
annotations:
# Force a rollout upgrade if the configuration changes
- checksum/config: 5997ce25892e9e6f75593259f44174f2cae5b16fd6da9678bd7afc277db63d2d
+ checksum/config: 01ad601355c74ead05e86110f644b32356a0296431d5832a360fd33830b88703
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/loader
operator: In
values:
- "true"
@@ -18247,21 +18247,21 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: loader-mercurial
annotations:
# Force a rollout upgrade if the configuration changes
- checksum/config: 86e201d9c711d3e3b5058e6b0179c897409abb629e876b0fd71200b7de3c4b48
+ checksum/config: 49cbbe79c685924416d472e5e015fbac783be0b9c2d268af0976196f76dd70db
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/loader
operator: In
values:
- "true"
@@ -18413,21 +18413,21 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: loader-npm
annotations:
# Force a rollout upgrade if the configuration changes
- checksum/config: 82d91b813f4d886d101e1e417c4eebf62df059b8eddbdb9a62606e6927228c46
+ checksum/config: da9986adbcc785b140ad70378efcfe3b02e6b637de8e52dad9944728fb0c0bf1
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/loader
operator: In
values:
- "true"
@@ -18579,21 +18579,21 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: loader-opam
annotations:
# Force a rollout upgrade if the configuration changes
- checksum/config: bff0786da96c36aa157980cb99a301fa33da79233432724782570fc4d74b9a64
+ checksum/config: 34a0321fbaa455ed46b7d43a29785d29bd6c0d0490d5e6002dec2416e6d4e148
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/loader
operator: In
values:
- "true"
@@ -18745,21 +18745,21 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: loader-pubdev
annotations:
# Force a rollout upgrade if the configuration changes
- checksum/config: ac106fea6ae387de7cad90de568b23692dee9fb10a5fc7f68c17527c62c51a11
+ checksum/config: a425e0ac0fb06b7b6a26d976a3ce355b4cd0008a4d167263f67e130db895a3f5
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/loader
operator: In
values:
- "true"
@@ -18911,21 +18911,21 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: loader-pypi
annotations:
# Force a rollout upgrade if the configuration changes
- checksum/config: d5714450e1931ebf7b1d196ccfeb1f35c6bc6ca2cfe5d7f53419c4852e94148d
+ checksum/config: d2a00b558a299876f3ded039f85b2ddf5a1bcb54655b70435813105450f8649c
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/loader
operator: In
values:
- "true"
@@ -19077,21 +19077,21 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: loader-rpm
annotations:
# Force a rollout upgrade if the configuration changes
- checksum/config: 0fa7caa00e7044fbc7800262560e51783d8693d79f8b41955447367d761f4814
+ checksum/config: 9180509b9549d3749dc14bd59d21f05edf218fe9ae71bfd771ce565949554215
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/loader
operator: In
values:
- "true"
@@ -19243,21 +19243,21 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: loader-save-code-now
annotations:
# Force a rollout upgrade if the configuration changes
- checksum/config: 9326d7c49b2b28fd9100b3c42581a2ed18dc0f22866c714d1ef5aea5cf733efa
+ checksum/config: bf2648d5a43b7e3484c8cd49264ff68d149b0f53ebd9ad18bdeecc56a847bce2
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/loader
operator: In
values:
- "true"
@@ -19409,21 +19409,21 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: loader-svn
annotations:
# Force a rollout upgrade if the configuration changes
- checksum/config: f45e719844a6637abff234d169cfa32bbca95eb6ba4119cfcdc43b926d3b5650
+ checksum/config: 1d3996f6bc585fe5fa69f18a68fd3da7cdbcc008bdf9707914ff47890a37fa10
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/loader
operator: In
values:
- "true"
@@ -19577,21 +19577,21 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: loader-svn-export
annotations:
# Force a rollout upgrade if the configuration changes
- checksum/config: d2bd6cc534ccac9ad1d5bb81d1a3bbd47df7998338e2ee259e5b172ca66cbf95
+ checksum/config: 66c4bad88d180e3dd026f6a02e856986d2c03809605e0b621919a2cb082beb14
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/loader
operator: In
values:
- "true"
@@ -21664,39 +21664,39 @@
- name: database-utils
configMap:
name: database-utils
defaultMode: 0555
---
# Source: swh/templates/storage/deployment.yaml
apiVersion: apps/v1
kind: Deployment
metadata:
namespace: swh-cassandra
- name: storage
+ name: storage-cassandra
labels:
- app: storage
+ app: storage-cassandra
spec:
revisionHistoryLimit: 2
selector:
matchLabels:
- app: storage
+ app: storage-cassandra
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
- app: storage
+ app: storage-cassandra
annotations:
- checksum/config: 74608f339a88516dcf9b3d26b060ab6a34a88d5bdb261ac705b366ac7bf52f69
- checksum/config-utils: 885f4088d8181fabbd02e146f85462caced4878849cda6c1aea2f6b5ebc6e4e2
+ checksum/config: f55845138255d1351e70bc27892abf1157b3bea2bdb5afb2d9dbdb6abf3a6633
+ checksum/database-utils: 885f4088d8181fabbd02e146f85462caced4878849cda6c1aea2f6b5ebc6e4e2
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/storage
operator: In
values:
- "true"
@@ -21734,21 +21734,21 @@
args:
- /entrypoints/init-keyspace.py
volumeMounts:
- name: configuration
mountPath: /etc/swh
readOnly: true
- name: database-utils
mountPath: /entrypoints
readOnly: true
containers:
- - name: storage
+ - name: storage-cassandra
resources:
requests:
memory: 1500Mi
cpu: 500m
image: container-registry.softwareheritage.org/swh/infra/swh-apps/storage:20231127.1
imagePullPolicy: IfNotPresent
ports:
- containerPort: 5002
name: rpc
readinessProbe:
@@ -21797,21 +21797,21 @@
- name: SWH_SENTRY_DISABLE_LOGGING_EVENTS
value: "true"
volumeMounts:
- name: configuration
mountPath: /etc/swh
volumes:
- name: configuration
emptyDir: {}
- name: configuration-template
configMap:
- name: storage-configuration-template
+ name: storage-cassandra-configuration-template
items:
- key: "config.yml.template"
path: "config.yml.template"
- name: database-utils
configMap:
name: database-utils
defaultMode: 0555
---
# Source: swh/templates/toolbox/deployment.yaml
apiVersion: apps/v1
@@ -22074,21 +22074,21 @@
app: web
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: web
annotations:
- checksum/config: 1356595d17682ada0bde20a405e329e2d27088bb14744e6e3236193f8b9c7158
+ checksum/config: 21497a4de1edd33eb40d9112656e2012be9eb8ff104ebcc463f2575081f6464c
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/web
operator: In
values:
- "true"
@@ -22333,28 +22333,28 @@
name: cpu
target:
type: Utilization
averageUtilization: 100
---
# Source: swh/templates/storage/autoscaling.yaml
apiVersion: autoscaling/v2
kind: HorizontalPodAutoscaler
metadata:
namespace: swh-cassandra
- name: storage
+ name: storage-cassandra
labels:
- app: storage
+ app: storage-cassandra
spec:
scaleTargetRef:
apiVersion: apps/v1
kind: Deployment
- name: storage
+ name: storage-cassandra
minReplicas: 2
maxReplicas: 10
metrics:
- type: Resource
resource:
name: cpu
target:
type: Utilization
averageUtilization: 150
---
@@ -22893,34 +22893,34 @@
service:
name: graphql
port:
number: 5013
---
# Source: swh/templates/storage/ingress.yaml
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
namespace: swh-cassandra
- name: storage-ingress-default
+ name: storage-cassandra-ingress-default
annotations:
nginx.ingress.kubernetes.io/whitelist-source-range: 10.42.0.0/16,10.43.0.0/16,192.168.101.0/24,192.168.130.0/24,192.168.50.0/24
spec:
rules:
- host: storage-cassandra.internal.staging.swh.network
http:
paths:
- path: /
pathType: Prefix
backend:
service:
- name: storage
+ name: storage-cassandra
port:
number: 5002
---
# Source: swh/templates/vault/rpc-ingress.yaml
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
namespace: swh-cassandra
name: vault-rpc-ingress-default
annotations:
------------- diff for environment staging namespace swh-cassandra-next-version -------------
--- /tmp/swh-chart.swh.qlneL08X/staging-swh-cassandra-next-version.before 2023-11-29 15:47:46.924513182 +0100
+++ /tmp/swh-chart.swh.qlneL08X/staging-swh-cassandra-next-version.after 2023-11-29 15:47:47.644512922 +0100
@@ -345,21 +345,21 @@
apiVersion: v1
kind: ConfigMap
metadata:
name: graphql
namespace: swh-cassandra-next-version
data:
# TODO: rename to not have a dot in the name to allow testing
config.yml: |
storage:
cls: remote
- url: http://storage:5002
+ url: http://storage-cassandra:5002
search:
cls: remote
url: http://search-rpc-ingress
debug: true
introspection: true
max_raw_content_size: 10000
@@ -417,21 +417,21 @@
directory_entries: 500
extid: 100
release: 100
release_bytes: 52428800
revision: 100
revision_bytes: 52428800
revision_parents: 200
- cls: filter
- cls: retry
- cls: remote
- url: http://storage:5002
+ url: http://storage-cassandra:5002
scheduler:
cls: remote
url: http://scheduler.internal.staging.swh.network
journal:
brokers:
- journal1.internal.staging.swh.network:9094
group_id: swh-archive-stg-loader_metadata.journal_client
prefix: swh.journal.objects
sasl.mechanism: SCRAM-SHA-512
@@ -506,21 +506,21 @@
directory_entries: 500
extid: 100
release: 100
release_bytes: 52428800
revision: 100
revision_bytes: 52428800
revision_parents: 200
- cls: filter
- cls: retry
- cls: remote
- url: http://storage:5002
+ url: http://storage-cassandra:5002
celery:
task_broker: amqp://swhconsumer:${AMQP_PASSWORD}@scheduler0.internal.staging.swh.network:5672/%2f
task_acks_late: false
task_queues:
- swh.loader.package.arch.tasks.LoadArch
sentry_settings_for_celery_tasks:
__sentry-settings-for-celery-tasks__
metadata_fetcher_credentials:
__metadata-fetcher-credentials__
@@ -609,21 +609,21 @@
directory_entries: 500
extid: 100
release: 100
release_bytes: 52428800
revision: 100
revision_bytes: 52428800
revision_parents: 200
- cls: filter
- cls: retry
- cls: remote
- url: http://storage:5002
+ url: http://storage-cassandra:5002
celery:
task_broker: amqp://swhconsumer:${AMQP_PASSWORD}@scheduler0.internal.staging.swh.network:5672/%2f
task_acks_late: false
task_queues:
- swh.loader.package.archive.tasks.LoadTarball
sentry_settings_for_celery_tasks:
__sentry-settings-for-celery-tasks__
metadata_fetcher_credentials:
__metadata-fetcher-credentials__
@@ -712,21 +712,21 @@
directory_entries: 500
extid: 100
release: 100
release_bytes: 52428800
revision: 100
revision_bytes: 52428800
revision_parents: 200
- cls: filter
- cls: retry
- cls: remote
- url: http://storage:5002
+ url: http://storage-cassandra:5002
celery:
task_broker: amqp://swhconsumer:${AMQP_PASSWORD}@scheduler0.internal.staging.swh.network:5672/%2f
task_acks_late: false
task_queues:
- swh.loader.package.aur.tasks.LoadAur
sentry_settings_for_celery_tasks:
__sentry-settings-for-celery-tasks__
metadata_fetcher_credentials:
__metadata-fetcher-credentials__
@@ -815,21 +815,21 @@
directory_entries: 500
extid: 100
release: 100
release_bytes: 52428800
revision: 100
revision_bytes: 52428800
revision_parents: 200
- cls: filter
- cls: retry
- cls: remote
- url: http://storage:5002
+ url: http://storage-cassandra:5002
celery:
task_broker: amqp://swhconsumer:${AMQP_PASSWORD}@scheduler0.internal.staging.swh.network:5672/%2f
task_acks_late: false
task_queues:
- swh.loader.package.bioconductor.tasks.LoadBioconductor
sentry_settings_for_celery_tasks:
__sentry-settings-for-celery-tasks__
metadata_fetcher_credentials:
__metadata-fetcher-credentials__
@@ -918,21 +918,21 @@
directory_entries: 500
extid: 100
release: 100
release_bytes: 52428800
revision: 100
revision_bytes: 52428800
revision_parents: 200
- cls: filter
- cls: retry
- cls: remote
- url: http://storage:5002
+ url: http://storage-cassandra:5002
celery:
task_broker: amqp://swhconsumer:${AMQP_PASSWORD}@scheduler0.internal.staging.swh.network:5672/%2f
task_acks_late: false
task_queues:
- swh.loader.bzr.tasks.LoadBazaar
sentry_settings_for_celery_tasks:
__sentry-settings-for-celery-tasks__
metadata_fetcher_credentials:
__metadata-fetcher-credentials__
@@ -1021,21 +1021,21 @@
directory_entries: 500
extid: 100
release: 100
release_bytes: 52428800
revision: 100
revision_bytes: 52428800
revision_parents: 200
- cls: filter
- cls: retry
- cls: remote
- url: http://storage:5002
+ url: http://storage-cassandra:5002
celery:
task_broker: amqp://swhconsumer:${AMQP_PASSWORD}@scheduler0.internal.staging.swh.network:5672/%2f
task_acks_late: false
task_queues:
- swh.loader.core.tasks.LoadContent
sentry_settings_for_celery_tasks:
__sentry-settings-for-celery-tasks__
metadata_fetcher_credentials:
__metadata-fetcher-credentials__
@@ -1124,21 +1124,21 @@
directory_entries: 500
extid: 100
release: 100
release_bytes: 52428800
revision: 100
revision_bytes: 52428800
revision_parents: 200
- cls: filter
- cls: retry
- cls: remote
- url: http://storage:5002
+ url: http://storage-cassandra:5002
celery:
task_broker: amqp://swhconsumer:${AMQP_PASSWORD}@scheduler0.internal.staging.swh.network:5672/%2f
task_acks_late: false
task_queues:
- swh.loader.package.cran.tasks.LoadCRAN
sentry_settings_for_celery_tasks:
__sentry-settings-for-celery-tasks__
metadata_fetcher_credentials:
__metadata-fetcher-credentials__
@@ -1227,21 +1227,21 @@
directory_entries: 500
extid: 100
release: 100
release_bytes: 52428800
revision: 100
revision_bytes: 52428800
revision_parents: 200
- cls: filter
- cls: retry
- cls: remote
- url: http://storage:5002
+ url: http://storage-cassandra:5002
celery:
task_broker: amqp://swhconsumer:${AMQP_PASSWORD}@scheduler0.internal.staging.swh.network:5672/%2f
task_acks_late: false
task_queues:
- swh.loader.cvs.tasks.LoadCvsRepository
sentry_settings_for_celery_tasks:
__sentry-settings-for-celery-tasks__
metadata_fetcher_credentials:
__metadata-fetcher-credentials__
@@ -1330,21 +1330,21 @@
directory_entries: 500
extid: 100
release: 100
release_bytes: 52428800
revision: 100
revision_bytes: 52428800
revision_parents: 200
- cls: filter
- cls: retry
- cls: remote
- url: http://storage:5002
+ url: http://storage-cassandra:5002
celery:
task_broker: amqp://swhconsumer:${AMQP_PASSWORD}@scheduler0.internal.staging.swh.network:5672/%2f
task_acks_late: false
task_queues:
- swh.loader.package.debian.tasks.LoadDebian
sentry_settings_for_celery_tasks:
__sentry-settings-for-celery-tasks__
metadata_fetcher_credentials:
__metadata-fetcher-credentials__
@@ -1433,21 +1433,21 @@
directory_entries: 500
extid: 100
release: 100
release_bytes: 52428800
revision: 100
revision_bytes: 52428800
revision_parents: 200
- cls: filter
- cls: retry
- cls: remote
- url: http://storage:5002
+ url: http://storage-cassandra:5002
default_filename:
archive.tar
deposit:
auth:
password: ${DEPOSIT_PASSWORD}
username: ${DEPOSIT_USERNAME}
url: https://deposit-dynamic.internal.staging.swh.network/1/private
celery:
task_broker: amqp://swhconsumer:${AMQP_PASSWORD}@scheduler0.internal.staging.swh.network:5672/%2f
task_acks_late: false
@@ -1543,21 +1543,21 @@
directory_entries: 500
extid: 100
release: 100
release_bytes: 52428800
revision: 100
revision_bytes: 52428800
revision_parents: 200
- cls: filter
- cls: retry
- cls: remote
- url: http://storage:5002
+ url: http://storage-cassandra:5002
celery:
task_broker: amqp://swhconsumer:${AMQP_PASSWORD}@scheduler0.internal.staging.swh.network:5672/%2f
task_acks_late: false
task_queues:
- swh.loader.core.tasks.LoadTarballDirectory
sentry_settings_for_celery_tasks:
__sentry-settings-for-celery-tasks__
metadata_fetcher_credentials:
__metadata-fetcher-credentials__
@@ -1646,21 +1646,21 @@
directory_entries: 500
extid: 100
release: 100
release_bytes: 52428800
revision: 100
revision_bytes: 52428800
revision_parents: 200
- cls: filter
- cls: retry
- cls: remote
- url: http://storage:5002
+ url: http://storage-cassandra:5002
celery:
task_broker: amqp://swhconsumer:${AMQP_PASSWORD}@scheduler0.internal.staging.swh.network:5672/%2f
task_acks_late: false
task_queues:
- swh.loader.git.tasks.UpdateGitRepository
- swh.loader.git.tasks.LoadDiskGitRepository
- swh.loader.git.tasks.UncompressAndLoadDiskGitRepository
sentry_settings_for_celery_tasks:
__sentry-settings-for-celery-tasks__
@@ -1751,21 +1751,21 @@
directory_entries: 500
extid: 100
release: 100
release_bytes: 52428800
revision: 100
revision_bytes: 52428800
revision_parents: 200
- cls: filter
- cls: retry
- cls: remote
- url: http://storage:5002
+ url: http://storage-cassandra:5002
celery:
task_broker: amqp://swhconsumer:${AMQP_PASSWORD}@scheduler0.internal.staging.swh.network:5672/%2f
task_acks_late: false
task_queues:
- swh.loader.git.tasks.LoadGitCheckout
sentry_settings_for_celery_tasks:
__sentry-settings-for-celery-tasks__
metadata_fetcher_credentials:
__metadata-fetcher-credentials__
@@ -1854,21 +1854,21 @@
directory_entries: 500
extid: 100
release: 100
release_bytes: 52428800
revision: 100
revision_bytes: 52428800
revision_parents: 200
- cls: filter
- cls: retry
- cls: remote
- url: http://storage:5002
+ url: http://storage-cassandra:5002
celery:
task_broker: amqp://swhconsumer:${AMQP_PASSWORD}@scheduler0.internal.staging.swh.network:5672/%2f
task_acks_late: false
task_queues:
- swh.loader.package.golang.tasks.LoadGolang
sentry_settings_for_celery_tasks:
__sentry-settings-for-celery-tasks__
metadata_fetcher_credentials:
__metadata-fetcher-credentials__
@@ -1957,21 +1957,21 @@
directory_entries: 500
extid: 100
release: 100
release_bytes: 52428800
revision: 100
revision_bytes: 52428800
revision_parents: 200
- cls: filter
- cls: retry
- cls: remote
- url: http://storage:5002
+ url: http://storage-cassandra:5002
celery:
task_broker: amqp://swhconsumer:${AMQP_PASSWORD}@scheduler0.internal.staging.swh.network:5672/%2f
task_acks_late: false
task_queues:
- swh.loader.mercurial.tasks.LoadMercurialCheckout
sentry_settings_for_celery_tasks:
__sentry-settings-for-celery-tasks__
metadata_fetcher_credentials:
__metadata-fetcher-credentials__
@@ -2060,21 +2060,21 @@
directory_entries: 500
extid: 100
release: 100
release_bytes: 52428800
revision: 100
revision_bytes: 52428800
revision_parents: 200
- cls: filter
- cls: retry
- cls: remote
- url: http://storage:5002
+ url: http://storage-cassandra:5002
celery:
task_broker: amqp://swhconsumer:${AMQP_PASSWORD}@scheduler0.internal.staging.swh.network:5672/%2f
task_acks_late: false
task_queues:
- swh.loader.package.maven.tasks.LoadMaven
sentry_settings_for_celery_tasks:
__sentry-settings-for-celery-tasks__
metadata_fetcher_credentials:
__metadata-fetcher-credentials__
@@ -2163,21 +2163,21 @@
directory_entries: 500
extid: 100
release: 100
release_bytes: 52428800
revision: 100
revision_bytes: 52428800
revision_parents: 200
- cls: filter
- cls: retry
- cls: remote
- url: http://storage:5002
+ url: http://storage-cassandra:5002
celery:
task_broker: amqp://swhconsumer:${AMQP_PASSWORD}@scheduler0.internal.staging.swh.network:5672/%2f
task_acks_late: false
task_queues:
- swh.loader.mercurial.tasks.LoadArchiveMercurial
- swh.loader.mercurial.tasks.LoadMercurial
sentry_settings_for_celery_tasks:
__sentry-settings-for-celery-tasks__
metadata_fetcher_credentials:
@@ -2267,21 +2267,21 @@
directory_entries: 500
extid: 100
release: 100
release_bytes: 52428800
revision: 100
revision_bytes: 52428800
revision_parents: 200
- cls: filter
- cls: retry
- cls: remote
- url: http://storage:5002
+ url: http://storage-cassandra:5002
celery:
task_broker: amqp://swhconsumer:${AMQP_PASSWORD}@scheduler0.internal.staging.swh.network:5672/%2f
task_acks_late: false
task_queues:
- swh.loader.package.npm.tasks.LoadNpm
sentry_settings_for_celery_tasks:
__sentry-settings-for-celery-tasks__
metadata_fetcher_credentials:
__metadata-fetcher-credentials__
@@ -2370,21 +2370,21 @@
directory_entries: 500
extid: 100
release: 100
release_bytes: 52428800
revision: 100
revision_bytes: 52428800
revision_parents: 200
- cls: filter
- cls: retry
- cls: remote
- url: http://storage:5002
+ url: http://storage-cassandra:5002
celery:
task_broker: amqp://swhconsumer:${AMQP_PASSWORD}@scheduler0.internal.staging.swh.network:5672/%2f
task_acks_late: false
task_queues:
- swh.loader.package.opam.tasks.LoadOpam
sentry_settings_for_celery_tasks:
__sentry-settings-for-celery-tasks__
metadata_fetcher_credentials:
__metadata-fetcher-credentials__
@@ -2473,21 +2473,21 @@
directory_entries: 500
extid: 100
release: 100
release_bytes: 52428800
revision: 100
revision_bytes: 52428800
revision_parents: 200
- cls: filter
- cls: retry
- cls: remote
- url: http://storage:5002
+ url: http://storage-cassandra:5002
celery:
task_broker: amqp://swhconsumer:${AMQP_PASSWORD}@scheduler0.internal.staging.swh.network:5672/%2f
task_acks_late: false
task_queues:
- swh.loader.package.pubdev.tasks.LoadPubDev
sentry_settings_for_celery_tasks:
__sentry-settings-for-celery-tasks__
metadata_fetcher_credentials:
__metadata-fetcher-credentials__
@@ -2576,21 +2576,21 @@
directory_entries: 500
extid: 100
release: 100
release_bytes: 52428800
revision: 100
revision_bytes: 52428800
revision_parents: 200
- cls: filter
- cls: retry
- cls: remote
- url: http://storage:5002
+ url: http://storage-cassandra:5002
celery:
task_broker: amqp://swhconsumer:${AMQP_PASSWORD}@scheduler0.internal.staging.swh.network:5672/%2f
task_acks_late: false
task_queues:
- swh.loader.package.pypi.tasks.LoadPyPI
sentry_settings_for_celery_tasks:
__sentry-settings-for-celery-tasks__
metadata_fetcher_credentials:
__metadata-fetcher-credentials__
@@ -2679,21 +2679,21 @@
directory_entries: 500
extid: 100
release: 100
release_bytes: 52428800
revision: 100
revision_bytes: 52428800
revision_parents: 200
- cls: filter
- cls: retry
- cls: remote
- url: http://storage:5002
+ url: http://storage-cassandra:5002
celery:
task_broker: amqp://swhconsumer:${AMQP_PASSWORD}@scheduler0.internal.staging.swh.network:5672/%2f
task_acks_late: false
task_queues:
- swh.loader.package.rpm.tasks.LoadRpm
sentry_settings_for_celery_tasks:
__sentry-settings-for-celery-tasks__
metadata_fetcher_credentials:
__metadata-fetcher-credentials__
@@ -2782,21 +2782,21 @@
directory_entries: 500
extid: 100
release: 100
release_bytes: 52428800
revision: 100
revision_bytes: 52428800
revision_parents: 200
- cls: filter
- cls: retry
- cls: remote
- url: http://storage:5002
+ url: http://storage-cassandra:5002
celery:
task_broker: amqp://swhconsumer:${AMQP_PASSWORD}@scheduler0.internal.staging.swh.network:5672/%2f
task_acks_late: true
task_queues:
- save_code_now:swh.loader.bzr.tasks.LoadBazaar
- save_code_now:swh.loader.cvs.tasks.LoadCvsRepository
- 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
@@ -2895,21 +2895,21 @@
directory_entries: 500
extid: 100
release: 100
release_bytes: 52428800
revision: 100
revision_bytes: 52428800
revision_parents: 200
- cls: filter
- cls: retry
- cls: remote
- url: http://storage:5002
+ url: http://storage-cassandra:5002
celery:
task_broker: amqp://swhconsumer:${AMQP_PASSWORD}@scheduler0.internal.staging.swh.network:5672/%2f
task_acks_late: false
task_queues:
- swh.loader.svn.tasks.LoadSvnRepository
- swh.loader.svn.tasks.MountAndLoadSvnRepository
- swh.loader.svn.tasks.DumpMountAndLoadSvnRepository
sentry_settings_for_celery_tasks:
__sentry-settings-for-celery-tasks__
@@ -3000,21 +3000,21 @@
directory_entries: 500
extid: 100
release: 100
release_bytes: 52428800
revision: 100
revision_bytes: 52428800
revision_parents: 200
- cls: filter
- cls: retry
- cls: remote
- url: http://storage:5002
+ url: http://storage-cassandra:5002
celery:
task_broker: amqp://swhconsumer:${AMQP_PASSWORD}@scheduler0.internal.staging.swh.network:5672/%2f
task_acks_late: false
task_queues:
- swh.loader.svn.tasks.LoadSvnExport
sentry_settings_for_celery_tasks:
__sentry-settings-for-celery-tasks__
metadata_fetcher_credentials:
__metadata-fetcher-credentials__
@@ -3687,21 +3687,21 @@
error_reporter:
db: 1
host: redis.redis
port: 6379
---
# Source: swh/templates/storage/configmap.yaml
apiVersion: v1
kind: ConfigMap
metadata:
namespace: swh-cassandra-next-version
- name: storage-configuration-template
+ name: storage-cassandra-configuration-template
data:
config.yml.template: |
storage:
cls: cassandra
hosts:
- cassandra1.internal.staging.swh.network
- cassandra2.internal.staging.swh.network
- cassandra3.internal.staging.swh.network
keyspace: swh
consistency_level: LOCAL_QUORUM
@@ -3914,21 +3914,21 @@
metadata:
namespace: swh-cassandra-next-version
name: web-configuration-template
data:
config.yml.template: |
instance_name: webapp-cassandra-next-version.internal.staging.swh.network
allowed_hosts:
- webapp-cassandra-next-version.internal.staging.swh.network
storage:
cls: remote
- url: http://storage:5002
+ url: http://storage-cassandra:5002
search:
cls: remote
url: http://search-rpc-ingress
scheduler:
cls: remote
url: http://scheduler.internal.staging.swh.network
vault:
cls: remote
url: http://vault-rpc-ingress-next-version
indexer_storage:
@@ -13680,26 +13680,26 @@
targetPort: 9125
protocol: UDP
- name: http
port: 9102
targetPort: 9102
---
# Source: swh/templates/storage/service.yaml
apiVersion: v1
kind: Service
metadata:
- name: storage
+ name: storage-cassandra
namespace: swh-cassandra-next-version
spec:
type: ClusterIP
selector:
- app: storage
+ app: storage-cassandra
ports:
- port: 5002
targetPort: 5002
name: rpc
---
# Source: swh/templates/vault/rpc-service.yaml
apiVersion: v1
kind: Service
metadata:
name: vault-rpc
@@ -14370,21 +14370,21 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: graphql
annotations:
# Force a rollout upgrade if the configuration changes
- checksum/config: f742254ee78919836f79985a254aa097320cdcea0341b2816fe17610a4bbaf24
+ checksum/config: de6c5fcb80d0b3c743462c96da156c8b32cc34fa5e4b6dd3c6ec87f9045266f5
spec:
priorityClassName: swh-cassandra-next-version-frontend-rpc
containers:
- name: graphql
image: container-registry.softwareheritage.org/swh/infra/swh-apps/graphql:20231127.1
imagePullPolicy: IfNotPresent
resources:
requests:
memory: 150Mi
@@ -14458,21 +14458,21 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: loader-metadata
annotations:
# Force a rollout upgrade if the configuration changes
- checksum/config: 8a8e8ac7a2e371e6d71152d11f2ee2fdde88bd1c3743976272a07961c20424b2
+ checksum/config: 77f959860bed066c8767e4c8af80adb367a0bd094baec7b9435ffa7845c7e437
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/loader-metadata
operator: In
values:
@@ -14585,21 +14585,21 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: loader-arch
annotations:
# Force a rollout upgrade if the configuration changes
- checksum/config: 1a501ff20c697287a876afa4fbe6f3f26a8c8821ae415b928ac3ad7f40f06509
+ checksum/config: 70fba9ad7581f575ff36e9113a1210693b7ca50089d27b97ac200c0266a9f887
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/loader
operator: In
values:
- "true"
@@ -14751,21 +14751,21 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: loader-archive
annotations:
# Force a rollout upgrade if the configuration changes
- checksum/config: 71eaca3751be9b7cab617d8fca7dafd92abe7e2fd3837f6b8179d4865b6320e3
+ checksum/config: 1cd15beae42163fdf4ae2780856d02f7ff68f27cdc5d5793438bfb88a52a2713
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/loader
operator: In
values:
- "true"
@@ -14917,21 +14917,21 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: loader-aur
annotations:
# Force a rollout upgrade if the configuration changes
- checksum/config: 343ca3681dfd9add5d3375273079fe0d6aae9dfa1f9cb8f4319a3e38258b51c0
+ checksum/config: dffcd16438876f499b1b290d223d4ed9a68a7d734e528f6448ffbbd5eeef4e9d
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/loader
operator: In
values:
- "true"
@@ -15083,21 +15083,21 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: loader-bioconductor
annotations:
# Force a rollout upgrade if the configuration changes
- checksum/config: f70fdbb6d03dbde61663f1f3647abb212ad69db146d9740d6f7ac222f3accca9
+ checksum/config: 9f931a51e209875325df6272b3bd8b56e39a820b53d4cb95cbc88ec6a8ee84ed
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/loader
operator: In
values:
- "true"
@@ -15249,21 +15249,21 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: loader-bzr
annotations:
# Force a rollout upgrade if the configuration changes
- checksum/config: 820dbf5686180fa140a6b5cd215c58965525343389032517a5efa2c19c9a3707
+ checksum/config: 9d19a2d9f268f9c42817218cd57ef6b5abd0f534fa2b9e30d46cb2b08c112297
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/loader
operator: In
values:
- "true"
@@ -15415,21 +15415,21 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: loader-content
annotations:
# Force a rollout upgrade if the configuration changes
- checksum/config: 94843045501531df82146bb603581711eae9d8e514822ffa2473d53504ec2fea
+ checksum/config: e9943683604983bf53a403a8ca4502c2e772df8fdd2b348fc0432a8f5ea12de4
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/loader
operator: In
values:
- "true"
@@ -15581,21 +15581,21 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: loader-cran
annotations:
# Force a rollout upgrade if the configuration changes
- checksum/config: 00c215d5e06569542c9a27f74cc7ebad632f6993dff6e4c73398ee381114f258
+ checksum/config: faa6116eb58be03608c81235403ba3c202ceede4c94bc97baf6c84215ee373d9
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/loader
operator: In
values:
- "true"
@@ -15747,21 +15747,21 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: loader-cvs
annotations:
# Force a rollout upgrade if the configuration changes
- checksum/config: 84b4e8feb2bd2a7ba6815256de97bf7289861d7ee4c3d0e196a2a0b3638e9695
+ checksum/config: c5189105b7573abc5d70fb18faa231e47ea6022868b466010717f6aced297acb
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/loader
operator: In
values:
- "true"
@@ -15913,21 +15913,21 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: loader-debian
annotations:
# Force a rollout upgrade if the configuration changes
- checksum/config: 0e50b830fd7cff21160009c4c48d3453a98ed31eefa36c73d01eec4116b4c7fd
+ checksum/config: 50bb231af1ecbdce94cd1d394ecc2b9df4a2e630b36c06dae28bc77c140b68eb
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/loader
operator: In
values:
- "true"
@@ -16079,21 +16079,21 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: loader-deposit
annotations:
# Force a rollout upgrade if the configuration changes
- checksum/config: 399c8b38426054eef4c0ac4fa2c5d2ff84d2f9dd7acc03592c59b97b85215fb3
+ checksum/config: 5c7b57ae6c0318cfc1cf708b829c1c9d118b940cb671a698fdfb33074ee9357e
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/loader
operator: In
values:
- "true"
@@ -16259,21 +16259,21 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: loader-directory
annotations:
# Force a rollout upgrade if the configuration changes
- checksum/config: 0423401173ae178e2510972da6db2ab06a4c58aa3df8ad63931bac0ad2bbd8f3
+ checksum/config: 345957c7c8b55815a56748408f9dcd19e68043e82d0ef6cdcbda8cb4669b7c43
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/loader
operator: In
values:
- "true"
@@ -16428,21 +16428,21 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: loader-git
annotations:
# Force a rollout upgrade if the configuration changes
- checksum/config: afb5c8823b01141088618c4b0d985244c63e7bc935c126cd66c9b88a588dba93
+ checksum/config: cbc49d00557134b9dcfb875a814f6e0a75920d092fef2a39513010d92de0caf1
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/loader
operator: In
values:
- "true"
@@ -16593,21 +16593,21 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: loader-git-checkout
annotations:
# Force a rollout upgrade if the configuration changes
- checksum/config: 95fdf4db629ea59f604ee2694da33e1a0331ab65bdbcf4e99a35978e2810688d
+ checksum/config: b03a8f9fb08e78f4059c0ce9427f6d4e648dcaf7adf7a9c637d9affb2464234a
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/loader
operator: In
values:
- "true"
@@ -16759,21 +16759,21 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: loader-golang
annotations:
# Force a rollout upgrade if the configuration changes
- checksum/config: 94bbcc0f58bf3fe4cdbd880a890edfc7c164f99145ee861c494b36872b6b699d
+ checksum/config: 4d78fc9ce22215b9da1a07b0d52c2fbcfcf44ff4df1bc3dc9a13a6ef2c357b86
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/loader
operator: In
values:
- "true"
@@ -16925,21 +16925,21 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: loader-hg-checkout
annotations:
# Force a rollout upgrade if the configuration changes
- checksum/config: de64338adcf6e511562398db19fb614a4c670ff7247820a27b37f10170f001be
+ checksum/config: 459f8510643aa6451bb4e1d707fc1d9762406c692ac199e6d3f18fa783180ae9
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/loader
operator: In
values:
- "true"
@@ -17091,21 +17091,21 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: loader-maven
annotations:
# Force a rollout upgrade if the configuration changes
- checksum/config: 00cc04d61a7c56a96a5f1e73d3e3111b513c41c7f4cd370173bbf275c8daa673
+ checksum/config: d2f34e0491b92666f7318bc0dbbdd08ac746450f20b0f19bdf7d3f3d017205f0
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/loader
operator: In
values:
- "true"
@@ -17257,21 +17257,21 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: loader-mercurial
annotations:
# Force a rollout upgrade if the configuration changes
- checksum/config: 83d51e7a146e1f84074889252fe0601cb177d5bad034f06807b568ebbbcd6024
+ checksum/config: ee1251ce6c720ea832e6287e0dc2fc5097240356b8c9b8d2bf1fa183b2f3028e
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/loader
operator: In
values:
- "true"
@@ -17423,21 +17423,21 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: loader-npm
annotations:
# Force a rollout upgrade if the configuration changes
- checksum/config: 3490f014429e70ebe81ae386f49058f2bde5d5fa5ee1baacccaa81ce82d76b1a
+ checksum/config: ea7f3bea0421465838e14b3b6a287716b328d3599404711f66e82dd54241e626
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/loader
operator: In
values:
- "true"
@@ -17589,21 +17589,21 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: loader-opam
annotations:
# Force a rollout upgrade if the configuration changes
- checksum/config: 2167f17b90247a61dd3a08ecf44a89fb7c3d32ebd3dad2d9ef4e397d5ab467f3
+ checksum/config: 7f6581114eedd205cdbaa4bae34737aafdf688d8d224fafb84ff4f3450a4475c
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/loader
operator: In
values:
- "true"
@@ -17755,21 +17755,21 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: loader-pubdev
annotations:
# Force a rollout upgrade if the configuration changes
- checksum/config: 19c09184c125b6682426083fe9ba235e170f955eb57278110017d590081bbcdd
+ checksum/config: a4d88b93dcf112f8c83f65398e4bad74c99ba3001da4143d3823cdc1102b8121
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/loader
operator: In
values:
- "true"
@@ -17921,21 +17921,21 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: loader-pypi
annotations:
# Force a rollout upgrade if the configuration changes
- checksum/config: c7aa6d347bb9f266197187e149442c43cc4788a2d1c1d2cd6e04b920b7d5418d
+ checksum/config: 3f0671697df39837f02a14efb779302463294f5f096d80e3664cea7ed0ae899c
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/loader
operator: In
values:
- "true"
@@ -18087,21 +18087,21 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: loader-rpm
annotations:
# Force a rollout upgrade if the configuration changes
- checksum/config: 50bc29a8250a3f9d35817befce9c3999f2bbb5e7c23b21582f080db49273edbb
+ checksum/config: 66cacdfe17adf9c1b8896f4a27be8f0392ffed4182dea6646bb2767df925703a
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/loader
operator: In
values:
- "true"
@@ -18253,21 +18253,21 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: loader-save-code-now
annotations:
# Force a rollout upgrade if the configuration changes
- checksum/config: 7410ff964170a45de417841f25b171487d081b3c28dab5824bb9a994588c1798
+ checksum/config: 25f3e3e460b099d080acdb6f1bf9278d75880f0709b3cdde3548b2e4aa070047
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/loader
operator: In
values:
- "true"
@@ -18419,21 +18419,21 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: loader-svn
annotations:
# Force a rollout upgrade if the configuration changes
- checksum/config: 4a11db5afc98ccab6df5eba4a457b45641832b8a8c229148390a1682fded4d8e
+ checksum/config: 52e72f1fda97eb2d93b24d58867dd546f88f73e0a9901f02872d78170c9a76ad
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/loader
operator: In
values:
- "true"
@@ -18587,21 +18587,21 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: loader-svn-export
annotations:
# Force a rollout upgrade if the configuration changes
- checksum/config: ce17ab7ddb4508eb665a12bef3b72e2fec43383bdfd691287d5296d936da79af
+ checksum/config: 18265e5cf2da104ca1f31d948fa628f0a4efaf854191b4982345ceb5ed6a926b
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/loader
operator: In
values:
- "true"
@@ -20368,39 +20368,39 @@
- name: database-utils
configMap:
name: database-utils
defaultMode: 0555
---
# Source: swh/templates/storage/deployment.yaml
apiVersion: apps/v1
kind: Deployment
metadata:
namespace: swh-cassandra-next-version
- name: storage
+ name: storage-cassandra
labels:
- app: storage
+ app: storage-cassandra
spec:
revisionHistoryLimit: 2
selector:
matchLabels:
- app: storage
+ app: storage-cassandra
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
- app: storage
+ app: storage-cassandra
annotations:
- checksum/config: eb77f5507bea433c87d5dd9120d3b3940ba1865f8ce868f955887c431c7ee068
- checksum/config-utils: 908f9182febd57f799c59c25abdfbd7cfd832e1f1edc150c536d5f8087dd9486
+ checksum/config: 5aec9f95940f6a8f065e36c8e3cd61b336f6b920cde556eb24521df758e9ce05
+ checksum/database-utils: 908f9182febd57f799c59c25abdfbd7cfd832e1f1edc150c536d5f8087dd9486
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/storage
operator: In
values:
- "true"
@@ -20438,21 +20438,21 @@
args:
- /entrypoints/init-keyspace.py
volumeMounts:
- name: configuration
mountPath: /etc/swh
readOnly: true
- name: database-utils
mountPath: /entrypoints
readOnly: true
containers:
- - name: storage
+ - name: storage-cassandra
resources:
requests:
memory: 1500Mi
cpu: 500m
image: container-registry.softwareheritage.org/swh/infra/swh-apps/storage:20231127.1
imagePullPolicy: IfNotPresent
ports:
- containerPort: 5002
name: rpc
readinessProbe:
@@ -20501,21 +20501,21 @@
- name: SWH_SENTRY_DISABLE_LOGGING_EVENTS
value: "true"
volumeMounts:
- name: configuration
mountPath: /etc/swh
volumes:
- name: configuration
emptyDir: {}
- name: configuration-template
configMap:
- name: storage-configuration-template
+ name: storage-cassandra-configuration-template
items:
- key: "config.yml.template"
path: "config.yml.template"
- name: database-utils
configMap:
name: database-utils
defaultMode: 0555
---
# Source: swh/templates/vault/rpc-deployment.yaml
apiVersion: apps/v1
@@ -20670,21 +20670,21 @@
app: web
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: web
annotations:
- checksum/config: 1e0c732744a15fadefec9c4593ecc05d66001af679c92ce5a5e8e349971963eb
+ checksum/config: f120f4ef977dd392db2669146d164f332ac2b54b5309884f1432a6f5fffbe95c
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/web
operator: In
values:
- "true"
@@ -20906,28 +20906,28 @@
- key: "config.yml.template"
path: "config.yml.template"
- name: static
emptyDir: {}
---
# Source: swh/templates/storage/autoscaling.yaml
apiVersion: autoscaling/v2
kind: HorizontalPodAutoscaler
metadata:
namespace: swh-cassandra-next-version
- name: storage
+ name: storage-cassandra
labels:
- app: storage
+ app: storage-cassandra
spec:
scaleTargetRef:
apiVersion: apps/v1
kind: Deployment
- name: storage
+ name: storage-cassandra
minReplicas: 1
maxReplicas: 2
metrics:
- type: Resource
resource:
name: cpu
target:
type: Utilization
averageUtilization: 150
---
@@ -21000,34 +21000,34 @@
service:
name: graphql
port:
number: 5013
---
# Source: swh/templates/storage/ingress.yaml
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
namespace: swh-cassandra-next-version
- name: storage-ingress-default
+ name: storage-cassandra-ingress-default
annotations:
nginx.ingress.kubernetes.io/whitelist-source-range: 10.42.0.0/16,10.43.0.0/16,192.168.101.0/24,192.168.130.0/24,192.168.50.0/24
spec:
rules:
- host: storage-cassandra-next-version.internal.staging.swh.network
http:
paths:
- path: /
pathType: Prefix
backend:
service:
- name: storage
+ name: storage-cassandra
port:
number: 5002
---
# Source: swh/templates/vault/rpc-ingress.yaml
apiVersion: networking.k8s.io/v1
kind: Ingress
metadata:
namespace: swh-cassandra-next-version
name: vault-rpc-ingress-default
annotations:
------------- diff for environment production namespace swh -------------
No differences
------------- diff for environment production namespace swh-cassandra -------------
--- /tmp/swh-chart.swh.qlneL08X/production-swh-cassandra.before 2023-11-29 15:47:48.088512762 +0100
+++ /tmp/swh-chart.swh.qlneL08X/production-swh-cassandra.after 2023-11-29 15:47:48.516512609 +0100
@@ -140,21 +140,21 @@
apiVersion: v1
kind: ConfigMap
metadata:
name: graphql
namespace: swh-cassandra
data:
# TODO: rename to not have a dot in the name to allow testing
config.yml: |
storage:
cls: remote
- url: http://storage:5002
+ url: http://storage-cassandra:5002
search:
cls: remote
url: http://moma.internal.softwareheritage.org:5010
debug: false
introspection: true
max_raw_content_size: 10000
@@ -1010,21 +1010,21 @@
error_reporter:
db: 1
host: redis-cassandra-replayers.redis
port: 6379
---
# Source: swh/templates/storage/configmap.yaml
apiVersion: v1
kind: ConfigMap
metadata:
namespace: swh-cassandra
- name: storage-configuration-template
+ name: storage-cassandra-configuration-template
data:
config.yml.template: |
storage:
cls: cassandra
hosts:
- cassandra01.internal.softwareheritage.org
- cassandra02.internal.softwareheritage.org
- cassandra03.internal.softwareheritage.org
- cassandra04.internal.softwareheritage.org
- cassandra05.internal.softwareheritage.org
@@ -1396,21 +1396,21 @@
metadata:
namespace: swh-cassandra
name: web-configuration-template
data:
config.yml.template: |
instance_name: webapp-cassandra.internal.softwareheritage.org
allowed_hosts:
- webapp-cassandra.internal.softwareheritage.org
storage:
cls: remote
- url: http://storage:5002
+ url: http://storage-cassandra:5002
search:
cls: remote
url: http://moma.internal.softwareheritage.org:5010
scheduler:
cls: remote
url: http://scheduler.internal.softwareheritage.org
vault:
cls: remote
url: http://vangogh.euwest.azure.internal.softwareheritage.org:5005/
indexer_storage:
@@ -11132,26 +11132,26 @@
targetPort: 9125
protocol: UDP
- name: http
port: 9102
targetPort: 9102
---
# Source: swh/templates/storage/service.yaml
apiVersion: v1
kind: Service
metadata:
- name: storage
+ name: storage-cassandra
namespace: swh-cassandra
spec:
type: ClusterIP
selector:
- app: storage
+ app: storage-cassandra
ports:
- port: 5002
targetPort: 5002
name: rpc
---
# Source: swh/templates/web/service.yaml
apiVersion: v1
kind: Service
metadata:
name: web
@@ -11522,21 +11522,21 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: graphql
annotations:
# Force a rollout upgrade if the configuration changes
- checksum/config: 40386733bfae98b7fe945b9c5d4598e56aca0d530fbe4f4b1167047f54c911f8
+ checksum/config: 22f3c0100d41d5a3d481482a82fd31d746b97913a76c9eec1be6dd4136e8a186
spec:
priorityClassName: swh-cassandra-frontend-rpc
containers:
- name: graphql
image: container-registry.softwareheritage.org/swh/infra/swh-apps/graphql:20231127.1
imagePullPolicy: IfNotPresent
resources:
requests:
memory: 150Mi
@@ -13681,40 +13681,40 @@
- name: database-utils
configMap:
name: database-utils
defaultMode: 0555
---
# Source: swh/templates/storage/deployment.yaml
apiVersion: apps/v1
kind: Deployment
metadata:
namespace: swh-cassandra
- name: storage
+ name: storage-cassandra
labels:
- app: storage
+ app: storage-cassandra
spec:
revisionHistoryLimit: 2
replicas: 2
selector:
matchLabels:
- app: storage
+ app: storage-cassandra
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
- app: storage
+ app: storage-cassandra
annotations:
- checksum/config: 32f574de98a04f13bff82cfc00420edc29a9421753f4b1063b992333a67b5800
- checksum/config-utils: 885f4088d8181fabbd02e146f85462caced4878849cda6c1aea2f6b5ebc6e4e2
+ checksum/config: fa2c22293a3547167076f23b3039ffd64c1f180dd522261c482c21be9a9a7a9d
+ checksum/database-utils: 885f4088d8181fabbd02e146f85462caced4878849cda6c1aea2f6b5ebc6e4e2
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/storage
operator: In
values:
- "true"
@@ -13963,21 +13963,21 @@
# 'name' secret must exist & include that ^ key
optional: false
volumeMounts:
- name: configuration
mountPath: /etc/swh
- name: configuration-template
mountPath: /etc/swh/configuration-template
containers:
- - name: storage
+ - name: storage-cassandra
resources:
requests:
memory: 500Mi
cpu: 500m
image: container-registry.softwareheritage.org/swh/infra/swh-apps/storage:20231127.1
imagePullPolicy: IfNotPresent
ports:
- containerPort: 5002
name: rpc
readinessProbe:
@@ -14020,21 +14020,21 @@
- name: SWH_SENTRY_DISABLE_LOGGING_EVENTS
value: "true"
volumeMounts:
- name: configuration
mountPath: /etc/swh
volumes:
- name: configuration
emptyDir: {}
- name: configuration-template
configMap:
- name: storage-configuration-template
+ name: storage-cassandra-configuration-template
items:
- key: "config.yml.template"
path: "config.yml.template"
- name: database-utils
configMap:
name: database-utils
defaultMode: 0555
---
# Source: swh/templates/toolbox/deployment.yaml
apiVersion: apps/v1
@@ -14161,21 +14161,21 @@
app: web
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: web
annotations:
- checksum/config: 912fc0c4a9bf9748a4321df4ac456ef48971dcb66255c147ffeefe89338a8d27
+ checksum/config: 9a91046a3e85f7a73ca977a8fe2010dc763fd86b2c1ee070aa6987fa10032376
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/web
operator: In
values:
- "true"