Revert "Fix volume/storage templates for evm-rollup"

This reverts commit d1d014b.

Author: aajimal

charts/evm-rollup/templates/storageclasses.yaml

@@ -5,10 +5,20 @@
 apiVersion: storage.k8s.io/v1
 kind: StorageClass
 metadata:
-  name: {{ include "rollup.name" $ }}-{{ $value.persistentVolumeName }}-geth-local
-  namespace: {{ include "rollup.namespace" $ }}
+  name: {{ $.Values.config.rollup.name }}-{{ $value.persistentVolumeName }}-geth-local
 provisioner: kubernetes.io/no-provisioner
 volumeBindingMode: WaitForFirstConsumer
 reclaimPolicy: Retain
+    {{- if $.Values.config.blockscout.enabled }}
+---
+apiVersion: storage.k8s.io/v1
+kind: StorageClass
+metadata:
+  name: {{ $.Values.config.rollup.name }}-{{ $value.persistentVolumeName }}-blockscout-local
+provisioner: kubernetes.io/no-provisioner
+volumeBindingMode: WaitForFirstConsumer
+reclaimPolicy: Retain
+---
+    {{- end }}
   {{- end }}
-{{- end}}
+{{- end }}

charts/evm-rollup/templates/volumes.yaml

@@ -1,21 +1,45 @@
 {{/* We need to manually create a PersistentVolume when local. */}}
 {{/* In prod, a PV will be created by the StorageClass' provisioner using dynamic provisioning feature.  */}}
-{{- if .Values.storage.enabled }}
+{{- if and .Values.storage.enabled }}
   {{- range $key, $value := .Values.storage.entities }}
     {{- if $.Values.storage.local }}
 apiVersion: v1
 kind: PersistentVolume
 metadata:
-  name: {{ include "rollup.name" $ }}-{{ $value.persistentVolumeName }}-geth-pv
-  namespace: {{ include "rollup.namespace" $ }}
+  name: {{ $.Values.config.rollup.name }}-{{ $value.persistentVolumeName }}-geth-pv
+spec:
+  capacity:
+    storage: {{ $value.size }}
+  volumeMode: Filesystem
+  accessModes:
+    - ReadWriteOnce
+  persistentVolumeReclaimPolicy: Retain
+  storageClassName: {{ $.Values.config.rollup.name }}-{{ $value.persistentVolumeName }}-geth-local
+  local:
+    path: {{ $value.path }}
+  nodeAffinity:
+    required:
+      nodeSelectorTerms:
+        - matchExpressions:
+            - key: kubernetes.io/hostname
+              operator: In
+              values:
+                - astria-dev-cluster-control-plane
+                - astria-dev-cluster-worker
+---
+        {{- if $.Values.config.blockscout.enabled }}
+apiVersion: v1
+kind: PersistentVolume
+metadata:
+  name: {{ $.Values.config.rollup.name }}-{{ $value.persistentVolumeName }}-blockscout-pv
 spec:
   capacity:
     storage: {{ $value.size }}
   volumeMode: Filesystem
   accessModes:
     - ReadWriteOnce
   persistentVolumeReclaimPolicy: Retain
-  storageClassName: {{ include "rollup.name" $ }}-{{ $value.persistentVolumeName }}-geth-local
+  storageClassName: {{ $.Values.config.rollup.name }}-{{ $value.persistentVolumeName }}-blockscout-local
   local:
     path: {{ $value.path }}
   nodeAffinity:
@@ -28,25 +52,53 @@ spec:
                 - astria-dev-cluster-control-plane
                 - astria-dev-cluster-worker
 ---
+      {{- end }}
     {{- end }}
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: {{ include "rollup.name" $ }}-{{ $value.persistentVolumeName }}-pvc-geth
+  name: {{ $.Values.config.rollup.name }}-{{ $value.persistentVolumeName }}-pvc-geth
   namespace: {{ include "rollup.namespace" $ }}
   labels:
-    "app.kubernetes.io/name": "{{ include "rollup.name" $ }}-{{ $.Chart.Name }}"
+    "app.kubernetes.io/name": "{{ $.Values.config.rollup.name }}-{{ $.Chart.Name }}"
     "app.kubernetes.io/managed-by": {{ $.Release.Service | quote }}
     "helm.sh/chart": {{ $.Chart.Name }}-{{ $.Chart.Version | replace "+" "_" }}
 spec:
   {{- if $.Values.storage.local }}
-  storageClassName: {{ include "rollup.name" $ }}-{{ $value.persistentVolumeName }}-geth-local
+  storageClassName: {{ $.Values.config.rollup.name }}-{{ $value.persistentVolumeName }}-geth-local
+  {{- end }}
+  {{- if $value.storageClassName }}
+  storageClassName: {{ $value.storageClassName }}
   {{- end }}
   accessModes:
     - ReadWriteOnce
   resources:
     requests:
       storage: {{ $value.size }}
 ---
+  {{- if $.Values.config.blockscout.enabled }}
+apiVersion: v1
+kind: PersistentVolumeClaim
+metadata:
+  name: {{ $.Values.config.rollup.name }}-{{ $value.persistentVolumeName }}-pvc-blockscout
+  namespace: {{ include "rollup.namespace" $ }}
+  labels:
+    "app.kubernetes.io/name": {{ $.Values.config.rollup.name }}-{{ $.Chart.Name }}
+    "app.kubernetes.io/managed-by": {{ $.Release.Service | quote }}
+    "helm.sh/chart": {{ $.Chart.Name }}-{{ $.Chart.Version | replace "+" "_" }}
+spec:
+    {{- if $.Values.storage.local }}
+  storageClassName: {{ $.Values.config.rollup.name }}-{{ $value.persistentVolumeName }}-blockscout-local
+    {{- end }}
+    {{- if $value.storageClassName }}
+  storageClassName: {{ $value.storageClassName }}
+    {{- end }}
+  accessModes:
+    - ReadWriteOnce
+  resources:
+    requests:
+      storage: {{ $value.size }}
+---
+    {{- end }}
   {{- end }}
 {{- end }}