fix: change liveness/readinessprobe for CLs when in validator mode (#278

)
ethpandaops · Jan 24, 2024 · a2dc71b · a2dc71b
1 parent f4c3198
commit a2dc71b
Show file tree

Hide file tree

Showing 12 changed files with 91 additions and 13 deletions.
diff --git a/charts/lighthouse/Chart.yaml b/charts/lighthouse/Chart.yaml
@@ -6,7 +6,7 @@ icon: https://launchpad.ethereum.org/static/media/lighthouse-circle.e0b82d14.png
 sources:
   - https://github.com/sigp/lighthouse
 type: application
-version: 1.1.1
+version: 1.1.2
 maintainers:
   - name: skylenet
     email: rafael@skyle.net

diff --git a/charts/lighthouse/README.md b/charts/lighthouse/README.md
@@ -1,7 +1,7 @@
 
 # lighthouse
 
-![Version: 1.1.1](https://img.shields.io/badge/Version-1.1.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
+![Version: 1.1.2](https://img.shields.io/badge/Version-1.1.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
 
 An open-source Ethereum 2.0 client, written in Rust
 
@@ -96,6 +96,8 @@ An open-source Ethereum 2.0 client, written in Rust
 | topologySpreadConstraints | list | `[]` | Topology Spread Constraints for pods |
 | updateStrategy | object | `{"type":"RollingUpdate"}` | Update stategy for the Statefulset |
 | updateStrategy.type | string | `"RollingUpdate"` | Update stategy type |
+| validatorLivenessProbe | object | See `values.yaml` | Validator Liveness probe |
+| validatorReadinessProbe | object | See `values.yaml` | Validator Readiness probe |
 
 # Examples
 

diff --git a/charts/lighthouse/templates/statefulset.yaml b/charts/lighthouse/templates/statefulset.yaml
@@ -123,18 +123,24 @@ spec:
             - name: p2p-udp
               containerPort: {{ include "lighthouse.p2pPort" . }}
               protocol: UDP
-          {{- end }}
-          {{- if or (eq .Values.mode "beacon") (eq .Values.mode "validator") }}
             - name: http-api
               containerPort: {{ .Values.httpPort }}
               protocol: TCP
+          {{- end }}    
             - name: metrics
               containerPort: {{ .Values.metricsPort }}
-          {{- end }}
+              protocol: TCP
+          {{- if eq .Values.mode "beacon" }}
           livenessProbe:
             {{- toYaml .Values.livenessProbe | nindent 12 }}
           readinessProbe:
             {{- toYaml .Values.readinessProbe | nindent 12 }}
+          {{- else if eq .Values.mode "validator" }}
+          livenessProbe:
+            {{- toYaml .Values.validatorLivenessProbe | nindent 12 }}
+          readinessProbe:
+            {{- toYaml .Values.validatorReadinessProbe | nindent 12 }}
+          {{- end }}
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
           env:

diff --git a/charts/lighthouse/values.yaml b/charts/lighthouse/values.yaml
@@ -193,6 +193,22 @@ readinessProbe:
   initialDelaySeconds: 10
   periodSeconds: 10
 
+# -- Validator Liveness probe
+# @default -- See `values.yaml`
+validatorLivenessProbe:
+  tcpSocket:
+    port: metrics
+  initialDelaySeconds: 60
+  periodSeconds: 120
+
+# -- Validator Readiness probe
+# @default -- See `values.yaml`
+validatorReadinessProbe:
+  tcpSocket:
+    port: metrics
+  initialDelaySeconds: 10
+  periodSeconds: 10
+
 # -- P2P Port
 p2pPort: 9000
 

diff --git a/charts/lodestar/Chart.yaml b/charts/lodestar/Chart.yaml
@@ -6,7 +6,7 @@ icon: https://raw.githubusercontent.com/ChainSafe/lodestar/master/assets/lodesta
 sources:
   - https://github.com/ChainSafe/lodestar
 type: application
-version: 1.1.1
+version: 1.1.2
 maintainers:
   - name: skylenet
     email: rafael@skyle.net

diff --git a/charts/lodestar/README.md b/charts/lodestar/README.md
@@ -1,7 +1,7 @@
 
 # lodestar
 
-![Version: 1.1.1](https://img.shields.io/badge/Version-1.1.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
+![Version: 1.1.2](https://img.shields.io/badge/Version-1.1.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
 
 Lodestar is a open-source TypeScript implementation of the Ethereum consensus engine.
 
@@ -95,6 +95,8 @@ Lodestar is a open-source TypeScript implementation of the Ethereum consensus en
 | topologySpreadConstraints | list | `[]` | Topology Spread Constraints for pods |
 | updateStrategy | object | `{"type":"RollingUpdate"}` | Update stategy for the Statefulset |
 | updateStrategy.type | string | `"RollingUpdate"` | Update stategy type |
+| validatorLivenessProbe | object | See `values.yaml` | Validator Liveness probe |
+| validatorReadinessProbe | object | See `values.yaml` | Validator Readiness probe |
 
 # Examples
 

diff --git a/charts/lodestar/templates/statefulset.yaml b/charts/lodestar/templates/statefulset.yaml
@@ -127,13 +127,21 @@ spec:
             - name: http-api
               containerPort: {{ .Values.httpPort }}
               protocol: TCP
+          {{- end }}    
             - name: metrics
               containerPort: {{ .Values.metricsPort }}
-          {{- end }}
+              protocol: TCP
+          {{- if eq .Values.mode "beacon" }}
           livenessProbe:
             {{- toYaml .Values.livenessProbe | nindent 12 }}
           readinessProbe:
             {{- toYaml .Values.readinessProbe | nindent 12 }}
+          {{- else if eq .Values.mode "validator" }}
+          livenessProbe:
+            {{- toYaml .Values.validatorLivenessProbe | nindent 12 }}
+          readinessProbe:
+            {{- toYaml .Values.validatorReadinessProbe | nindent 12 }}
+          {{- end }}
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
           env:

diff --git a/charts/lodestar/values.yaml b/charts/lodestar/values.yaml
@@ -96,6 +96,9 @@ defaultValidatorCommandTemplate: |
     node /usr/app/node_modules/.bin/lodestar
     validator
     --dataDir=/data
+    --metrics
+    --metrics.address=0.0.0.0
+    --metrics.port={{ .Values.metricsPort }}
   {{- range .Values.extraArgs }}
     {{ tpl . $ }}
   {{- end }}
@@ -162,6 +165,23 @@ readinessProbe:
   initialDelaySeconds: 10
   periodSeconds: 10
 
+# -- Validator Liveness probe
+# @default -- See `values.yaml`
+validatorLivenessProbe:
+  tcpSocket:
+    port: metrics
+  initialDelaySeconds: 60
+  periodSeconds: 120
+
+# -- Validator Readiness probe
+# @default -- See `values.yaml`
+validatorReadinessProbe:
+  tcpSocket:
+    port: metrics
+  initialDelaySeconds: 10
+  periodSeconds: 10
+
+
 # -- P2P Port
 p2pPort: 9000
 

diff --git a/charts/prysm/Chart.yaml b/charts/prysm/Chart.yaml
@@ -6,7 +6,7 @@ icon: https://launchpad.ethereum.org/static/media/prysmatic-labs-circle.96c803fe
 sources:
   - https://github.com/prysmaticlabs/prysm
 type: application
-version: 1.1.1
+version: 1.1.2
 maintainers:
   - name: skylenet
     email: rafael@skyle.net

diff --git a/charts/prysm/README.md b/charts/prysm/README.md
@@ -1,7 +1,7 @@
 
 # prysm
 
-![Version: 1.1.1](https://img.shields.io/badge/Version-1.1.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
+![Version: 1.1.2](https://img.shields.io/badge/Version-1.1.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
 
 An open-source Ethereum 2.0 client, written in Go
 
@@ -96,6 +96,8 @@ An open-source Ethereum 2.0 client, written in Go
 | topologySpreadConstraints | list | `[]` | Topology Spread Constraints for pods |
 | updateStrategy | object | `{"type":"RollingUpdate"}` | Update stategy for the Statefulset |
 | updateStrategy.type | string | `"RollingUpdate"` | Update stategy type |
+| validatorLivenessProbe | object | See `values.yaml` | Validator Liveness probe |
+| validatorReadinessProbe | object | See `values.yaml` | Validator Readiness probe |
 
 # Examples
 

diff --git a/charts/prysm/templates/statefulset.yaml b/charts/prysm/templates/statefulset.yaml
@@ -121,21 +121,27 @@ spec:
             - name: p2p-udp
               containerPort: {{ include "prysm.p2pPort" . }}
               protocol: UDP
-          {{- end }}
-          {{- if or (eq .Values.mode "beacon") (eq .Values.mode "validator") }}
             - name: http-api
               containerPort: {{ .Values.httpPort }}
               protocol: TCP
             - name: rpc
               containerPort: {{ .Values.rpcPort }}
               protocol: TCP
+          {{- end }}
             - name: metrics
               containerPort: {{ .Values.metricsPort }}
-          {{- end }}
+              protocol: TCP
+          {{- if eq .Values.mode "beacon" }}
           livenessProbe:
             {{- toYaml .Values.livenessProbe | nindent 12 }}
           readinessProbe:
             {{- toYaml .Values.readinessProbe | nindent 12 }}
+          {{- else if eq .Values.mode "validator" }}
+          livenessProbe:
+            {{- toYaml .Values.validatorLivenessProbe | nindent 12 }}
+          readinessProbe:
+            {{- toYaml .Values.validatorReadinessProbe | nindent 12 }}
+          {{- end }}
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
           env:

diff --git a/charts/prysm/values.yaml b/charts/prysm/values.yaml
@@ -171,6 +171,22 @@ readinessProbe:
   initialDelaySeconds: 10
   periodSeconds: 10
 
+# -- Validator Liveness probe
+# @default -- See `values.yaml`
+validatorLivenessProbe:
+  tcpSocket:
+    port: metrics
+  initialDelaySeconds: 60
+  periodSeconds: 120
+
+# -- Validator Readiness probe
+# @default -- See `values.yaml`
+validatorReadinessProbe:
+  tcpSocket:
+    port: metrics
+  initialDelaySeconds: 10
+  periodSeconds: 10
+
 # -- P2P Port
 p2pPort: 13000