staging: Add extra volume configuration for pathslicing objstorage

Refs. swh/infra/sysadm-environment#5164

Makefile

@@ -42,7 +42,7 @@ helm-diff: swh-helm-diff ccf-helm-diff cc-helm-diff ss-helm-diff
 
 swh-minikube:
 	kubectl --context minikube create namespace swh ; \
-	kubectl --context minikube --namespace swh apply -f '$(SWH_CHART)/fake-secrets/*.yaml' ; \
+	kubectl --context minikube --namespace swh apply -f '$(SWH_CHART)/fake-secrets/*.yaml'; \
 	helm --kube-context minikube upgrade --install $(SWH_CHART) $(SWH_CHART)/ --values values-swh-application-versions.yaml \
       --values $(SWH_CHART)/values.yaml \
       --values $(SWH_CHART)/values/minikube.yaml \

swh/templates/objstorage/_helper_deployment.yaml

@@ -128,6 +128,11 @@ spec:
           volumeMounts:
           - name: configuration
             mountPath: /etc/swh
+          {{- range $volume_name, $volume_config := .configuration.volumes }}
+          - name: {{ $volume_name }}
+            mountPath: {{ $volume_config.mountPath }}
+            readOnly: {{ $volume_config.readOnly | default "false" }}
+          {{ end }}
       volumes:
       - name: configuration
         emptyDir: {}
@@ -137,4 +142,8 @@ spec:
           items:
           - key: "config.yml.template"
             path: "config.yml.template"
-{{- end -}}
+      {{ range $volume_name, $volume_config := .configuration.volumes }}
+      - name: {{ $volume_name }}
+        {{ toYaml $volume_config.volumeDefinition | nindent 8 }}
+      {{ end }}
+{{ end }}

swh/values/minikube.yaml

@@ -839,3 +839,85 @@ scrubber:
         journalClientOverrides:
           batch_size: 200
         object: release
+
+fakeObjstorageConfiguration:
+  cls: pathslicing
+  root: "/srv/swh/objects"
+  slicing: 0:1/1:5
+  client_max_size: 1073741824
+
+objstorage:
+  enabled: false
+  port: 5003
+  priorityClassName: frontend-rpc
+  deployments:
+    # Each key will be an objstorage instance to be deployed
+    # The mandatory objstorageConfigurationRef key should target a dict
+    # with the specific objstorage configuration
+    read-write:
+      enabled: true
+      logLevel: INFO
+      requestedCpu: 50m
+      requestedMemory: 100Mi
+      gunicorn:
+        threads: 5
+        workers: 2
+        timeout: 60
+      replicas: 1
+      volumes:
+        pathslicing-rw:
+          mountPath: /srv/swh/objects
+          volumeDefinition:
+            hostPath:
+              path: /srv/swh/objects
+              type: DirectoryOrCreate  # Use Directory for production/staging
+
+      # mandatory
+      # check readWriteStorageConfiguration example to configure your storage
+      objstorageConfigurationRef: fakeObjstorageConfiguration
+        # Deploy an ingress to access the objstorage
+      hosts:
+        - objstorage-rw.s.s.n
+      ingress:
+        enabled: false
+        # mandatory if ingress is enabled
+        # the hostname on which the objstorage must be reachable
+        # Optional: the ingress classname to use
+        className: nginx
+        endpoints:
+          default:
+            paths:
+              - path: /
+    read-only:
+      enabled: true
+      logLevel: INFO
+      requestedCpu: 50m
+      requestedMemory: 100Mi
+      gunicorn:
+        threads: 5
+        workers: 2
+        timeout: 60
+      replicas: 1
+      volumes:
+        pathslicing-ro:
+          mountPath: /srv/swh/objects
+          readOnly: true
+          volumeDefinition:
+            hostPath:
+              path: /srv/swh/objects
+              type: DirectoryOrCreate
+
+      objstorageConfigurationRef: fakeObjstorageConfiguration
+        # Deploy an ingress to access the objstorage
+      hosts:
+        - objstorage-ro.s.s.n
+      ingress:
+        enabled: false
+        # mandatory if ingress is enabled
+        # the hostname on which the objstorage must be reachable
+        # Optional: the ingress classname to use
+        className: nginx
+        endpoints:
+          default:
+            paths:
+              - path: /

swh/values/staging/default.yaml

@@ -300,9 +300,12 @@ externalServices:
     storage-postgresql:
       internalName: storage-postgresql-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-read-write:
+      internalName: objstorage-read-write-rpc-ingress
+      target: archive-staging-rke2-ingress-nginx-controller.ingress-nginx.svc.cluster.local
+    objstorage-read-only:
+      internalName: objstorage-read-only-rpc-ingress
+      target: archive-staging-rke2-ingress-nginx-controller.ingress-nginx.svc.cluster.local
 
 vault:
   hosts:
@@ -329,3 +332,18 @@ addForgeNowConfiguration:
     GITLAB_AFN_TOKEN:
       secretKeyRef: common-secrets
       secretKeyName: gitlab_afn_token
+
+objstorage:
+  affinity:
+    nodeAffinity:
+      requiredDuringSchedulingIgnoredDuringExecution:
+        nodeSelectorTerms:
+        - matchExpressions:
+          - key: swh/objstorage
+            operator: In
+            values:
+            - "true"
+          - key: kubernetes.io/hostname
+            operator: In
+            values:
+            - "storage1"

swh/values/staging/swh-cassandra.yaml

@@ -851,12 +851,59 @@ objstorage:
         minReplicaCount: 2
         maxReplicaCount: 10
         cpuPercentageUsage: 100
+      volumes:
+        staging-pathslicing-rw:
+          mountPath: /srv/softwareheritage/objects
+          volumeDefinition:
+            hostPath:
+              path: /srv/softwareheritage/objects
+              type: Directory
+
+      # mandatory
+      # check readWriteStorageConfiguration example to configure your storage
+      objstorageConfigurationRef: readWriteObjstorageConfiguration
+        # Deploy an ingress to access the objstorage
+      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
+        endpoints:
+          default:
+            paths:
+              - path: /
+    read-only:
+      enabled: true
+      logLevel: INFO
+      requestedCpu: 50m
+      requestedMemory: 100Mi
+      gunicorn:
+        threads: 5
+        workers: 2
+        timeout: 60
+      autoScaling:
+        minReplicaCount: 2
+        maxReplicaCount: 10
+        cpuPercentageUsage: 100
+      volumes:
+        staging-pathslicing-ro:
+          mountPath: /srv/softwareheritage/objects
+          readOnly: true
+          volumeDefinition:
+            hostPath:
+              path: /srv/softwareheritage/objects
+              type: Directory
+
       # mandatory
       # check readWriteStorageConfiguration example to configure your storage
       objstorageConfigurationRef: readWriteObjstorageConfiguration
         # Deploy an ingress to access the objstorage
       hosts:
-        - objstorage.staging.swh.network
+        - objstorage-read-only-rpc-ingress
       ingress:
         enabled: true
         # mandatory if ingress is enabled