From d6eab3c788414d313fa4f6d56500f0bfff777b92 Mon Sep 17 00:00:00 2001
From: "Antoine R. Dumont (@ardumont)" <ardumont@softwareheritage.org>
Date: Tue, 5 Mar 2024 15:05:56 +0100
Subject: [PATCH] staging/objstorage: Decommission storage1 r/w objstorage
 instance

Refs. swh/infra/sysadm-environment#5260
---
 swh/values/staging/default.yaml       |  3 ---
 swh/values/staging/swh-cassandra.yaml | 39 ---------------------------
 2 files changed, 42 deletions(-)

diff --git a/swh/values/staging/default.yaml b/swh/values/staging/default.yaml
index 9a855f244..cc704797e 100644
--- a/swh/values/staging/default.yaml
+++ b/swh/values/staging/default.yaml
@@ -376,9 +376,6 @@ externalServices:
     storage-postgresql-read-only:
       internalName: storage-postgresql-read-only-rpc-ingress
       target: archive-staging-rke2-ingress-nginx-controller.ingress-nginx.svc.cluster.local
-    objstorage-read-write:
-      internalName: objstorage-read-write-rpc-ingress
-      target: archive-staging-rke2-ingress-nginx-controller.ingress-nginx.svc.cluster.local
     objstorage-multiplexer-read-write-rpc-ingress:
       internalName: objstorage-multiplexer-read-write-rpc-ingress
       target: archive-staging-rke2-ingress-nginx-controller.ingress-nginx.svc.cluster.local
diff --git a/swh/values/staging/swh-cassandra.yaml b/swh/values/staging/swh-cassandra.yaml
index 01283d570..0b504c8de 100644
--- a/swh/values/staging/swh-cassandra.yaml
+++ b/swh/values/staging/swh-cassandra.yaml
@@ -946,45 +946,6 @@ objstorage:
           default:
             paths:
               - path: /
-    storage1-read-write:
-      enabled: true
-      nodeSelector:
-        kubernetes.io/hostname: storage1
-      replicas: 2
-      gunicorn:
-        workers: 4
-        threads: 2
-        timeout: 60
-      extraVolumes:
-        staging-pathslicing-rw:
-          mountPath: /srv/softwareheritage/objects
-          volumeDefinition:
-            hostPath:
-              path: /srv/softwareheritage/objects
-              type: Directory
-
-      # mandatory
-      # check readWriteStorageConfiguration example to configure your storage
-      objstorageConfigurationRef: pathslicingObjstorageConfiguration
-      extraRpcConfiguration:
-        client_max_size: 1073741824
-      hosts:
-        - objstorage-read-write-rpc-ingress
-      ingress:
-        enabled: true
-        # mandatory if ingress is enabled
-        # the hostname on which the objstorage must be reachable
-        # Optional: the ingress classname to use
-        className: nginx
-        whitelistSourceRangeRef: stagingNetworkRanges
-        extraAnnotations:
-          nginx.ingress.kubernetes.io/proxy-body-size: 4G
-          nginx.ingress.kubernetes.io/proxy-buffering: "on"
-          nginx.ingress.kubernetes.io/client-body-buffer-size: 128K
-        endpoints:
-          default:
-            paths:
-              - path: /
     # storage1 read-only objstorage
     storage1-read-only:
       enabled: true
-- 
GitLab