From 3eda09a2c5284196dca6957ea13c382dc1e76cb9 Mon Sep 17 00:00:00 2001
From: Nicolas Ochem <nicolas.ochem@gmail.com>
Date: Tue, 10 May 2022 22:33:03 -0700
Subject: [PATCH] Fix config init (#445)

* fix public chains after #393: config-init needs access to the env

config-init needs access to the variable $CHAIN_NAME

* fix helm charts test

* fix other helm test
---
 charts/tezos/templates/_containers.tpl | 1 +
 test/charts/mainnet.expect.yaml        | 2 ++
 test/charts/mainnet2.expect.yaml       | 4 ++++
 3 files changed, 7 insertions(+)

diff --git a/charts/tezos/templates/_containers.tpl b/charts/tezos/templates/_containers.tpl
index 38fb44130..c1f146c7c 100644
--- a/charts/tezos/templates/_containers.tpl
+++ b/charts/tezos/templates/_containers.tpl
@@ -174,6 +174,7 @@
     {{- include "tezos.generic_container" (dict "root"        $
                                                 "type"        "config-init"
                                                 "image"       "octez"
+                                                "with_config" 1
                                                 "localvars"   1
     ) | nindent 0 }}
   {{- end }}
diff --git a/test/charts/mainnet.expect.yaml b/test/charts/mainnet.expect.yaml
index a0ef23e94..7a468306c 100644
--- a/test/charts/mainnet.expect.yaml
+++ b/test/charts/mainnet.expect.yaml
@@ -210,6 +210,8 @@ spec:
               printf "\n\n\n\n\n\n\n"
               
           envFrom:
+            - configMapRef:
+                name: tezos-config
           env:    
             - name: MY_POD_IP
               valueFrom:
diff --git a/test/charts/mainnet2.expect.yaml b/test/charts/mainnet2.expect.yaml
index 72238916a..3f4aded4e 100644
--- a/test/charts/mainnet2.expect.yaml
+++ b/test/charts/mainnet2.expect.yaml
@@ -307,6 +307,8 @@ spec:
               printf "\n\n\n\n\n\n\n"
               
           envFrom:
+            - configMapRef:
+                name: tezos-config
           env:    
             - name: MY_POD_IP
               valueFrom:
@@ -662,6 +664,8 @@ spec:
               printf "\n\n\n\n\n\n\n"
               
           envFrom:
+            - configMapRef:
+                name: tezos-config
           env:    
             - name: MY_POD_IP
               valueFrom: