From 816f13ee12085728e93c1bcc139a04c303bf69fa Mon Sep 17 00:00:00 2001
From: Jordan Oroshiba <jordan@astria.org>
Date: Tue, 19 Mar 2024 14:39:22 -0700
Subject: [PATCH] chore: cleanup unused values, fix volumes of rollup (#189)

---
 charts/rollup/Chart.yaml             |  2 +-
 charts/rollup/templates/volumes.yaml |  4 ++--
 charts/rollup/values.yaml            | 12 ------------
 3 files changed, 3 insertions(+), 15 deletions(-)

diff --git a/charts/rollup/Chart.yaml b/charts/rollup/Chart.yaml
index 7c6fa72..8359176 100644
--- a/charts/rollup/Chart.yaml
+++ b/charts/rollup/Chart.yaml
@@ -16,7 +16,7 @@ type: application
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
 
-version: 0.10.0
+version: 0.10.1
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
diff --git a/charts/rollup/templates/volumes.yaml b/charts/rollup/templates/volumes.yaml
index 36f09a3..bf40bb3 100644
--- a/charts/rollup/templates/volumes.yaml
+++ b/charts/rollup/templates/volumes.yaml
@@ -32,7 +32,7 @@ apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
   name: {{ $.Values.config.rollup.name }}-{{ $value.persistentVolumeName }}-pvc-geth
-  namespace: {{ include "rollup.namespace" . }}
+  namespace: {{ include "rollup.namespace" $ }}
   labels:
     "app.kubernetes.io/name": "{{ $.Values.config.rollup.name }}-{{ $.Chart.Name }}"
     "app.kubernetes.io/managed-by": {{ $.Release.Service | quote }}
@@ -54,7 +54,7 @@ apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
   name: {{ $.Values.config.rollup.name }}-{{ $value.persistentVolumeName }}-pvc-blockscout
-  namespace: {{ include "rollup.namespace" . }}
+  namespace: {{ include "rollup.namespace" $ }}
   labels:
     "app.kubernetes.io/name": {{ $.Values.config.rollup.name }}-{{ $.Chart.Name }}
     "app.kubernetes.io/managed-by": {{ $.Release.Service | quote }}
diff --git a/charts/rollup/values.yaml b/charts/rollup/values.yaml
index 7a40c1e..494612b 100644
--- a/charts/rollup/values.yaml
+++ b/charts/rollup/values.yaml
@@ -64,16 +64,6 @@ config:
           value:
             # The balance must be a string due to size
             balance: "1000000000000000000000000000"
-    optimism:
-      # set to true to enable op-stack integration, and setup rest of config
-      enabled: false
-      # Websocket URL of Ethereum L1 node.
-      ethereumL1Websocket: "ws://127.0.0.1:8545"
-      # Contract address of the OptimismPortal contract on L1.
-      portalContractAddress: ""
-      # The block height of the Ethereum L1 chain that the
-      # OptimismPortal contract was deployed at.
-      initialEthereumL1BlockHeight: 1
     metrics:
       # set to enable prometheus metrics
       enabled: false
@@ -131,8 +121,6 @@ config:
     initialBlockHeight: 2
     # Fastest block time possible in MS
     blockTimeMs: 2000
-    # Websocket connection used for
-    websocket: "ws://node0-sequencer-rpc-service.astria-dev-cluster.svc.cluster.local:26657/websocket"
     # URL path for the sequencer
     rpc: "http://node0-sequencer-rpc-service.astria-dev-cluster.svc.cluster.local:26657"
     # gRPC path for the sequencer