Merge branch 'main' into nicolasochem@sequencer_part2

tacoinfra · Feb 15, 2024 · 460e093 · 460e093
2 parents 6af52d2 + 9c93681
commit 460e093
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 11 deletions.
diff --git a/charts/tezos/templates/_containers.tpl b/charts/tezos/templates/_containers.tpl
@@ -171,11 +171,16 @@
       name: tezos-net
     - containerPort: 9932
       name: metrics
-    {{- if or (not (hasKey $.node_vals "readiness_probe")) $.node_vals.readiness_probe }}
+    {{- if or (not (hasKey $.node_vals "bootstrapped_readiness_probe")) $.node_vals.bootstrapped_readiness_probe }}
   readinessProbe:
     httpGet:
       path: /is_synced
       port: 31732
+    {{- else if or (not (hasKey $.node_vals "rpc_readiness_probe")) $.node_vals.rpc_readiness_probe }}
+  readinessProbe:
+    httpGet:
+      path: /version
+      port: 8732
     {{- end }}
   {{- end }}
 {{- if .resources }}
@@ -254,7 +259,7 @@
 {{- end }}
 
 {{- define "tezos.container.sidecar" }}
-  {{- if or (not (hasKey $.node_vals "readiness_probe")) $.node_vals.readiness_probe }}
+  {{- if or (not (hasKey $.node_vals "bootstrapped_readiness_probe")) $.node_vals.bootstrapped_readiness_probe }}
     {{- $sidecarResources := dict "requests" (dict "memory" "80Mi") "limits" (dict "memory" "100Mi") -}}
     {{- include "tezos.generic_container" (dict "root"      $
                                                 "type"      "sidecar"

diff --git a/charts/tezos/values.yaml b/charts/tezos/values.yaml
@@ -150,15 +150,18 @@ accounts: {}
 #      automatically for you.
 # - `node_selector`: Specify a kubernetes node selector in `key: value` format
 #     for your tezos nodes.
-# - `readiness_probe`: Attach a probe to the node. The probe checks whether
-#                    the most recent block is recent enough. If not, the
-#                    services will be unreachable. Defaults to True.
-#                    True is good for RPC nodes, private nodes, and
-#                    self-contained private chains.
-#                    Recommended to set to False when bootstrapping a new
-#                    chain with external bakers, such as a new test chain.
-#                    Otherwise, the chain may become unreachable externally
-#                    while waiting for other nodes to come online.
+# - `rpc_readiness_probe`: Attach a probe to the node. The probe checks whether
+#                          the RPC service is responsive, which should always be the
+#                          case. Defaults to true.
+# - `bootstrapped_readiness_probe`: Checks whether the most recent block is less than
+#                                   600 seconds old.
+#                                   Overrides `rpc_readiness_probe`. Defaults to True.
+#                                   True is good for RPC nodes, private nodes, and
+#                                   self-contained private chains.
+#                                   Recommended to set to False when bootstrapping a new
+#                                   chain with external bakers, such as a new test chain.
+#                                   Otherwise, the chain may become unreachable externally
+#                                   while waiting for other nodes to come online.
 # - `instances`: A list of nodes to fire up, each is a dictionary defining:
 #    - `bake_using_accounts`: List of account names that should be used for baking.
 #    - `authorized_keys`: List of account names that should be used as keys to