From 43fba37adfce5b5d73813bbe8ae1a3b161e60d8c Mon Sep 17 00:00:00 2001
From: Guillaume Samson <guillaume.samson@softwareheritage.org>
Date: Tue, 18 Mar 2025 15:25:55 +0100
Subject: [PATCH 1/2] swh/alter: Update configmap for kafka notifications
Related to swh/infra/sysadm-environment#5606
---
swh/templates/alter/_helper-configmap.yaml | 5 +++++
swh/values/default.yaml | 7 +++++++
swh/values/staging/swh-cassandra.yaml | 1 +
3 files changed, 13 insertions(+)
diff --git a/swh/templates/alter/_helper-configmap.yaml b/swh/templates/alter/_helper-configmap.yaml
index 807e3526b..0bc33a2d8 100644
--- a/swh/templates/alter/_helper-configmap.yaml
+++ b/swh/templates/alter/_helper-configmap.yaml
@@ -12,6 +12,11 @@
"service" "restoration_storage"
"configurationRef" .Values.alter.restorationStorageConfigurationRef
"Values" .Values) | fromYaml | mustMerge $alterConfiguration -}}
+{{- if .Values.alter.journalWriterMirrorConfigurationRef }}
+{{- $alterConfiguration = include "swh.journalWriterConfiguration" (dict
+ "configurationRef" .Values.alter.journalWriterMirrorConfigurationRef
+ "Values" .Values) | fromYaml | mustMerge $alterConfiguration -}}
+{{- end }}
{{- $removalSearches := (dict) -}}
{{- range $searchName, $searchConfig := .Values.alter.removalSearches -}}
diff --git a/swh/values/default.yaml b/swh/values/default.yaml
index 2cd221714..b6e49fffa 100644
--- a/swh/values/default.yaml
+++ b/swh/values/default.yaml
@@ -483,3 +483,10 @@ graph:
operator: In
values:
- "true"
+
+journalWriterMirrorConfiguration:
+ brokersConfigurationRef: kafkaBrokers
+ clientId: swh.alter.removals.${HOSTNAME}
+ prefix: swh.journal.mirror-notifications
+ producerConfig:
+ message.max.bytes: 1000000000
diff --git a/swh/values/staging/swh-cassandra.yaml b/swh/values/staging/swh-cassandra.yaml
index f8251db24..7d325a3f5 100644
--- a/swh/values/staging/swh-cassandra.yaml
+++ b/swh/values/staging/swh-cassandra.yaml
@@ -2371,6 +2371,7 @@ alter:
inventoryStorageConfigurationRef: cassandraROStorageNoMaskingConfiguration
graphConfigurationRef: alterGraphConfiguration
restorationStorageConfigurationRef: rpcRWStorageConfiguration
+ journalWriterMirrorConfigurationRef: journalWriterMirrorConfiguration
removalSearches:
search:
searchConfigurationRef: remoteSearchConfiguration
--
GitLab
From dc5d1f093ea065138fa8f02becec399e193fd25a Mon Sep 17 00:00:00 2001
From: Guillaume Samson <guillaume.samson@softwareheritage.org>
Date: Wed, 19 Mar 2025 17:09:00 +0100
Subject: [PATCH 2/2] swh/staging: Update Kafka brokers lists
Related to swh/infra/sysadm-environment#5606
---
swh/values/staging/default.yaml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/swh/values/staging/default.yaml b/swh/values/staging/default.yaml
index 9351f565e..e8467ed65 100644
--- a/swh/values/staging/default.yaml
+++ b/swh/values/staging/default.yaml
@@ -414,9 +414,11 @@ postgresqlScrubberConfiguration:
kafkaBrokers:
- journal2.internal.staging.swh.network:9092
+ - kafka3.internal.staging.swh.network:9092
internalSecuredKafkaBrokers:
- journal2.internal.staging.swh.network:9094
+ - kafka3.internal.staging.swh.network:9094
indexerJournalWriterConfiguration:
brokersConfigurationRef: kafkaBrokers
--
GitLab