swh/cassandra: update storage configuration

swh/templates/storage/configmap.yaml

@@ -25,5 +25,11 @@ data:
         {{- end }}
       {{- end }}
       objstorage:
-      {{- toYaml .Values.storage.objstorage | nindent 8 }}
+        cls: {{ .Values.storage.objstorageClass }}
+      {{- if eq .Values.storage.objstorageClass "filtered" }}
+        {{- toYaml .Values.storage.objstorageConfig | nindent 8 }}
+      {{- else if eq .Values.storage.objstorageClass "multiplexer" }}
+        objstorages:
+        {{ .Values.storage.objstorageConfig }}
+      {{- end }}
 {{- end -}}

swh/templates/storage/deployment.yaml

@@ -37,7 +37,7 @@ spec:
           args:
           - -c
           - eval echo "\"$(</etc/swh/configuration-template/config.yml.template)\"" > /etc/swh/config.yml
-          {{- if eq .Values.storage.storageClass "postgresql" }}
+        {{- if eq .Values.storage.storageClass "postgresql" }}
           env:
           - name: POSTGRESQL_PASSWORD
             valueFrom:
@@ -46,7 +46,12 @@ spec:
                 key: {{ .Values.storage.postgresql.secretKeyName }}
                 # 'name' secret must exist & include that ^ key
                 optional: false
-          {{- end }}
+        {{- end }}
+        {{- if eq .Values.storage.objstorageClass "multiplexer" }}
+          envFrom:
+          - secretRef:
+              name: swh-cassandra-objstorage-config
+        {{- end }}
           volumeMounts:
           - name: configuration
             mountPath: /etc/swh

swh/values.yaml

@@ -209,6 +209,18 @@ storage:
   #   secretKeyName: storage-postgresql-password
   objstorage:
     cls: noop
+  ##  if objstorage configuration doesn't contains passwords or sensitive data
+  # objstorageClass: filtered
+  # objstorageConfig:
+  #   storage_conf:
+  #     cls: remote
+  #     url: http://storage1.internal.staging.swh.network:5003/
+  #   filters_conf:
+  #   - type: readonly
+  ## if objstorage configuration contains passwords or sensitive data
+  ## /!\ the configmap indentation (10) had to be defined in the secret
+  # objstorageClass: multiplexer
+  # objstorageConfig: ${OBJSTORAGECONFIG}
 
   # Deploy an ingress to access the storage
   ingress:

swh/values/production-cassandra.yaml

@@ -197,13 +197,8 @@ storage:
       - cassandra08.internal.softwareheritage.org
     keySpace: swh
     consistencyLevel: LOCAL_QUORUM
-  objstorage:
-    cls: filtered
-    storage_conf:
-      cls: remote
-      url: http://objstorage.internal.softwareheritage.org:5003/
-    filters_conf:
-    - type: readonly
+  objstorageClass: multiplexer
+  objstorageConfig: ${OBJSTORAGECONFIG}
 
 web:
   enabled: true

swh/values/staging-cassandra.yaml

@@ -185,8 +185,8 @@ storage:
       - cassandra3.internal.staging.swh.network
     keySpace: swh
     consistencyLevel: LOCAL_QUORUM
-  objstorage:
-    cls: filtered
+  objstorageClass: filtered
+  objstorageConfig:
     storage_conf:
       cls: remote
       url: http://objstorage0.internal.staging.swh.network:5003/