diff --git a/charts/geth/templates/statefulset.yaml b/charts/geth/templates/statefulset.yaml index a81311a88..20cc37a81 100644 --- a/charts/geth/templates/statefulset.yaml +++ b/charts/geth/templates/statefulset.yaml @@ -138,7 +138,11 @@ spec: --override.terminaltotaldifficulty={{ .Values.terminalTotalDifficulty }} {{- end }} --datadir=/data/ethereum + {{- if .Values.global.network }} --{{ .Values.global.network }} + {{- else }} + --networkid {{ .Values.global.networkid }} + {{- end }} {{- range .Values.extraFlags }} {{ . | quote }} {{- end }} diff --git a/charts/geth/values.yaml b/charts/geth/values.yaml index 851ce44b7..8790dc696 100644 --- a/charts/geth/values.yaml +++ b/charts/geth/values.yaml @@ -6,9 +6,20 @@ global: replicaCount: 1 ## Eth2 network ID + ## Use one of the predefined testnets or mainnet: + ## - mainnet (default) + ## - goerli + ## - sepolia + ## - holesky + ## + ## If using a custom network, comment out 'network' and set 'networkid' instead. ## network: mainnet + ## Custom network ID for private or other networks. + ## Only set this if 'network' is not defined. + # networkid: 100 + ## JSON Web Token (JWT) authentication is used to secure the communication ## between the beacon node and execution client. You can generate a JWT using ## a command line tool, for example: diff --git a/charts/prysm/Chart.yaml b/charts/prysm/Chart.yaml index f50a2f749..184f07017 100644 --- a/charts/prysm/Chart.yaml +++ b/charts/prysm/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: prysm -version: 5.0.3 +version: 5.0.4 appVersion: v5.0.3 kubeVersion: "^1.18.0-0" description: Go implementation of Ethereum proof of stake. diff --git a/charts/prysm/templates/statefulset.yaml b/charts/prysm/templates/statefulset.yaml index 60c77d5b7..62a212383 100644 --- a/charts/prysm/templates/statefulset.yaml +++ b/charts/prysm/templates/statefulset.yaml @@ -91,6 +91,7 @@ spec: echo 'p2p-udp-port: {{ include "prysm.p2pPort" . }}' >> /config/config.yaml; {{- end }} INDEX=$((${HOSTNAME##*-}+1)); + cat data/scripts/execution-endpoints.txt; EE=$(sed "${INDEX}q;d" /data/scripts/execution-endpoints.txt); echo "execution-endpoint: ${EE}" >> /config/config.yaml; echo "Pod will connect to the ${EE} endpoint"; @@ -103,10 +104,8 @@ spec: mountPath: /config - name: data mountPath: /data - {{- if or (eq .Values.global.network "prater") (eq .Values.global.network "goerli") (eq .Values.global.network "ropsten") (eq .Values.global.network "sepolia") }} - name: scripts mountPath: /data/scripts - {{- end }} {{- if or (eq .Values.global.network "prater") (eq .Values.global.network "goerli") (eq .Values.global.network "ropsten") (eq .Values.global.network "sepolia") }} - name: download-genesis-state image: "curlimages/curl:latest" @@ -273,11 +272,9 @@ spec: configMap: name: {{ include "common.names.fullname" . }}-gnosis {{- end }} - {{- if or (eq .Values.global.network "prater") (eq .Values.global.network "goerli") (eq .Values.global.network "ropsten") (eq .Values.global.network "sepolia") }} - name: scripts configMap: name: {{ include "common.names.fullname" . }} - {{- end }} {{- if (not .Values.persistence.enabled) }} - name: data emptyDir: {} diff --git a/charts/prysm/values.yaml b/charts/prysm/values.yaml index 3933ce289..e594bcb47 100644 --- a/charts/prysm/values.yaml +++ b/charts/prysm/values.yaml @@ -255,7 +255,6 @@ totalDifficultyOverride: "" extraFlags: # p2p options - "--p2p-max-peers=160" - - "--enable-peer-scorer" ## Extra annotations for StatefulSet pods podAnnotations: {} diff --git a/charts/v3-operator/Chart.yaml b/charts/v3-operator/Chart.yaml index 653d6b470..37bd2f721 100644 --- a/charts/v3-operator/Chart.yaml +++ b/charts/v3-operator/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: v3-operator -version: 3.3.3 +version: 3.3.4 appVersion: v1.3.2 description: Operator hosted service for Stakewise V3 protocol. type: application diff --git a/charts/v3-operator/templates/configmap.yaml b/charts/v3-operator/templates/configmap.yaml index 66dc4dbd0..8813bdcae 100644 --- a/charts/v3-operator/templates/configmap.yaml +++ b/charts/v3-operator/templates/configmap.yaml @@ -7,10 +7,10 @@ metadata: data: DATA_DIR: "/data" {{- if .Values.settings.remoteDbConfig.enabled }} - DEPOSIT_DATA_FILE: "/data/{{ .Values.settings.vault }}/deposit_data.json" + DEPOSIT_DATA_FILE: "/data/{{ lower .Values.settings.vault }}/deposit_data.json" REMOTE_SIGNER_URL: {{ .Values.settings.remoteDbConfig.remoteSignerUrl | quote }} {{- else }} - DEPOSIT_DATA_FILE: "/data/{{ .Values.settings.vault }}/deposit/deposit_data.json" + DEPOSIT_DATA_FILE: "/data/{{ lower .Values.settings.vault }}/deposit/deposit_data.json" {{- end }} DATABASE_DIR: "/data" VERBOSE: {{ .Values.settings.verbose | quote }} diff --git a/charts/v3-operator/templates/statefulset.yaml b/charts/v3-operator/templates/statefulset.yaml index e9ad2f1ed..7b872f22f 100644 --- a/charts/v3-operator/templates/statefulset.yaml +++ b/charts/v3-operator/templates/statefulset.yaml @@ -47,7 +47,7 @@ spec: - sh - -c - > - mkdir -p /data/{{ .Values.settings.vault }}/keystores || true; + mkdir -p /data/{{ lower .Values.settings.vault }}/keystores || true; chown -R {{ .Values.securityContext.runAsUser }}:{{ .Values.securityContext.runAsUser }} /data volumeMounts: - name: data @@ -69,7 +69,7 @@ spec: - --db-url - {{ .Values.settings.remoteDbConfig.dbUrl }} - --vault - - {{ .Values.settings.vault }} + - {{ lower .Values.settings.vault }} - setup-operator env: - name: PYTHONPATH @@ -113,15 +113,15 @@ spec: {{- if or .Values.settings.depositDataSecretName .Values.settings.keystoresSecretName .Values.settings.walletSecretName }} {{- if .Values.settings.depositDataSecretName }} - name: deposit-data - mountPath: /data/{{ .Values.settings.vault }}/deposit + mountPath: /data/{{ lower .Values.settings.vault }}/deposit {{- end }} {{- if .Values.settings.keystoresSecretName }} - name: keystores - mountPath: /data/{{ .Values.settings.vault }}/keystores + mountPath: /data/{{ lower .Values.settings.vault }}/keystores {{- end }} {{- if .Values.settings.walletSecretName }} - name: wallet - mountPath: /data/{{ .Values.settings.vault }}/wallet + mountPath: /data/{{ lower .Values.settings.vault }}/wallet {{- end }} {{- end }} - name: data diff --git a/charts/web3signer-validators/Chart.yaml b/charts/web3signer-validators/Chart.yaml index 8f7cf14ca..bf61d678d 100644 --- a/charts/web3signer-validators/Chart.yaml +++ b/charts/web3signer-validators/Chart.yaml @@ -16,7 +16,7 @@ type: application # 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: 6.1.6 +version: 6.1.7 # 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 diff --git a/charts/web3signer-validators/templates/statefulset.yaml b/charts/web3signer-validators/templates/statefulset.yaml index 57f31661e..8636e6695 100644 --- a/charts/web3signer-validators/templates/statefulset.yaml +++ b/charts/web3signer-validators/templates/statefulset.yaml @@ -78,7 +78,7 @@ spec: - --network - {{ $root.Values.global.network }} - --vault - - {{ $root.Values.global.vault }} + - {{ lower $root.Values.global.vault }} - "--db-url" - "{{ $root.Values.dbKeystoreUrl }}" - setup-validator diff --git a/charts/web3signer/Chart.yaml b/charts/web3signer/Chart.yaml index e37f6c251..318aa078c 100644 --- a/charts/web3signer/Chart.yaml +++ b/charts/web3signer/Chart.yaml @@ -16,7 +16,7 @@ type: application # 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: 6.0.5 +version: 6.0.6 # 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 diff --git a/charts/web3signer/templates/statefulset.yaml b/charts/web3signer/templates/statefulset.yaml index 2d9161671..f4349a07b 100644 --- a/charts/web3signer/templates/statefulset.yaml +++ b/charts/web3signer/templates/statefulset.yaml @@ -70,7 +70,7 @@ spec: - --db-url - {{ .Values.dbKeystoreUrl }} - --vault - - {{ .Values.global.vault }} + - {{ lower .Values.global.vault }} - setup-web3signer - --encrypt-key - {{ .Values.decryptionKey }}