swh/search: Fix search journal client configuration when non kafka configuration is specified
the deployment and kafka configuration was at the same level so when for example requestedCpu is specified, it's included in the configuration which is not anymore valid for the journal client
Related to swh/infra/sysadm-environment#4780 (closed)
helm diff
[swh] Comparing changes between branches production and fix-search-journal-client (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 fix-search-journal-client branch for environment staging...
[swh] Generate config in fix-search-journal-client branch for environment staging...
[swh] Generate config in fix-search-journal-client 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 fix-search-journal-client branch for environment production...
[swh] Generate config in fix-search-journal-client branch for environment production...
[swh] Generate config in fix-search-journal-client branch for environment production...
------------- diff for environment staging namespace swh -------------
--- /tmp/swh-chart.swh.CMGLHi9K/staging-swh.before 2023-11-07 18:13:39.915965031 +0100
+++ /tmp/swh-chart.swh.CMGLHi9K/staging-swh.after 2023-11-07 18:13:40.883969707 +0100
@@ -3125,22 +3125,20 @@
url: http://storage1.internal.staging.swh.network:5002
journal:
brokers:
- journal1.internal.staging.swh.network
- journal2.internal.staging.swh.network
group_id: swh.search.journal_client.indexed-v0.11
object_types:
- origin_intrinsic_metadata
- origin_extrinsic_metadata
prefix: swh.journal.indexed
- requestedCpu: 10m
- requestedMemory: 50Mi
---
# Source: swh/templates/search/journal-client-configmap.yaml
apiVersion: v1
kind: ConfigMap
metadata:
name: search-journal-client-objects-configuration-template
namespace: swh
data:
config.yml.template: |
search:
@@ -3151,22 +3149,20 @@
url: http://storage1.internal.staging.swh.network:5002
journal:
brokers:
- journal1.internal.staging.swh.network
- journal2.internal.staging.swh.network
group_id: swh.search.journal_client-v0.11
object_types:
- origin
- origin_visit_status
prefix: swh.journal.objects
- requestedCpu: 10m
- requestedMemory: 50Mi
---
# Source: swh/templates/search/rpc-configmap.yaml
apiVersion: v1
kind: ConfigMap
metadata:
namespace: swh
name: search-rpc-configuration-template
data:
config.yml.template: |
search:
@@ -10409,21 +10405,21 @@
app: search-journal-client-indexed
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: search-journal-client-indexed
annotations:
- checksum/config: 57e1233536eb50aecbb7352bbac845092fd4f7acad31380d31a8086e5aa968e6
+ checksum/config: a92ab2218121926d39962c8de7e466d809a8d78db5f3509a740ecadf71ac4df1
spec:
priorityClassName: swh-normal-workload
initContainers:
- name: prepare-configuration
image: debian:bullseye
imagePullPolicy: IfNotPresent
command:
- /bin/bash
args:
@@ -10503,21 +10499,21 @@
app: search-journal-client-objects
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: search-journal-client-objects
annotations:
- checksum/config: 69c39885eae3d61b9f2700879ec1b1333d9f2a4be92ca8e22402a384bbd2cef5
+ checksum/config: 747b935796f4046da313e2bcae7751132588bea355cd868be31c52735b344309
spec:
priorityClassName: swh-normal-workload
initContainers:
- name: prepare-configuration
image: debian:bullseye
imagePullPolicy: IfNotPresent
command:
- /bin/bash
args:
------------- 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 -------------
No differences
------------- diff for environment production namespace swh-cassandra -------------
No differences