cookers: Add optional graph configuration
Activate it in production to match the previous production cooker's configuration.
Noticed while working on the decommissionning on the vault worker nodes.
This bumps the swh-vault-cookers' image to a recent version with the swh-graph version [1]
[1] https://jenkins.softwareheritage.org/job/swh-apps/job/build-docker-image/1609/console
make swh-octo-diff
[swh] Comparing changes between branches production and add-optional-graph-config-to-cookers (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 add-optional-graph-config-to-cookers branch for environment staging...
[swh] Generate config in add-optional-graph-config-to-cookers branch for environment staging...
[swh] Generate config in add-optional-graph-config-to-cookers 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 add-optional-graph-config-to-cookers branch for environment production...
[swh] Generate config in add-optional-graph-config-to-cookers branch for environment production...
[swh] Generate config in add-optional-graph-config-to-cookers branch for environment production...
------------- diff for environment staging namespace swh -------------
No differences
------------- diff for environment staging namespace swh-cassandra -------------
--- /tmp/swh-chart.swh.0v8upCcM/staging-swh-cassandra.before 2024-01-22 14:03:07.174969953 +0100
+++ /tmp/swh-chart.swh.0v8upCcM/staging-swh-cassandra.after 2024-01-22 14:03:07.862969126 +0100
@@ -14853,21 +14853,21 @@
- name: sentry-settings-for-celery-tasks
mountPath: /etc/credentials/sentry-settings
readOnly: true
containers:
- name: cookers
resources:
requests:
memory: 512Mi
cpu: 500m
- image: container-registry.softwareheritage.org/swh/infra/swh-apps/vault_cookers:20240119.1
+ image: container-registry.softwareheritage.org/swh/infra/swh-apps/vault_cookers:20240122.1
imagePullPolicy: IfNotPresent
command:
- /bin/bash
args:
- -c
- /opt/swh/entrypoint.sh
lifecycle:
preStop:
exec:
command: ["/pre-stop.sh"]
@@ -14997,21 +14997,21 @@
- name: sentry-settings-for-celery-tasks
mountPath: /etc/credentials/sentry-settings
readOnly: true
containers:
- name: cookers
resources:
requests:
memory: 512Mi
cpu: 500m
- image: container-registry.softwareheritage.org/swh/infra/swh-apps/vault_cookers:20240119.1
+ image: container-registry.softwareheritage.org/swh/infra/swh-apps/vault_cookers:20240122.1
imagePullPolicy: IfNotPresent
command:
- /bin/bash
args:
- -c
- /opt/swh/entrypoint.sh
lifecycle:
preStop:
exec:
command: ["/pre-stop.sh"]
------------- diff for environment staging namespace swh-cassandra-next-version -------------
--- /tmp/swh-chart.swh.0v8upCcM/staging-swh-cassandra-next-version.before 2024-01-22 14:03:07.386969699 +0100
+++ /tmp/swh-chart.swh.0v8upCcM/staging-swh-cassandra-next-version.after 2024-01-22 14:03:08.078968866 +0100
@@ -14319,21 +14319,21 @@
- name: sentry-settings-for-celery-tasks
mountPath: /etc/credentials/sentry-settings
readOnly: true
containers:
- name: cookers
resources:
requests:
memory: 512Mi
cpu: 500m
- image: container-registry.softwareheritage.org/swh/infra/swh-apps/vault_cookers:20240119.1
+ image: container-registry.softwareheritage.org/swh/infra/swh-apps/vault_cookers:20240122.1
imagePullPolicy: IfNotPresent
command:
- /bin/bash
args:
- -c
- /opt/swh/entrypoint.sh
lifecycle:
preStop:
exec:
command: ["/pre-stop.sh"]
@@ -14463,21 +14463,21 @@
- name: sentry-settings-for-celery-tasks
mountPath: /etc/credentials/sentry-settings
readOnly: true
containers:
- name: cookers
resources:
requests:
memory: 512Mi
cpu: 500m
- image: container-registry.softwareheritage.org/swh/infra/swh-apps/vault_cookers:20240119.1
+ image: container-registry.softwareheritage.org/swh/infra/swh-apps/vault_cookers:20240122.1
imagePullPolicy: IfNotPresent
command:
- /bin/bash
args:
- -c
- /opt/swh/entrypoint.sh
lifecycle:
preStop:
exec:
command: ["/pre-stop.sh"]
------------- diff for environment production namespace swh -------------
--- /tmp/swh-chart.swh.0v8upCcM/production-swh.before 2024-01-22 14:03:08.382968500 +0100
+++ /tmp/swh-chart.swh.0v8upCcM/production-swh.after 2024-01-22 14:03:08.850967937 +0100
@@ -290,20 +290,24 @@
config.yml.template: |
storage:
cls: pipeline
steps:
- cls: retry
- cls: remote
url: http://storage-azure-read-only-rpc-ingress
vault:
cls: remote
url: http://vault-rpc-ingress
+ graph:
+ cls: remote
+ url: http://graph.internal.softwareheritage.org:5009
+
max_bundle_size: 1073741824
celery:
task_broker: amqp://swhconsumer:${AMQP_PASSWORD}@rabbitmq.internal.softwareheritage.org:5672/%2f
task_acks_late: false
task_modules:
- swh.vault.cooking_tasks
task_queues:
- swh.vault.cooking_tasks.SWHBatchCookingTask
sentry_settings_for_celery_tasks:
@@ -373,20 +377,24 @@
config.yml.template: |
storage:
cls: pipeline
steps:
- cls: retry
- cls: remote
url: http://storage-azure-read-only-rpc-ingress
vault:
cls: remote
url: http://vault-rpc-ingress
+ graph:
+ cls: remote
+ url: http://graph.internal.softwareheritage.org:5009
+
max_bundle_size: 1073741824
celery:
task_broker: amqp://swhconsumer:${AMQP_PASSWORD}@rabbitmq.internal.softwareheritage.org:5672/%2f
task_acks_late: true
task_modules:
- swh.vault.cooking_tasks
task_queues:
- swh.vault.cooking_tasks.SWHCookingTask
sentry_settings_for_celery_tasks:
@@ -17347,21 +17355,21 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: cooker-batch
annotations:
# Force a rollout upgrade if the configuration changes
- checksum/config: 2b0daa6a9ea2ee84007fc3d7edc020d2bfd4449c369d39f955659c9f6b1e8f53
+ checksum/config: 7dd40f2229c43e5ba5ffeba1b8082829c1f8e90e4d988bc67f0c0690591e40fb
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/cooker
operator: In
values:
@@ -17397,21 +17405,21 @@
- name: sentry-settings-for-celery-tasks
mountPath: /etc/credentials/sentry-settings
readOnly: true
containers:
- name: cookers
resources:
requests:
memory: 512Mi
cpu: 500m
- image: container-registry.softwareheritage.org/swh/infra/swh-apps/vault_cookers:20240119.1
+ image: container-registry.softwareheritage.org/swh/infra/swh-apps/vault_cookers:20240122.1
imagePullPolicy: IfNotPresent
command:
- /bin/bash
args:
- -c
- /opt/swh/entrypoint.sh
lifecycle:
preStop:
exec:
command: ["/pre-stop.sh"]
@@ -17491,21 +17499,21 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: cooker-simple
annotations:
# Force a rollout upgrade if the configuration changes
- checksum/config: 2b0daa6a9ea2ee84007fc3d7edc020d2bfd4449c369d39f955659c9f6b1e8f53
+ checksum/config: 7dd40f2229c43e5ba5ffeba1b8082829c1f8e90e4d988bc67f0c0690591e40fb
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/cooker
operator: In
values:
@@ -17541,21 +17549,21 @@
- name: sentry-settings-for-celery-tasks
mountPath: /etc/credentials/sentry-settings
readOnly: true
containers:
- name: cookers
resources:
requests:
memory: 512Mi
cpu: 500m
- image: container-registry.softwareheritage.org/swh/infra/swh-apps/vault_cookers:20240119.1
+ image: container-registry.softwareheritage.org/swh/infra/swh-apps/vault_cookers:20240122.1
imagePullPolicy: IfNotPresent
command:
- /bin/bash
args:
- -c
- /opt/swh/entrypoint.sh
lifecycle:
preStop:
exec:
command: ["/pre-stop.sh"]
------------- diff for environment production namespace swh-cassandra -------------
No differences