prod: Adapt objstorage multiplexer to use the new saam objstorage
In another commit, this also fixes a discrepancy in the objstorage used by the indexers.
make swh-helm-diff
[swh] Comparing changes between branches production and migrate-objstorage-clients (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 migrate-objstorage-clients branch for environment staging...
[swh] Generate config in migrate-objstorage-clients branch for environment staging...
[swh] Generate config in migrate-objstorage-clients 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 migrate-objstorage-clients branch for environment production...
[swh] Generate config in migrate-objstorage-clients branch for environment production...
[swh] Generate config in migrate-objstorage-clients branch for environment production...
------------- diff for environment staging namespace swh -------------
No differences
------------- diff for environment staging namespace swh-cassandra -------------
No differences
------------- diff for environment staging namespace swh-cassandra-next-version -------------
No differences
------------- diff for environment production namespace swh -------------
--- /tmp/swh-chart.swh.ZPmIFM0h/production-swh.before 2024-01-24 14:18:31.013905907 +0100
+++ /tmp/swh-chart.swh.ZPmIFM0h/production-swh.after 2024-01-24 14:18:31.489905503 +0100
@@ -667,26 +667,20 @@
- type: readonly
storage_conf:
cls: http
compression: gzip
timeout: 120
url: https://softwareheritage.s3.amazonaws.com/content/
- cls: filtered
filters_conf:
- type: readonly
storage_conf:
- cls: remote
- url: http://objstorage-read-only-rpc-ingress
- - cls: filtered
- filters_conf:
- - type: readonly
- storage_conf:
accounts:
"0":
account_name: ${ACCOUNT_NAME_0}
api_secret_key: ${API_SECRET_KEY_0}
container_name: contents
"1":
account_name: ${ACCOUNT_NAME_1}
api_secret_key: ${API_SECRET_KEY_1}
container_name: contents
"2":
@@ -739,20 +733,26 @@
container_name: contents
e:
account_name: ${ACCOUNT_NAME_14}
api_secret_key: ${API_SECRET_KEY_14}
container_name: contents
f:
account_name: ${ACCOUNT_NAME_15}
api_secret_key: ${API_SECRET_KEY_15}
container_name: contents
cls: azure-prefixed
+ - cls: filtered
+ filters_conf:
+ - type: readonly
+ storage_conf:
+ cls: remote
+ url: http://objstorage-read-only-rpc-ingress
journal_client:
brokers:
- kafka1.internal.softwareheritage.org:9094
- kafka2.internal.softwareheritage.org:9094
- kafka3.internal.softwareheritage.org:9094
- kafka4.internal.softwareheritage.org:9094
batch_size: 200
cls: kafka
group_id: swh-archive-prod-swh.indexer.journal_client.extrinsic_metadata
prefix: swh.journal.objects
@@ -5588,37 +5588,37 @@
filters_conf:
- type: readonly
storage_conf:
cls: remote
url: http://banco.internal.softwareheritage.org:5003/
- cls: filtered
filters_conf:
- type: readonly
storage_conf:
cls: remote
- url: http://saam.internal.softwareheritage.org:5003/
+ url: http://objstorage-ro-saam-zfs-rpc-ingress
---
# Source: swh/templates/objstorage/configmap.yaml
apiVersion: v1
kind: ConfigMap
metadata:
namespace: swh
name: objstorage-ro-saam-zfs-configuration-template
data:
config.yml.template: |
objstorage:
client_max_size: 1073741824
- cls: multiplexer
+ cls: filtered
filters_conf:
- type: readonly
- objstorages:
- - cls: pathslicing
+ storage_conf:
+ cls: pathslicing
compression: none
root: /srv/softwareheritage/objects
slicing: 0:2/0:5
---
# Source: swh/templates/scheduler/extra-services-configmap.yaml
apiVersion: v1
kind: ConfigMap
metadata:
name: extra-services-configuration-template
namespace: swh
@@ -18499,21 +18499,21 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: indexer-extrinsic
annotations:
# Force a rollout upgrade if the configuration changes
- checksum/config: 3b8cf46a171199f2a8ab05e1cd8a1b7a6d600b73289222c7731ec823e2a53b53
+ checksum/config: e8cf7d6defe3e7763a222bd2a99022bb780fff2a85606b59617b2e86b57ac3cc
checksum/config-utils: 0cce256531366ac8ea2a0bde2a8f10937284a0f599f45fabe6babbbc096e179d
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/indexer
operator: In
@@ -26985,21 +26985,21 @@
app: objstorage-read-only
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: objstorage-read-only
annotations:
- checksum/config: e73adb6070b0d5a7ba8f381ccb8ac2d726776139d89cf69a2add703ff4e22f75
+ checksum/config: fb0c8f4257f3ed65cc0038d66fcd895a210e8651bf9ef1bd4c7b3b79072995ba
checksum/config-utils: 0cce256531366ac8ea2a0bde2a8f10937284a0f599f45fabe6babbbc096e179d
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/objstorage
operator: In
values:
@@ -27111,21 +27111,21 @@
app: objstorage-ro-saam-zfs
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: objstorage-ro-saam-zfs
annotations:
- checksum/config: 5637789eb305a56a89ed7eabf240d9090f10c21003846a7a56ec6cd443cc6b7c
+ checksum/config: 890a680f4240eea2811579a5115ce5db636e7fae0327b8749dec64280e1ef091
checksum/config-utils: 0cce256531366ac8ea2a0bde2a8f10937284a0f599f45fabe6babbbc096e179d
spec:
nodeSelector:
kubernetes.io/hostname: saam
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/objstorage-pathslicing
------------- diff for environment production namespace swh-cassandra -------------
No differences