Merge branch 'bake_remotely' into midlbaker

oxheadalpha · Jan 3, 2024 · ae9f038 · ae9f038
2 parents 11b86b5 + ce130b3
commit ae9f038
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/charts/tezos/templates/activate-job.yaml b/charts/tezos/templates/activate-job.yaml
@@ -13,7 +13,7 @@ spec:
 {{- include "tezos.init_container.chain_initiator"    $ | indent 8 }}
       initContainers:
         - image: {{ .Values.tezos_k8s_images.utils }}
-          imagePullPolicy: IfNotPresent
+          imagePullPolicy: Always
           name: config-generator
           args:
             - config-generator

diff --git a/charts/tezos/templates/octez-baker.yaml b/charts/tezos/templates/octez-baker.yaml
@@ -64,7 +64,7 @@ spec:
           value: {{ join " " $v.bake_using_accounts }}
 {{- if $v.operations_pool | default false }}
         - name: OPERATIONS_POOL
-          value: "{{ $v.oprations_pool }}"
+          value: "{{ $v.operations_pool }}"
 {{- end }}
 {{- if $v.dal_node_rpc_url | default false }}
         - name: DAL_NODE_RPC_URL

diff --git a/utils/config-generator.py b/utils/config-generator.py
@@ -221,10 +221,9 @@ def expose_secret_key(account_name):
     as is the case in Octez client's "secret_keys" file.
     """
     if MY_POD_TYPE == "activating":
-        return account_name in [
-            NETWORK_CONFIG["activation_account_name"],
-            NETWORK_CONFIG["activation_account_authorized_key"]
-        ]
+        if "activation_account_authorized_key" in NETWORK_CONFIG:
+            return account_name == NETWORK_CONFIG["activation_account_authorized_key"]
+        return account_name == NETWORK_CONFIG["activation_account_name"]
 
     if MY_POD_TYPE == "signing":
         return account_name in MY_POD_CONFIG.get("accounts")