From cad9200a7a78ccc30965141b7b778818513d97af Mon Sep 17 00:00:00 2001
From: "Antoine R. Dumont (@ardumont)" <ardumont@softwareheritage.org>
Date: Tue, 27 Feb 2024 18:45:58 +0100
Subject: [PATCH 1/2] staging/cassandra: Use ingress for cassandra storage

Refs. swh/infra/sysadm-environment#5258
---
 swh/values/staging/swh-cassandra.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/swh/values/staging/swh-cassandra.yaml b/swh/values/staging/swh-cassandra.yaml
index dd967e9ce..cfbe51839 100644
--- a/swh/values/staging/swh-cassandra.yaml
+++ b/swh/values/staging/swh-cassandra.yaml
@@ -2,11 +2,11 @@ namespace: swh-cassandra
 
 remoteCassandraStorageConfiguration:
   cls: remote
-  url: http://storage-cassandra:5002
+  url: http://storage-cassandra.internal.staging.swh.network
 
 localRpcRWStorageConfiguration:
   cls: remote
-  url: http://storage-cassandra:5002
+  url: http://storage-cassandra.internal.staging.swh.network
 
 rpcRWStorageConfiguration:
   pipelineStepsRef: storagePipelineSteps
-- 
GitLab


From 1bd89bffd340930ea3cfc9843c5df6a918261b49 Mon Sep 17 00:00:00 2001
From: "Antoine R. Dumont (@ardumont)" <ardumont@softwareheritage.org>
Date: Tue, 27 Feb 2024 18:56:45 +0100
Subject: [PATCH 2/2] production/cassandra: Use read-only cassandra rpc ingress

It had been deployed a few weeks ago to test something. It has not been decommissionned
after the test so might as well use it and remove the storage-cassandra service.

Refs. swh/infra/sysadm-environment#5258
---
 swh/values/production/swh-cassandra.yaml | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/swh/values/production/swh-cassandra.yaml b/swh/values/production/swh-cassandra.yaml
index faab474ad..81e148f1f 100644
--- a/swh/values/production/swh-cassandra.yaml
+++ b/swh/values/production/swh-cassandra.yaml
@@ -63,14 +63,14 @@ scrubberROStorageConfiguration:
 # TODO: Use a true read-only storage
 localRpcROStorageService:
   cls: remote
-  url: http://storage-cassandra:5002
+  url: http://storage-cassandra-read-only-rpc-ingress
 
 localRpcROStorageConfiguration:
   storageConfigurationRef: localRpcROStorageService
 
 remoteCassandraStorageConfiguration:
   cls: remote
-  url: http://storage-cassandra:5002
+  url: http://storage-cassandra-read-only-rpc-ingress
 
 storage_replayer:
   enabled: true
@@ -243,12 +243,6 @@ storage_replayer:
 storage:
   enabled: true
   deployments:
-    # not-exposed read-write instance
-    cassandra:
-      replicas: 2
-      requestedCpu: 500m
-      requestedMemory: 500Mi
-      storageConfigurationRef: cassandraStorageConfiguration
     # public facing instance (behind authentication)
     cassandra-readonly:
       autoScaling:
@@ -272,6 +266,7 @@ storage:
             paths:
               - path: /
             authentication: swh-cassandra/ingress-storage-cassandra-ro-auth-secrets
+    # Use cassandra readonly instance
     cassandra-readonly-internal:
       autoScaling:
         minReplicaCount: 1
-- 
GitLab