Merge branch 'master' into dailynet-submodule

oxheadalpha · Oct 13, 2023 · 86cec2d · 86cec2d
2 parents fca4b79 + cc77815
commit 86cec2d
Show file tree

Hide file tree

Showing 6 changed files with 137 additions and 238 deletions.
diff --git a/charts/snapshotEngine/scripts/snapshot-warmer.sh b/charts/snapshotEngine/scripts/snapshot-warmer.sh
diff --git a/charts/snapshotEngine/templates/configmap.yaml b/charts/snapshotEngine/templates/configmap.yaml
@@ -15,7 +15,8 @@ data:
   SCHEMA_URL: {{ $.Values.schemaUrl }}
   S3_BUCKET: {{ $.Values.s3BucketOverride }}
   CLOUD_PROVIDER: {{ $.Values.cloudProvider }}
-  STORAGE_CLASS: {{$.Values.volumeSnapClass }}
+  STORAGE_CLASS: {{ $.Values.volumeSnapClass }}
+  NODES: {{ $.Values.nodes }}
 kind: ConfigMap
 metadata:
   name: snapshot-configmap

diff --git a/charts/snapshotEngine/templates/snapshot-warmer.yaml b/charts/snapshotEngine/templates/snapshot-warmer.yaml
diff --git a/charts/tezos-faucet/templates/configmap.yaml b/charts/tezos-faucet/templates/configmap.yaml
@@ -22,7 +22,9 @@ data:
   AUTHORIZED_HOST: "{{ .Values.authorizedHost }}"
   DISABLE_CHALLENGES: "{{ .Values.disableChallenges }}"
   ENABLE_CAPTCHA: "{{ .Values.enableCaptcha }}"
+  {{- if .Values.maxBalance }}
   MAX_BALANCE: "{{ .Values.maxBalance }}"
+  {{- end }}
   REDIS_URL: "{{ .Values.redis.url }}"
   RPC_URL: "{{ .Values.backendRpcUrl | default .Values.config.network.rpcUrl | required "An rpc url is required." }}"
   MIN_TEZ: "{{ .Values.minTez }}"

diff --git a/charts/tezos-faucet/values.yaml b/charts/tezos-faucet/values.yaml
@@ -2,8 +2,8 @@
 # Faucet frontend: https://github.com/oxheadalpha/tezos-faucet
 
 images:
-  tezosFaucet: ghcr.io/oxheadalpha/tezos-faucet:2.1.0
-  tezosFaucetBackend: ghcr.io/oxheadalpha/tezos-faucet-backend:2.1.0
+  tezosFaucet: ghcr.io/oxheadalpha/tezos-faucet:2.2.1
+  tezosFaucetBackend: ghcr.io/oxheadalpha/tezos-faucet-backend:2.2.0
 
 # Frontend app configuration. You can optionally deploy only the faucet backend.
 enableUI: true
@@ -28,8 +28,9 @@ authorizedHost: "*"
 backendRpcUrl: http://tezos-node-rpc:8732
 # If the backend requires CAPTCHA tokens to be submitted.
 enableCaptcha: true
-# Faucet won't dispense to an address if its balance will exceed this.
-maxBalance: 6000
+# Faucet won't dispense to an address if its balance will exceed this. Not
+# capped by default.
+maxBalance: null
 # The minimum Tez allowed per request.
 minTez: 1
 # The maximum Tez allowed per request.