production/counters: Migrate client to use new rpc counter
Impacts:
- webapp
- counter journal client
- counter refresh counter cache
helm diff
[swh] Comparing changes between branches production and migrate-counters-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 migrate-counters-client branch for environment staging...
[swh] Generate config in migrate-counters-client branch for environment staging...
[swh] Generate config in migrate-counters-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 migrate-counters-client branch for environment production...
[swh] Generate config in migrate-counters-client branch for environment production...
[swh] Generate config in migrate-counters-client 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.sS20wJ80/production-swh.before 2024-02-07 15:45:02.315597413 +0100
+++ /tmp/swh-chart.swh.sS20wJ80/production-swh.after 2024-02-07 15:45:02.827596951 +0100
@@ -625,21 +625,21 @@
# Source: swh/templates/counters/journal-client-configmap.yaml
apiVersion: v1
kind: ConfigMap
metadata:
name: counters-journal-client-configuration-template
namespace: swh
data:
config.yml.template: |
counters:
cls: remote
- url: http://counters1.internal.softwareheritage.org:5011/
+ url: http://counters-rpc-ingress
journal:
brokers:
- kafka1.internal.softwareheritage.org
- kafka2.internal.softwareheritage.org
- kafka3.internal.softwareheritage.org
- kafka4.internal.softwareheritage.org
group_id: swh.counters.journal_client
message.max.bytes: 524288000
object_types:
- content
@@ -681,21 +681,21 @@
name: script-utils
namespace: swh
data:
refresh-counters-cache.sh: |
#!/bin/bash
set -ex
cache_file=$1
static_file=$2
- host=${3:-"http://counters1.internal.softwareheritage.org:5011/"}
+ host=${3:-"http://counters-rpc-ingress"}
static_file_stanza=""
if [ -n "${static_file}" ]; then
static_file_stanza=", \"static_file\": \"${static_file}\""
fi
tmp_file=$(mktemp)
trap "rm -f ${tmp_file}" EXIT
@@ -7601,21 +7601,21 @@
url: http://scheduler.internal.softwareheritage.org
vault:
cls: remote
url: http://vault-rpc-ingress
indexer_storage:
cls: remote
url: http://indexer-storage-read-only-rpc-ingress
counters_backend: swh-counters
counters:
cls: remote
- url: http://counters1.internal.softwareheritage.org:5011/
+ url: http://counters-rpc-ingress
deposit:
private_api_url: https://deposit.softwareheritage.org/1/private/
private_api_user: ${DEPOSIT_USERNAME}
private_api_password: ${DEPOSIT_PASSWORD}
add_forge_now:
email_address: add-forge-now@archive.softwareheritage.org
gitlab_pipeline:
token: ${GITLAB_AFN_TOKEN}
trigger_url: https://gitlab.softwareheritage.org/api/v4/projects/474/trigger/pipeline
@@ -7747,21 +7747,21 @@
url: http://scheduler.internal.softwareheritage.org
vault:
cls: remote
url: http://vault-rpc-ingress
indexer_storage:
cls: remote
url: http://indexer-storage-read-only-rpc-ingress
counters_backend: swh-counters
counters:
cls: remote
- url: http://counters1.internal.softwareheritage.org:5011/
+ url: http://counters-rpc-ingress
deposit:
private_api_url: https://deposit.softwareheritage.org/1/private/
private_api_user: ${DEPOSIT_USERNAME}
private_api_password: ${DEPOSIT_PASSWORD}
add_forge_now:
email_address: add-forge-now@archive.softwareheritage.org
gitlab_pipeline:
token: ${GITLAB_AFN_TOKEN}
trigger_url: https://gitlab.softwareheritage.org/api/v4/projects/474/trigger/pipeline
@@ -19092,21 +19092,21 @@
app: counters-journal-client
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: counters-journal-client
annotations:
- checksum/config: 8fa2c69f41ac8b5dd66860c2733e1c82c9b1601fa3d396169dea6fa9907191f9
+ checksum/config: 73d8177e35b14aeeeb1b06a9b49a0690b368c4c90b6536761106a897402ccf5a
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/journal_client
operator: In
values:
- "true"
@@ -19188,21 +19188,21 @@
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: counters-rpc
annotations:
checksum/configmap: 598be262c2cfe9c36bf0fe7e2b9195bd93e318b1af8b8be246dead7ad2d2eef8
- checksum/script-utils: 790f42f6e7c10aa1b8c44024b4f7b5525af8871e533b5c378f9cdbf34e4d015c
+ checksum/script-utils: b4c33443ac3af6b6b894179e97cee91f8b2093d4c43ad8af912ebd93ed3f4650
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/rpc
operator: In
values:
- "true"
@@ -33470,21 +33470,21 @@
app: web-app1
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: web-app1
annotations:
- checksum/config: 4c5216be3ccc6e0421dc402a73c84597f43ab67500bfd12c88d70899b771aca4
+ checksum/config: 2f316ced7e7fcf4c372d8f241b4b0b29ef62b7f01495f7abb2fe52ba1f969cd6
checksum/config-utils: d75ca13b805bce6a8ab59c8e24c938f2283108f6a79134f6e71db86308651dc6
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/web
operator: In
values:
@@ -33731,21 +33731,21 @@
app: web-archive
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: web-archive
annotations:
- checksum/config: f3a3e499e51389daab0eb566c2e1c45fcee36c0e6a8473807df025fc6a36dfad
+ checksum/config: 2afcacad10a9b8ff0f7be72b13594949713039a61b2749aea8299f829d0958d4
checksum/config-utils: d75ca13b805bce6a8ab59c8e24c938f2283108f6a79134f6e71db86308651dc6
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/web
operator: In
values:
------------- diff for environment production namespace swh-cassandra -------------
--- /tmp/swh-chart.swh.sS20wJ80/production-swh-cassandra.before 2024-02-07 15:45:02.487597257 +0100
+++ /tmp/swh-chart.swh.sS20wJ80/production-swh-cassandra.after 2024-02-07 15:45:03.003596793 +0100
@@ -1524,21 +1524,21 @@
url: http://scheduler.internal.softwareheritage.org
vault:
cls: remote
url: http://vault-rpc-ingress
indexer_storage:
cls: remote
url: http://indexer-storage-read-only-rpc-ingress
counters_backend: swh-counters
counters:
cls: remote
- url: http://counters1.internal.softwareheritage.org:5011/
+ url: http://counters-rpc-ingress
deposit:
private_api_url: https://deposit.softwareheritage.org/1/private/
private_api_user: ${DEPOSIT_USERNAME}
private_api_password: ${DEPOSIT_PASSWORD}
add_forge_now:
email_address: add-forge-now@archive.softwareheritage.org
gitlab_pipeline:
token: ${GITLAB_AFN_TOKEN}
trigger_url: https://gitlab.softwareheritage.org/api/v4/projects/474/trigger/pipeline
@@ -14632,21 +14632,21 @@
app: web-cassandra
strategy:
type: RollingUpdate
rollingUpdate:
maxSurge: 1
template:
metadata:
labels:
app: web-cassandra
annotations:
- checksum/config: d67d526f79c241558c75a6808ec55ca1136f7bba852e1fa26ffd20f544fee6d9
+ checksum/config: 9aee4eab92aaacf005ebfb1ca0599f93c5f560252e90082052f7d77340f7b33c
checksum/config-utils: 13a26f6add17e96ce01550153c77dcd48de60241a3f4db3c93d5467234be2a7f
spec:
affinity:
nodeAffinity:
requiredDuringSchedulingIgnoredDuringExecution:
nodeSelectorTerms:
- matchExpressions:
- key: swh/web
operator: In
values: