Add remaining backends and adapt environment <local-cluster>'s services to use them
Content of the mr:
-
Add elasticsearch backend -
Add elasticsearch operator configuration declaration -
local-cluster: Add elasticsearch cluster -
local-cluster: Make swh-search search use that elasticsearch cluster
-
-
Add redis backend -
Add redis operator configuration declaration -
local-cluster: Add redis instance -
local-cluster: Make swh.counter uses that redis instance
-
Some minor changes related to changes in various utils [1]
[1] helm diff
[swh] Comparing changes between branches production and make-next-version-independent (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-next-version-independent branch for environment staging...
[swh] Generate config in make-next-version-independent branch for environment staging...
[swh] Generate config in make-next-version-independent 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-next-version-independent branch for environment production...
[swh] Generate config in make-next-version-independent branch for environment production...
[swh] Generate config in make-next-version-independent branch for environment production...
------------- diff for environment staging namespace swh -------------
--- /tmp/swh-chart.swh.CZ8QMZRP/staging-swh.before 2024-07-11 10:57:55.053839696 +0200
+++ /tmp/swh-chart.swh.CZ8QMZRP/staging-swh.after 2024-07-11 10:57:55.853802598 +0200
@@ -1385,20 +1385,27 @@
cat $TEMPLATE | envsubst > $TARGET
---
# Source: swh/templates/utils/database-utils.yaml
apiVersion: v1
kind: ConfigMap
metadata:
name: database-utils
namespace: swh
data:
+ initialize-search-backend.sh: |
+ #!/usr/bin/env bash
+
+ set -eux
+
+ # This is not able to use the environment variable SWH_CONFIG_FILENAME yet
+ swh search -C $SWH_CONFIG_FILENAME initialize
register-task-types.sh: |
#!/usr/bin/env bash
set -eux
# Uses internally the environment variable SWH_CONFIG_FILENAME
swh scheduler task-type register
register-webhook-event-types.sh: |
#!/usr/bin/env bash
@@ -13148,21 +13155,21 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: storage-replayer-content
annotations:
checksum/config: 70f9782d6c471ce3f2bfbbda148a31d30d18d691af4eedb1cf1b9ea69b81435f
- checksum/config_utils: bd7258461d7bfa1dd9c82dab49fd788eecabadbc77ed0b0470aa97f682002866
+ checksum/config_utils: ea9a10db5230e32409a20a49c7c0f27ad0bde0f818e710706d7a63fafc6274f3
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/replayer
operator: In
values:
- "true"
@@ -13288,21 +13295,21 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: storage-replayer-directory
annotations:
checksum/config: 01280d59bc9bb0e16fbc3e37c5449f6fcaa35b5d2bde8638c64d550b72b116b3
- checksum/config_utils: bd7258461d7bfa1dd9c82dab49fd788eecabadbc77ed0b0470aa97f682002866
+ checksum/config_utils: ea9a10db5230e32409a20a49c7c0f27ad0bde0f818e710706d7a63fafc6274f3
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/replayer
operator: In
values:
- "true"
@@ -13428,21 +13435,21 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: storage-replayer-extid
annotations:
checksum/config: fd652fb21e238ea839bd784d1e747812290a1de060dba74252b373821556f01b
- checksum/config_utils: bd7258461d7bfa1dd9c82dab49fd788eecabadbc77ed0b0470aa97f682002866
+ checksum/config_utils: ea9a10db5230e32409a20a49c7c0f27ad0bde0f818e710706d7a63fafc6274f3
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/replayer
operator: In
values:
- "true"
@@ -13568,21 +13575,21 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: storage-replayer-metadata
annotations:
checksum/config: 301b04576d677562817148ca777b75f87d91d6a04ad513e3fb0b6897c2d3d0dc
- checksum/config_utils: bd7258461d7bfa1dd9c82dab49fd788eecabadbc77ed0b0470aa97f682002866
+ checksum/config_utils: ea9a10db5230e32409a20a49c7c0f27ad0bde0f818e710706d7a63fafc6274f3
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/replayer
operator: In
values:
- "true"
@@ -13708,21 +13715,21 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: storage-replayer-origin
annotations:
checksum/config: d7c7ce9424859704cd46ac2bbd6ded95214330983e64f6fbc4adf310bdc5930a
- checksum/config_utils: bd7258461d7bfa1dd9c82dab49fd788eecabadbc77ed0b0470aa97f682002866
+ checksum/config_utils: ea9a10db5230e32409a20a49c7c0f27ad0bde0f818e710706d7a63fafc6274f3
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/replayer
operator: In
values:
- "true"
@@ -13848,21 +13855,21 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: storage-replayer-origin-visit
annotations:
checksum/config: 1fc1a1ede5573cb43fe5ab3f4339dd64a48ac2dadc7f834cef5c4223ce6be5ef
- checksum/config_utils: bd7258461d7bfa1dd9c82dab49fd788eecabadbc77ed0b0470aa97f682002866
+ checksum/config_utils: ea9a10db5230e32409a20a49c7c0f27ad0bde0f818e710706d7a63fafc6274f3
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/replayer
operator: In
values:
- "true"
@@ -13988,21 +13995,21 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: storage-replayer-origin-visit-status
annotations:
checksum/config: fb2aed6224a74347b7ca2b8e3a2ec6f6b1eab26d430861337f2df44891743393
- checksum/config_utils: bd7258461d7bfa1dd9c82dab49fd788eecabadbc77ed0b0470aa97f682002866
+ checksum/config_utils: ea9a10db5230e32409a20a49c7c0f27ad0bde0f818e710706d7a63fafc6274f3
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/replayer
operator: In
values:
- "true"
@@ -14128,21 +14135,21 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: storage-replayer-raw-extrinsic-metadata
annotations:
checksum/config: 4b9645b3bc1d2d1e65714acc1b19505201ea7ea240586068a8bc6761e281ba8b
- checksum/config_utils: bd7258461d7bfa1dd9c82dab49fd788eecabadbc77ed0b0470aa97f682002866
+ checksum/config_utils: ea9a10db5230e32409a20a49c7c0f27ad0bde0f818e710706d7a63fafc6274f3
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/replayer
operator: In
values:
- "true"
@@ -14268,21 +14275,21 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: storage-replayer-release
annotations:
checksum/config: c23a0fd2598b19b9f15a4ceeda05903c0b6183e260bbca829156fb0458970169
- checksum/config_utils: bd7258461d7bfa1dd9c82dab49fd788eecabadbc77ed0b0470aa97f682002866
+ checksum/config_utils: ea9a10db5230e32409a20a49c7c0f27ad0bde0f818e710706d7a63fafc6274f3
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/replayer
operator: In
values:
- "true"
@@ -14408,21 +14415,21 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: storage-replayer-revision
annotations:
checksum/config: 6bb8431dbffae535dd0b9ca102be875741ebf444be2f1ddbc642a4d4b3f47488
- checksum/config_utils: bd7258461d7bfa1dd9c82dab49fd788eecabadbc77ed0b0470aa97f682002866
+ checksum/config_utils: ea9a10db5230e32409a20a49c7c0f27ad0bde0f818e710706d7a63fafc6274f3
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/replayer
operator: In
values:
- "true"
@@ -14548,21 +14555,21 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: storage-replayer-skipped-content
annotations:
checksum/config: b6835a7fc01ad2cd25c2ad024464e9dfac68e9b2b839088a8d789ebdd20b68dc
- checksum/config_utils: bd7258461d7bfa1dd9c82dab49fd788eecabadbc77ed0b0470aa97f682002866
+ checksum/config_utils: ea9a10db5230e32409a20a49c7c0f27ad0bde0f818e710706d7a63fafc6274f3
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/replayer
operator: In
values:
- "true"
@@ -14688,21 +14695,21 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: storage-replayer-snapshot
annotations:
checksum/config: 21c1f4b6fb0c852d213be754b701098fbf34b70d133399e87af9d8a99dd783a7
- checksum/config_utils: bd7258461d7bfa1dd9c82dab49fd788eecabadbc77ed0b0470aa97f682002866
+ checksum/config_utils: ea9a10db5230e32409a20a49c7c0f27ad0bde0f818e710706d7a63fafc6274f3
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/replayer
operator: In
values:
- "true"
@@ -14828,21 +14835,21 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: storage-postgresql-read-only
annotations:
checksum/config: 6af52166b9f1e49fbd071779062391bfced2a4756536ec9f022d05a49175b758
- checksum/database-utils: bd7258461d7bfa1dd9c82dab49fd788eecabadbc77ed0b0470aa97f682002866
+ checksum/database-utils: ea9a10db5230e32409a20a49c7c0f27ad0bde0f818e710706d7a63fafc6274f3
checksum/config-utils: d75ca13b805bce6a8ab59c8e24c938f2283108f6a79134f6e71db86308651dc6
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/storage
operator: In
values:
@@ -14979,21 +14986,21 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: storage-postgresql-read-write
annotations:
checksum/config: 9f5430a1a4ac7f7174f411d084f612555e00a70f066b8fb3d6c14034371c1633
- checksum/database-utils: bd7258461d7bfa1dd9c82dab49fd788eecabadbc77ed0b0470aa97f682002866
+ checksum/database-utils: ea9a10db5230e32409a20a49c7c0f27ad0bde0f818e710706d7a63fafc6274f3
checksum/config-utils: d75ca13b805bce6a8ab59c8e24c938f2283108f6a79134f6e71db86308651dc6
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/storage
operator: In
values:
------------- diff for environment staging namespace swh-cassandra -------------
--- /tmp/swh-chart.swh.CZ8QMZRP/staging-swh-cassandra.before 2024-07-11 10:57:55.397823744 +0200
+++ /tmp/swh-chart.swh.CZ8QMZRP/staging-swh-cassandra.after 2024-07-11 10:57:56.197786646 +0200
@@ -6624,20 +6624,27 @@
cat $TEMPLATE | envsubst > $TARGET
---
# Source: swh/templates/utils/database-utils.yaml
apiVersion: v1
kind: ConfigMap
metadata:
name: database-utils
namespace: swh-cassandra
data:
+ initialize-search-backend.sh: |
+ #!/usr/bin/env bash
+
+ set -eux
+
+ # This is not able to use the environment variable SWH_CONFIG_FILENAME yet
+ swh search -C $SWH_CONFIG_FILENAME initialize
register-task-types.sh: |
#!/usr/bin/env bash
set -eux
# Uses internally the environment variable SWH_CONFIG_FILENAME
swh scheduler task-type register
register-webhook-event-types.sh: |
#!/usr/bin/env bash
@@ -19009,26 +19016,21 @@
containers:
- name: counters-journal-client
resources:
requests:
memory: 512Mi
cpu: 500m
image: container-registry.softwareheritage.org/swh/infra/swh-apps/counters:20240618.2
command:
- /opt/swh/entrypoint.sh
args:
- # - shell
- # - sleep
- # - infinity
- swh
- - --log-level
- - INFO
- counters
- --config-file
- /etc/swh/config.yml
- journal-client
env:
- name: STATSD_HOST
value: prometheus-statsd-exporter
- name: STATSD_PORT
value: "9125"
- name: STATSD_TAGS
@@ -19522,21 +19524,21 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: indexer-storage-rpc
annotations:
checksum/config: d3f9a9c802e45df0c62cf8bad4943963c9e2d6fd1e86ef992eebdf2b1ca89424
- checksum/database-utils: 4f9daaeba2c5605ce59fbb193e86912e6cd736aae49d1be2591660bd210380c7
+ checksum/database-utils: cdce67fc3fd723ffafff5a2b4697b2e9e5953588b83b58d41be3c2623c223b6a
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/rpc
operator: In
values:
- "true"
@@ -28204,42 +28206,45 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: search-journal-client-indexed
annotations:
checksum/config: e8d1340a6915ffa56a03de36f03058085f300321e2a7d9a8d3c37ae36f18d158
+ checksum/config-utils: 13a26f6add17e96ce01550153c77dcd48de60241a3f4db3c93d5467234be2a7f
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/journal_client
operator: In
values:
- "true"
priorityClassName: swh-cassandra-normal-workload
initContainers:
- name: prepare-configuration
- image: debian:bullseye
+ image: container-registry.softwareheritage.org/swh/infra/swh-apps/utils:20231211.1
imagePullPolicy: IfNotPresent
command:
- - /bin/bash
- args:
- - -c
- - eval echo "\"$(</etc/swh/configuration-template/config.yml.template)\"" > /etc/swh/config.yml
+ - /entrypoints/prepare-configuration.sh
+ env:
+
volumeMounts:
+ - name: config-utils
+ mountPath: /entrypoints
+ readOnly: true
- name: configuration
mountPath: /etc/swh
- name: configuration-template
mountPath: /etc/swh/configuration-template
containers:
- name: search-journal-client-indexed
resources:
requests:
memory: 50Mi
cpu: 10m
@@ -28285,20 +28290,24 @@
mountPath: /etc/swh
volumes:
- name: configuration
emptyDir: {}
- name: configuration-template
configMap:
name: search-journal-client-indexed-configuration-template
items:
- key: "config.yml.template"
path: "config.yml.template"
+ - name: config-utils
+ configMap:
+ name: config-utils
+ defaultMode: 0555
---
# Source: swh/templates/search/journal-client-deployment.yaml
apiVersion: apps/v1
kind: Deployment
metadata:
namespace: swh-cassandra
name: search-journal-client-objects
labels:
app: search-journal-client-objects
spec:
@@ -28309,42 +28318,45 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: search-journal-client-objects
annotations:
checksum/config: 8feaa28f3e3debfa3bfed417023ab0ff213ec1e6228f9365c8e6be32ea6578ba
+ checksum/config-utils: 13a26f6add17e96ce01550153c77dcd48de60241a3f4db3c93d5467234be2a7f
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/journal_client
operator: In
values:
- "true"
priorityClassName: swh-cassandra-normal-workload
initContainers:
- name: prepare-configuration
- image: debian:bullseye
+ image: container-registry.softwareheritage.org/swh/infra/swh-apps/utils:20231211.1
imagePullPolicy: IfNotPresent
command:
- - /bin/bash
- args:
- - -c
- - eval echo "\"$(</etc/swh/configuration-template/config.yml.template)\"" > /etc/swh/config.yml
+ - /entrypoints/prepare-configuration.sh
+ env:
+
volumeMounts:
+ - name: config-utils
+ mountPath: /entrypoints
+ readOnly: true
- name: configuration
mountPath: /etc/swh
- name: configuration-template
mountPath: /etc/swh/configuration-template
containers:
- name: search-journal-client-objects
resources:
requests:
memory: 50Mi
cpu: 10m
@@ -28390,20 +28402,24 @@
mountPath: /etc/swh
volumes:
- name: configuration
emptyDir: {}
- name: configuration-template
configMap:
name: search-journal-client-objects-configuration-template
items:
- key: "config.yml.template"
path: "config.yml.template"
+ - name: config-utils
+ configMap:
+ name: config-utils
+ defaultMode: 0555
---
# Source: swh/templates/search/rpc-deployment.yaml
apiVersion: apps/v1
kind: Deployment
metadata:
namespace: swh-cassandra
name: search-rpc
labels:
app: search-rpc
spec:
@@ -28413,43 +28429,47 @@
app: search-rpc
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: search-rpc
annotations:
- checksum/config: f2c8137a4a46f99e5570e2beed1e3c0614c02c99d67a68e974d92a94b995976b
+ checksum/config: c96e59aeb12ebd8719e2239ba8163e75a7012665060e7b699916068d6bd96028
+ checksum/config-utils: 13a26f6add17e96ce01550153c77dcd48de60241a3f4db3c93d5467234be2a7f
+ checksum/database-utils: cdce67fc3fd723ffafff5a2b4697b2e9e5953588b83b58d41be3c2623c223b6a
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/rpc
operator: In
values:
- "true"
priorityClassName: swh-cassandra-frontend-rpc
initContainers:
- name: prepare-configuration
- image: debian:bullseye
+ image: container-registry.softwareheritage.org/swh/infra/swh-apps/utils:20231211.1
imagePullPolicy: IfNotPresent
command:
- - /bin/bash
- args:
- - -c
- - eval echo "\"$(</etc/swh/configuration-template/config.yml.template)\"" > /etc/swh/config.yml
+ - /entrypoints/prepare-configuration.sh
+ env:
+
volumeMounts:
+ - name: config-utils
+ mountPath: /entrypoints
+ readOnly: true
- name: configuration
mountPath: /etc/swh
- name: configuration-template
mountPath: /etc/swh/configuration-template
containers:
- name: search-rpc
resources:
requests:
memory: 300Mi
cpu: 100m
@@ -28508,20 +28528,28 @@
mountPath: /etc/swh
volumes:
- name: configuration
emptyDir: {}
- name: configuration-template
configMap:
name: search-rpc-configuration-template
items:
- key: "config.yml.template"
path: "config.yml.template"
+ - name: config-utils
+ configMap:
+ name: config-utils
+ defaultMode: 0555
+ - name: database-utils
+ configMap:
+ name: database-utils
+ defaultMode: 0555
---
# Source: swh/templates/statsd-exporter/deployment.yaml
apiVersion: apps/v1
kind: Deployment
metadata:
name: prometheus-statsd-exporter
namespace: swh-cassandra
labels:
app: prometheus-statsd-exporter
spec:
@@ -28570,21 +28598,21 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: storage-replayer-content
annotations:
checksum/config: 5f2245fcefc238b37d959e9272129be6aece7ab8d6ce405ed7e5cf1a040d5227
- checksum/config_utils: 4f9daaeba2c5605ce59fbb193e86912e6cd736aae49d1be2591660bd210380c7
+ checksum/config_utils: cdce67fc3fd723ffafff5a2b4697b2e9e5953588b83b58d41be3c2623c223b6a
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/replayer
operator: In
values:
- "true"
@@ -28706,21 +28734,21 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: storage-replayer-directory
annotations:
checksum/config: 9879d70a4a4f7d39c7b690e6244049ba3323b9a6e504aa520e5a2b5d8b93afc3
- checksum/config_utils: 4f9daaeba2c5605ce59fbb193e86912e6cd736aae49d1be2591660bd210380c7
+ checksum/config_utils: cdce67fc3fd723ffafff5a2b4697b2e9e5953588b83b58d41be3c2623c223b6a
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/replayer
operator: In
values:
- "true"
@@ -28842,21 +28870,21 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: storage-replayer-extid
annotations:
checksum/config: 90d4ff6ff71283882a99372d9eff5f36e23e9d7048c4d497a0466069db896612
- checksum/config_utils: 4f9daaeba2c5605ce59fbb193e86912e6cd736aae49d1be2591660bd210380c7
+ checksum/config_utils: cdce67fc3fd723ffafff5a2b4697b2e9e5953588b83b58d41be3c2623c223b6a
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/replayer
operator: In
values:
- "true"
@@ -28978,21 +29006,21 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: storage-replayer-metadata
annotations:
checksum/config: c574dfad9ba1cf2a422f588aab220a8862469c7823637f874d0543318dfcdd8f
- checksum/config_utils: 4f9daaeba2c5605ce59fbb193e86912e6cd736aae49d1be2591660bd210380c7
+ checksum/config_utils: cdce67fc3fd723ffafff5a2b4697b2e9e5953588b83b58d41be3c2623c223b6a
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/replayer
operator: In
values:
- "true"
@@ -29114,21 +29142,21 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: storage-replayer-origin
annotations:
checksum/config: 7bae40738fc3f7e874e29e37bb0eb34510f7342116513998019bde9c6a8d5692
- checksum/config_utils: 4f9daaeba2c5605ce59fbb193e86912e6cd736aae49d1be2591660bd210380c7
+ checksum/config_utils: cdce67fc3fd723ffafff5a2b4697b2e9e5953588b83b58d41be3c2623c223b6a
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/replayer
operator: In
values:
- "true"
@@ -29250,21 +29278,21 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: storage-replayer-origin-visit
annotations:
checksum/config: d09f14ec1cc278bd13d354c23bf1b4631ed0cc51ad770474a59e6b00d919b7cd
- checksum/config_utils: 4f9daaeba2c5605ce59fbb193e86912e6cd736aae49d1be2591660bd210380c7
+ checksum/config_utils: cdce67fc3fd723ffafff5a2b4697b2e9e5953588b83b58d41be3c2623c223b6a
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/replayer
operator: In
values:
- "true"
@@ -29386,21 +29414,21 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: storage-replayer-origin-visit-status
annotations:
checksum/config: 48818372f44ef1211983e62285f93337b3155857561391c60c009c302d3026fb
- checksum/config_utils: 4f9daaeba2c5605ce59fbb193e86912e6cd736aae49d1be2591660bd210380c7
+ checksum/config_utils: cdce67fc3fd723ffafff5a2b4697b2e9e5953588b83b58d41be3c2623c223b6a
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/replayer
operator: In
values:
- "true"
@@ -29522,21 +29550,21 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: storage-replayer-raw-extrinsic-metadata
annotations:
checksum/config: 4b3edb6714b3ffd2286f3ebb9dfa6b024803b8fc99e5a1c4c7b58b0fbb35fa54
- checksum/config_utils: 4f9daaeba2c5605ce59fbb193e86912e6cd736aae49d1be2591660bd210380c7
+ checksum/config_utils: cdce67fc3fd723ffafff5a2b4697b2e9e5953588b83b58d41be3c2623c223b6a
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/replayer
operator: In
values:
- "true"
@@ -29658,21 +29686,21 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: storage-replayer-release
annotations:
checksum/config: f3ca7b87af8f52db83dffd16956aa433c81cc07a32c6af1db485b63be5c662d0
- checksum/config_utils: 4f9daaeba2c5605ce59fbb193e86912e6cd736aae49d1be2591660bd210380c7
+ checksum/config_utils: cdce67fc3fd723ffafff5a2b4697b2e9e5953588b83b58d41be3c2623c223b6a
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/replayer
operator: In
values:
- "true"
@@ -29794,21 +29822,21 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: storage-replayer-revision
annotations:
checksum/config: 3ff0d8414897e45d40fb1cd1c6f452f21b6418864802bf162d6106ec70e89278
- checksum/config_utils: 4f9daaeba2c5605ce59fbb193e86912e6cd736aae49d1be2591660bd210380c7
+ checksum/config_utils: cdce67fc3fd723ffafff5a2b4697b2e9e5953588b83b58d41be3c2623c223b6a
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/replayer
operator: In
values:
- "true"
@@ -29930,21 +29958,21 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: storage-replayer-skipped-content
annotations:
checksum/config: 241ea22df205ff68a12947f91faba865ecac2812919964cec2b8ecb51a60b9fe
- checksum/config_utils: 4f9daaeba2c5605ce59fbb193e86912e6cd736aae49d1be2591660bd210380c7
+ checksum/config_utils: cdce67fc3fd723ffafff5a2b4697b2e9e5953588b83b58d41be3c2623c223b6a
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/replayer
operator: In
values:
- "true"
@@ -30066,21 +30094,21 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: storage-replayer-snapshot
annotations:
checksum/config: 1c98cc179cca31bbbb70989e0179276a73a9fb55a2fa920556f59355b4ded5db
- checksum/config_utils: 4f9daaeba2c5605ce59fbb193e86912e6cd736aae49d1be2591660bd210380c7
+ checksum/config_utils: cdce67fc3fd723ffafff5a2b4697b2e9e5953588b83b58d41be3c2623c223b6a
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/replayer
operator: In
values:
- "true"
@@ -30202,21 +30230,21 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: storage-cassandra
annotations:
checksum/config: ee524b202a72cad36dee96cc62319f02ff024737efddf98801a22b976fc9e8da
- checksum/database-utils: 4f9daaeba2c5605ce59fbb193e86912e6cd736aae49d1be2591660bd210380c7
+ checksum/database-utils: cdce67fc3fd723ffafff5a2b4697b2e9e5953588b83b58d41be3c2623c223b6a
checksum/config-utils: 13a26f6add17e96ce01550153c77dcd48de60241a3f4db3c93d5467234be2a7f
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/storage
operator: In
values:
@@ -30358,21 +30386,21 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: storage-cassandra-read-only
annotations:
checksum/config: b8ae6c11c13cc089647c79d7aa97da386b54caecad2d2fcc14fee329f7e9a33c
- checksum/database-utils: 4f9daaeba2c5605ce59fbb193e86912e6cd736aae49d1be2591660bd210380c7
+ checksum/database-utils: cdce67fc3fd723ffafff5a2b4697b2e9e5953588b83b58d41be3c2623c223b6a
checksum/config-utils: 13a26f6add17e96ce01550153c77dcd48de60241a3f4db3c93d5467234be2a7f
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/storage
operator: In
values:
------------- diff for environment staging namespace swh-cassandra-next-version -------------
--- /tmp/swh-chart.swh.CZ8QMZRP/staging-swh-cassandra-next-version.before 2024-07-11 10:57:55.677810760 +0200
+++ /tmp/swh-chart.swh.CZ8QMZRP/staging-swh-cassandra-next-version.after 2024-07-11 10:57:56.473773847 +0200
@@ -5366,20 +5366,27 @@
cat $TEMPLATE | envsubst > $TARGET
---
# Source: swh/templates/utils/database-utils.yaml
apiVersion: v1
kind: ConfigMap
metadata:
name: database-utils
namespace: swh-cassandra-next-version
data:
+ initialize-search-backend.sh: |
+ #!/usr/bin/env bash
+
+ set -eux
+
+ # This is not able to use the environment variable SWH_CONFIG_FILENAME yet
+ swh search -C $SWH_CONFIG_FILENAME initialize
register-task-types.sh: |
#!/usr/bin/env bash
set -eux
# Uses internally the environment variable SWH_CONFIG_FILENAME
swh scheduler task-type register
register-webhook-event-types.sh: |
#!/usr/bin/env bash
@@ -16389,26 +16396,21 @@
containers:
- name: counters-journal-client
resources:
requests:
memory: 512Mi
cpu: 500m
image: container-registry.softwareheritage.org/swh/infra/swh-apps/counters:20240618.2
command:
- /opt/swh/entrypoint.sh
args:
- # - shell
- # - sleep
- # - infinity
- swh
- - --log-level
- - INFO
- counters
- --config-file
- /etc/swh/config.yml
- journal-client
env:
- name: STATSD_HOST
value: prometheus-statsd-exporter
- name: STATSD_PORT
value: "9125"
- name: STATSD_TAGS
@@ -23758,21 +23760,21 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: storage-replayer-content
annotations:
checksum/config: a35ed78faf7b337cc1f77b8c8442ab8ae70a7b78b335d43ae076b1e10583298e
- checksum/config_utils: 1eff4f99613e815756d1ed9d19afdbe65eaa7629f98c0dbc5f963126ea566f89
+ checksum/config_utils: 5e854b0247abc348ee3a557d87acf4b727392f8a61881bd56170bf3e4db92116
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/replayer
operator: In
values:
- "true"
@@ -23894,21 +23896,21 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: storage-replayer-directory
annotations:
checksum/config: 0471b84b2b0444b0e35ae7e625d30bef8f74cab63fd5aef1d1e56569077af62e
- checksum/config_utils: 1eff4f99613e815756d1ed9d19afdbe65eaa7629f98c0dbc5f963126ea566f89
+ checksum/config_utils: 5e854b0247abc348ee3a557d87acf4b727392f8a61881bd56170bf3e4db92116
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/replayer
operator: In
values:
- "true"
@@ -24030,21 +24032,21 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: storage-replayer-extid
annotations:
checksum/config: ddcde7e02fb80f8c3316d9689ca26ead518255738f2b3ccdd3bbcbdfcac93ddb
- checksum/config_utils: 1eff4f99613e815756d1ed9d19afdbe65eaa7629f98c0dbc5f963126ea566f89
+ checksum/config_utils: 5e854b0247abc348ee3a557d87acf4b727392f8a61881bd56170bf3e4db92116
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/replayer
operator: In
values:
- "true"
@@ -24166,21 +24168,21 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: storage-replayer-metadata
annotations:
checksum/config: 43eda7df7da3c47eb7c92087fbdb7275ac185eddb0a5d37c2a61e1469df08533
- checksum/config_utils: 1eff4f99613e815756d1ed9d19afdbe65eaa7629f98c0dbc5f963126ea566f89
+ checksum/config_utils: 5e854b0247abc348ee3a557d87acf4b727392f8a61881bd56170bf3e4db92116
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/replayer
operator: In
values:
- "true"
@@ -24302,21 +24304,21 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: storage-replayer-origin
annotations:
checksum/config: feb22c5c9d8cb34d06c8397bbf7c787ee6b712e0f3da3ecf885c1b47d80f48c8
- checksum/config_utils: 1eff4f99613e815756d1ed9d19afdbe65eaa7629f98c0dbc5f963126ea566f89
+ checksum/config_utils: 5e854b0247abc348ee3a557d87acf4b727392f8a61881bd56170bf3e4db92116
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/replayer
operator: In
values:
- "true"
@@ -24438,21 +24440,21 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: storage-replayer-origin-visit
annotations:
checksum/config: 6a8fe3d4363abb52d65728c864316afcbb8b92d034b4c16967cf046186ba0a19
- checksum/config_utils: 1eff4f99613e815756d1ed9d19afdbe65eaa7629f98c0dbc5f963126ea566f89
+ checksum/config_utils: 5e854b0247abc348ee3a557d87acf4b727392f8a61881bd56170bf3e4db92116
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/replayer
operator: In
values:
- "true"
@@ -24574,21 +24576,21 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: storage-replayer-origin-visit-status
annotations:
checksum/config: 7764012e65f78a2771b2e23be1fe8e32c2e6f963ccb2c377fef2072c32c2610c
- checksum/config_utils: 1eff4f99613e815756d1ed9d19afdbe65eaa7629f98c0dbc5f963126ea566f89
+ checksum/config_utils: 5e854b0247abc348ee3a557d87acf4b727392f8a61881bd56170bf3e4db92116
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/replayer
operator: In
values:
- "true"
@@ -24710,21 +24712,21 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: storage-replayer-raw-extrinsic-metadata
annotations:
checksum/config: 608a6e8c766a4745ac4227c2f3fa267cb95dd5b0244cf91d902e61afb48c00f9
- checksum/config_utils: 1eff4f99613e815756d1ed9d19afdbe65eaa7629f98c0dbc5f963126ea566f89
+ checksum/config_utils: 5e854b0247abc348ee3a557d87acf4b727392f8a61881bd56170bf3e4db92116
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/replayer
operator: In
values:
- "true"
@@ -24846,21 +24848,21 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: storage-replayer-release
annotations:
checksum/config: 92c9e9de7f34f37dd26a39bb7112577efa145223d7013c8036b3697273c89092
- checksum/config_utils: 1eff4f99613e815756d1ed9d19afdbe65eaa7629f98c0dbc5f963126ea566f89
+ checksum/config_utils: 5e854b0247abc348ee3a557d87acf4b727392f8a61881bd56170bf3e4db92116
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/replayer
operator: In
values:
- "true"
@@ -24982,21 +24984,21 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: storage-replayer-revision
annotations:
checksum/config: 0bf3db3e3aa408eb8e109825648044ac11eca63c0e9240b65719be53e74543fd
- checksum/config_utils: 1eff4f99613e815756d1ed9d19afdbe65eaa7629f98c0dbc5f963126ea566f89
+ checksum/config_utils: 5e854b0247abc348ee3a557d87acf4b727392f8a61881bd56170bf3e4db92116
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/replayer
operator: In
values:
- "true"
@@ -25118,21 +25120,21 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: storage-replayer-skipped-content
annotations:
checksum/config: d23d40ae307b38fbb3890826de5b3d19f996e61a8b67f41dc9e6b277cc51446a
- checksum/config_utils: 1eff4f99613e815756d1ed9d19afdbe65eaa7629f98c0dbc5f963126ea566f89
+ checksum/config_utils: 5e854b0247abc348ee3a557d87acf4b727392f8a61881bd56170bf3e4db92116
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/replayer
operator: In
values:
- "true"
@@ -25254,21 +25256,21 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: storage-replayer-snapshot
annotations:
checksum/config: 45182ca5457d8cda838846ad4ace1ff82993c15fc4c009830a9bc76cbb6f92a2
- checksum/config_utils: 1eff4f99613e815756d1ed9d19afdbe65eaa7629f98c0dbc5f963126ea566f89
+ checksum/config_utils: 5e854b0247abc348ee3a557d87acf4b727392f8a61881bd56170bf3e4db92116
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/replayer
operator: In
values:
- "true"
@@ -25390,21 +25392,21 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: storage-postgresql-read-write
annotations:
checksum/config: c0053695c8a333da3568ecb8461817f3407e388bedcd08d71cb37f6d4550dcaa
- checksum/database-utils: 1eff4f99613e815756d1ed9d19afdbe65eaa7629f98c0dbc5f963126ea566f89
+ checksum/database-utils: 5e854b0247abc348ee3a557d87acf4b727392f8a61881bd56170bf3e4db92116
checksum/config-utils: 94d255131467f84bef964a4c72b2b792c5ebaf711bb1c77829d7cd1007a8ac22
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/storage
operator: In
values:
------------- diff for environment production namespace swh -------------
--- /tmp/swh-chart.swh.CZ8QMZRP/production-swh.before 2024-07-11 10:57:56.841756782 +0200
+++ /tmp/swh-chart.swh.CZ8QMZRP/production-swh.after 2024-07-11 10:57:57.377731926 +0200
@@ -7761,20 +7761,27 @@
cat $TEMPLATE | envsubst > $TARGET
---
# Source: swh/templates/utils/database-utils.yaml
apiVersion: v1
kind: ConfigMap
metadata:
name: database-utils
namespace: swh
data:
+ initialize-search-backend.sh: |
+ #!/usr/bin/env bash
+
+ set -eux
+
+ # This is not able to use the environment variable SWH_CONFIG_FILENAME yet
+ swh search -C $SWH_CONFIG_FILENAME initialize
register-task-types.sh: |
#!/usr/bin/env bash
set -eux
# Uses internally the environment variable SWH_CONFIG_FILENAME
swh scheduler task-type register
register-webhook-event-types.sh: |
#!/usr/bin/env bash
@@ -19881,26 +19888,21 @@
containers:
- name: counters-journal-client
resources:
requests:
memory: 512Mi
cpu: 500m
image: container-registry.softwareheritage.org/swh/infra/swh-apps/counters:20240618.2
command:
- /opt/swh/entrypoint.sh
args:
- # - shell
- # - sleep
- # - infinity
- swh
- - --log-level
- - INFO
- counters
- --config-file
- /etc/swh/config.yml
- journal-client
env:
- name: STATSD_HOST
value: prometheus-statsd-exporter
- name: STATSD_PORT
value: "9125"
- name: STATSD_TAGS
@@ -20507,21 +20509,21 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: indexer-storage-read-only
annotations:
checksum/config: ea070fbf964af6768231f7af3c7c7bc5f0766ba5a9ea4ad2af0c547c102b8301
- checksum/database-utils: bd7258461d7bfa1dd9c82dab49fd788eecabadbc77ed0b0470aa97f682002866
+ checksum/database-utils: ea9a10db5230e32409a20a49c7c0f27ad0bde0f818e710706d7a63fafc6274f3
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/rpc
operator: In
values:
- "true"
@@ -20641,21 +20643,21 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: indexer-storage-read-write
annotations:
checksum/config: d604f3b4111e2b5ea04384964ff1123dcf45552fe9e897f243195045b3020f09
- checksum/database-utils: bd7258461d7bfa1dd9c82dab49fd788eecabadbc77ed0b0470aa97f682002866
+ checksum/database-utils: ea9a10db5230e32409a20a49c7c0f27ad0bde0f818e710706d7a63fafc6274f3
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/rpc
operator: In
values:
- "true"
@@ -33216,42 +33218,45 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: search-journal-client-indexed
annotations:
checksum/config: 1946c3a5d5a53e237d0b62a7f1dc3c09425bea3c03f9f7fb9f96064ea3182fbb
+ checksum/config-utils: d75ca13b805bce6a8ab59c8e24c938f2283108f6a79134f6e71db86308651dc6
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/journal_client
operator: In
values:
- "true"
priorityClassName: swh-normal-workload
initContainers:
- name: prepare-configuration
- image: debian:bullseye
+ image: container-registry.softwareheritage.org/swh/infra/swh-apps/utils:20231211.1
imagePullPolicy: IfNotPresent
command:
- - /bin/bash
- args:
- - -c
- - eval echo "\"$(</etc/swh/configuration-template/config.yml.template)\"" > /etc/swh/config.yml
+ - /entrypoints/prepare-configuration.sh
+ env:
+
volumeMounts:
+ - name: config-utils
+ mountPath: /entrypoints
+ readOnly: true
- name: configuration
mountPath: /etc/swh
- name: configuration-template
mountPath: /etc/swh/configuration-template
containers:
- name: search-journal-client-indexed
resources:
requests:
memory: 512Mi
cpu: 500m
@@ -33297,20 +33302,24 @@
mountPath: /etc/swh
volumes:
- name: configuration
emptyDir: {}
- name: configuration-template
configMap:
name: search-journal-client-indexed-configuration-template
items:
- key: "config.yml.template"
path: "config.yml.template"
+ - name: config-utils
+ configMap:
+ name: config-utils
+ defaultMode: 0555
---
# Source: swh/templates/search/journal-client-deployment.yaml
apiVersion: apps/v1
kind: Deployment
metadata:
namespace: swh
name: search-journal-client-objects
labels:
app: search-journal-client-objects
spec:
@@ -33321,42 +33330,45 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: search-journal-client-objects
annotations:
checksum/config: d4bb9087cc24c5e89854ac17ce257b2ba9f3d1f1a01d49390ea219ca13534169
+ checksum/config-utils: d75ca13b805bce6a8ab59c8e24c938f2283108f6a79134f6e71db86308651dc6
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/journal_client
operator: In
values:
- "true"
priorityClassName: swh-normal-workload
initContainers:
- name: prepare-configuration
- image: debian:bullseye
+ image: container-registry.softwareheritage.org/swh/infra/swh-apps/utils:20231211.1
imagePullPolicy: IfNotPresent
command:
- - /bin/bash
- args:
- - -c
- - eval echo "\"$(</etc/swh/configuration-template/config.yml.template)\"" > /etc/swh/config.yml
+ - /entrypoints/prepare-configuration.sh
+ env:
+
volumeMounts:
+ - name: config-utils
+ mountPath: /entrypoints
+ readOnly: true
- name: configuration
mountPath: /etc/swh
- name: configuration-template
mountPath: /etc/swh/configuration-template
containers:
- name: search-journal-client-objects
resources:
requests:
memory: 512Mi
cpu: 500m
@@ -33402,20 +33414,24 @@
mountPath: /etc/swh
volumes:
- name: configuration
emptyDir: {}
- name: configuration-template
configMap:
name: search-journal-client-objects-configuration-template
items:
- key: "config.yml.template"
path: "config.yml.template"
+ - name: config-utils
+ configMap:
+ name: config-utils
+ defaultMode: 0555
---
# Source: swh/templates/search/rpc-deployment.yaml
apiVersion: apps/v1
kind: Deployment
metadata:
namespace: swh
name: search-rpc
labels:
app: search-rpc
spec:
@@ -33426,43 +33442,47 @@
app: search-rpc
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: search-rpc
annotations:
- checksum/config: 2a3fca8a6669b82773189a047b34e1cd9ab7b55f49dbd00deae66214a3c4bc30
+ checksum/config: ca48f90cbaf714d16c84d28db17901c1f056faf8be94219e47103c6ecf27e106
+ checksum/config-utils: d75ca13b805bce6a8ab59c8e24c938f2283108f6a79134f6e71db86308651dc6
+ checksum/database-utils: ea9a10db5230e32409a20a49c7c0f27ad0bde0f818e710706d7a63fafc6274f3
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/rpc
operator: In
values:
- "true"
priorityClassName: swh-frontend-rpc
initContainers:
- name: prepare-configuration
- image: debian:bullseye
+ image: container-registry.softwareheritage.org/swh/infra/swh-apps/utils:20231211.1
imagePullPolicy: IfNotPresent
command:
- - /bin/bash
- args:
- - -c
- - eval echo "\"$(</etc/swh/configuration-template/config.yml.template)\"" > /etc/swh/config.yml
+ - /entrypoints/prepare-configuration.sh
+ env:
+
volumeMounts:
+ - name: config-utils
+ mountPath: /entrypoints
+ readOnly: true
- name: configuration
mountPath: /etc/swh
- name: configuration-template
mountPath: /etc/swh/configuration-template
containers:
- name: search-rpc
resources:
requests:
memory: 512Mi
cpu: 250m
@@ -33521,20 +33541,28 @@
mountPath: /etc/swh
volumes:
- name: configuration
emptyDir: {}
- name: configuration-template
configMap:
name: search-rpc-configuration-template
items:
- key: "config.yml.template"
path: "config.yml.template"
+ - name: config-utils
+ configMap:
+ name: config-utils
+ defaultMode: 0555
+ - name: database-utils
+ configMap:
+ name: database-utils
+ defaultMode: 0555
---
# Source: swh/templates/statsd-exporter/deployment.yaml
apiVersion: apps/v1
kind: Deployment
metadata:
name: prometheus-statsd-exporter
namespace: swh
labels:
app: prometheus-statsd-exporter
spec:
@@ -33583,21 +33611,21 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: storage-postgresql-azure-readonly
annotations:
checksum/config: 27979f60aa9d09b87c7c6b85df468f1e262663a397cb4d7a124e5d5ea65630c7
- checksum/database-utils: bd7258461d7bfa1dd9c82dab49fd788eecabadbc77ed0b0470aa97f682002866
+ checksum/database-utils: ea9a10db5230e32409a20a49c7c0f27ad0bde0f818e710706d7a63fafc6274f3
checksum/config-utils: d75ca13b805bce6a8ab59c8e24c938f2283108f6a79134f6e71db86308651dc6
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/storage
operator: In
values:
@@ -33822,21 +33850,21 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: storage-postgresql-winery
annotations:
checksum/config: e4d4f2f8385ba5a53daba8e15014329a1f058aeffb31742a8bf03da4f4a390c3
- checksum/database-utils: bd7258461d7bfa1dd9c82dab49fd788eecabadbc77ed0b0470aa97f682002866
+ checksum/database-utils: ea9a10db5230e32409a20a49c7c0f27ad0bde0f818e710706d7a63fafc6274f3
checksum/config-utils: d75ca13b805bce6a8ab59c8e24c938f2283108f6a79134f6e71db86308651dc6
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/storage
operator: In
values:
------------- diff for environment production namespace swh-cassandra -------------
--- /tmp/swh-chart.swh.CZ8QMZRP/production-swh-cassandra.before 2024-07-11 10:57:57.017748621 +0200
+++ /tmp/swh-chart.swh.CZ8QMZRP/production-swh-cassandra.after 2024-07-11 10:57:57.565723209 +0200
@@ -1471,20 +1471,27 @@
cat $TEMPLATE | envsubst > $TARGET
---
# Source: swh/templates/utils/database-utils.yaml
apiVersion: v1
kind: ConfigMap
metadata:
name: database-utils
namespace: swh-cassandra
data:
+ initialize-search-backend.sh: |
+ #!/usr/bin/env bash
+
+ set -eux
+
+ # This is not able to use the environment variable SWH_CONFIG_FILENAME yet
+ swh search -C $SWH_CONFIG_FILENAME initialize
register-task-types.sh: |
#!/usr/bin/env bash
set -eux
# Uses internally the environment variable SWH_CONFIG_FILENAME
swh scheduler task-type register
register-webhook-event-types.sh: |
#!/usr/bin/env bash
@@ -12855,21 +12862,21 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: storage-replayer-content
annotations:
checksum/config: 4c7e8b522c314495852ae415dfe6a06d14f33492074c00aaa2b9c96b16c3d755
- checksum/config_utils: 4f9daaeba2c5605ce59fbb193e86912e6cd736aae49d1be2591660bd210380c7
+ checksum/config_utils: cdce67fc3fd723ffafff5a2b4697b2e9e5953588b83b58d41be3c2623c223b6a
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/replayer
operator: In
values:
- "true"
@@ -12978,21 +12985,21 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: storage-replayer-directory
annotations:
checksum/config: cd5709f13d9de56b99983764b09a0dd7b5ae8c00a5a5810016419fae4527cb27
- checksum/config_utils: 4f9daaeba2c5605ce59fbb193e86912e6cd736aae49d1be2591660bd210380c7
+ checksum/config_utils: cdce67fc3fd723ffafff5a2b4697b2e9e5953588b83b58d41be3c2623c223b6a
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/replayer
operator: In
values:
- "true"
@@ -13101,21 +13108,21 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: storage-replayer-extid
annotations:
checksum/config: c76d529cefedc0e5d888e0e42a465efe081e79de03d2b24cd63f92d6a22b8cdb
- checksum/config_utils: 4f9daaeba2c5605ce59fbb193e86912e6cd736aae49d1be2591660bd210380c7
+ checksum/config_utils: cdce67fc3fd723ffafff5a2b4697b2e9e5953588b83b58d41be3c2623c223b6a
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/replayer
operator: In
values:
- "true"
@@ -13224,21 +13231,21 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: storage-replayer-metadata
annotations:
checksum/config: 2eeb62dd6e59956d88f17d10f89aae67189e8bc3cdb0a6ab96a13f0f25c49e85
- checksum/config_utils: 4f9daaeba2c5605ce59fbb193e86912e6cd736aae49d1be2591660bd210380c7
+ checksum/config_utils: cdce67fc3fd723ffafff5a2b4697b2e9e5953588b83b58d41be3c2623c223b6a
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/replayer
operator: In
values:
- "true"
@@ -13347,21 +13354,21 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: storage-replayer-origin
annotations:
checksum/config: d4b138121b29c53ace9c3bd9abd0fe3a42376e8da8edf44856e228eee3f7251f
- checksum/config_utils: 4f9daaeba2c5605ce59fbb193e86912e6cd736aae49d1be2591660bd210380c7
+ checksum/config_utils: cdce67fc3fd723ffafff5a2b4697b2e9e5953588b83b58d41be3c2623c223b6a
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/replayer
operator: In
values:
- "true"
@@ -13470,21 +13477,21 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: storage-replayer-origin-visit
annotations:
checksum/config: 4f50e8c3be5890997fd198865a0a3ac9ac2f2c8674dd2e3f21ac031258ce7638
- checksum/config_utils: 4f9daaeba2c5605ce59fbb193e86912e6cd736aae49d1be2591660bd210380c7
+ checksum/config_utils: cdce67fc3fd723ffafff5a2b4697b2e9e5953588b83b58d41be3c2623c223b6a
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/replayer
operator: In
values:
- "true"
@@ -13593,21 +13600,21 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: storage-replayer-origin-visit-status
annotations:
checksum/config: f5a549da80ba320feff8353bf9630935f7581e461ae5234ab020f079d53bf85a
- checksum/config_utils: 4f9daaeba2c5605ce59fbb193e86912e6cd736aae49d1be2591660bd210380c7
+ checksum/config_utils: cdce67fc3fd723ffafff5a2b4697b2e9e5953588b83b58d41be3c2623c223b6a
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/replayer
operator: In
values:
- "true"
@@ -13716,21 +13723,21 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: storage-replayer-raw-extrinsic-metadata
annotations:
checksum/config: 078f23aa6fd34da4b43aa008ff366f59792595ae0b0d5646b18d73f894e2f1d2
- checksum/config_utils: 4f9daaeba2c5605ce59fbb193e86912e6cd736aae49d1be2591660bd210380c7
+ checksum/config_utils: cdce67fc3fd723ffafff5a2b4697b2e9e5953588b83b58d41be3c2623c223b6a
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/replayer
operator: In
values:
- "true"
@@ -13839,21 +13846,21 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: storage-replayer-release
annotations:
checksum/config: 4cb2802fd19bac0128dcfe53d5168a5413a56be2ee98e94111e4890c1c41f9bc
- checksum/config_utils: 4f9daaeba2c5605ce59fbb193e86912e6cd736aae49d1be2591660bd210380c7
+ checksum/config_utils: cdce67fc3fd723ffafff5a2b4697b2e9e5953588b83b58d41be3c2623c223b6a
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/replayer
operator: In
values:
- "true"
@@ -13962,21 +13969,21 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: storage-replayer-revision
annotations:
checksum/config: 91f2ca2aea27459330677bbb0066d93897aae6b38a5b1113ffc3ee66be1abe33
- checksum/config_utils: 4f9daaeba2c5605ce59fbb193e86912e6cd736aae49d1be2591660bd210380c7
+ checksum/config_utils: cdce67fc3fd723ffafff5a2b4697b2e9e5953588b83b58d41be3c2623c223b6a
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/replayer
operator: In
values:
- "true"
@@ -14085,21 +14092,21 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: storage-replayer-skipped-content
annotations:
checksum/config: 1594fbbd1ee5b2b47ed018d19cbf6aae13dfacba417447114ec2871b754971a3
- checksum/config_utils: 4f9daaeba2c5605ce59fbb193e86912e6cd736aae49d1be2591660bd210380c7
+ checksum/config_utils: cdce67fc3fd723ffafff5a2b4697b2e9e5953588b83b58d41be3c2623c223b6a
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/replayer
operator: In
values:
- "true"
@@ -14208,21 +14215,21 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: storage-replayer-snapshot
annotations:
checksum/config: c7a465f0ecd09d697aa16cca02ecdf7124ecfa8f41f113d6f215d0bbed5c79f2
- checksum/config_utils: 4f9daaeba2c5605ce59fbb193e86912e6cd736aae49d1be2591660bd210380c7
+ checksum/config_utils: cdce67fc3fd723ffafff5a2b4697b2e9e5953588b83b58d41be3c2623c223b6a
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/replayer
operator: In
values:
- "true"
@@ -14331,21 +14338,21 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: storage-cassandra-readonly
annotations:
checksum/config: a97fb5f00ce30b0c3b0dafee15cb53ccd74caa3fc3201f1988dca14d1a99b1d8
- checksum/database-utils: 4f9daaeba2c5605ce59fbb193e86912e6cd736aae49d1be2591660bd210380c7
+ checksum/database-utils: cdce67fc3fd723ffafff5a2b4697b2e9e5953588b83b58d41be3c2623c223b6a
checksum/config-utils: 13a26f6add17e96ce01550153c77dcd48de60241a3f4db3c93d5467234be2a7f
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/storage
operator: In
values:
@@ -14564,21 +14571,21 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: storage-cassandra-readonly-internal
annotations:
checksum/config: 569624dae25368910e80226392496722d985279f2d8b0095406403459a42917c
- checksum/database-utils: 4f9daaeba2c5605ce59fbb193e86912e6cd736aae49d1be2591660bd210380c7
+ checksum/database-utils: cdce67fc3fd723ffafff5a2b4697b2e9e5953588b83b58d41be3c2623c223b6a
checksum/config-utils: 13a26f6add17e96ce01550153c77dcd48de60241a3f4db3c93d5467234be2a7f
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/storage
operator: In
values:
Edited by Antoine R. Dumont