From 69c1336681588916b1d4ee15ee939b34e42e5b3d Mon Sep 17 00:00:00 2001
From: "github-merge-queue[bot]"
 <github-merge-queue[bot]@users.noreply.github.com>
Date: Thu, 22 Aug 2024 19:11:40 +0000
Subject: [PATCH] Changes from
 astriaorg/astria@61ee0085e9cff6a44f263c256a9550f104ed0c72

---
 charts/evm-rollup/templates/_helpers.tpl | 3 ++-
 charts/evm-rollup/values.yaml            | 1 +
 charts/evm-stack/Chart.lock              | 6 +++---
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/charts/evm-rollup/templates/_helpers.tpl b/charts/evm-rollup/templates/_helpers.tpl
index 5003367..be8aa4a 100644
--- a/charts/evm-rollup/templates/_helpers.tpl
+++ b/charts/evm-rollup/templates/_helpers.tpl
@@ -52,7 +52,8 @@ The log level represented as a number
 Full image paths for Astria built images
 */}}
 {{- define "rollup.image" -}}
-{{ .Values.images.geth.repo }}:{{ if .Values.global.dev }}{{ .Values.images.geth.devTag }}{{ else }}{{ .Values.images.geth.tag }}{{ end }}
+{{ .Values.images.geth.repo }}:{{ if .Values.images.geth.overrideTag }}{{ .Values.images.geth.overrideTag }}{{ else }}{{ if .Values.global.dev }}{{ .Values.images.geth.devTag }}{{ else }}{{ .Values.images.geth.tag }}{{ end }}
+{{- end }}
 {{- end }}
 {{- define "conductor.image" -}}
 {{ .Values.images.conductor.repo }}:{{ if .Values.global.dev }}{{ .Values.images.conductor.devTag }}{{ else }}{{ .Values.images.conductor.tag }}{{ end }}
diff --git a/charts/evm-rollup/values.yaml b/charts/evm-rollup/values.yaml
index 0d329ac..e952807 100644
--- a/charts/evm-rollup/values.yaml
+++ b/charts/evm-rollup/values.yaml
@@ -11,6 +11,7 @@ images:
     repo: ghcr.io/astriaorg/astria-geth
     tag: 0.13.0
     devTag: latest
+    overrideTag: ""
   conductor:
     repo: ghcr.io/astriaorg/conductor
     tag: "0.18.0"
diff --git a/charts/evm-stack/Chart.lock b/charts/evm-stack/Chart.lock
index b531f15..179ad0a 100644
--- a/charts/evm-stack/Chart.lock
+++ b/charts/evm-stack/Chart.lock
@@ -1,7 +1,7 @@
 dependencies:
 - name: evm-rollup
   repository: file://../evm-rollup
-  version: 0.25.4
+  version: 0.25.5
 - name: composer
   repository: file://../composer
   version: 0.1.1
@@ -17,5 +17,5 @@ dependencies:
 - name: blockscout-stack
   repository: https://blockscout.github.io/helm-charts
   version: 1.6.2
-digest: sha256:695498fcbe82a100ca333b058196730eed9173df8528871585f40453c182d964
-generated: "2024-08-15T12:40:34.762702-07:00"
+digest: sha256:eeab7cd59d2577678f54e630b393a453a7862995f3ae0fc794b14dc640e855df
+generated: "2024-08-22T14:43:39.38871-04:00"