From 673a292a53979acd91a50b86beb7cfc26391f67f Mon Sep 17 00:00:00 2001 From: "github-merge-queue[bot]" Date: Thu, 12 Dec 2024 18:28:54 +0000 Subject: [PATCH] Changes from astriaorg/astria@1f2b9677f158c0028b0faed83bf484d05079cda7 --- charts/evm-faucet/Chart.yaml | 2 +- charts/evm-faucet/templates/configmap.yaml | 1 + charts/evm-faucet/templates/deployment.yaml | 3 ++- charts/evm-faucet/values.yaml | 1 + charts/evm-stack/Chart.lock | 6 +++--- charts/evm-stack/Chart.yaml | 4 ++-- 6 files changed, 10 insertions(+), 7 deletions(-) diff --git a/charts/evm-faucet/Chart.yaml b/charts/evm-faucet/Chart.yaml index dff2ef7..5a02dc5 100644 --- a/charts/evm-faucet/Chart.yaml +++ b/charts/evm-faucet/Chart.yaml @@ -16,7 +16,7 @@ type: application # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 0.1.3 +version: 0.1.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 diff --git a/charts/evm-faucet/templates/configmap.yaml b/charts/evm-faucet/templates/configmap.yaml index abfa303..a534c5b 100644 --- a/charts/evm-faucet/templates/configmap.yaml +++ b/charts/evm-faucet/templates/configmap.yaml @@ -8,6 +8,7 @@ data: ETH_FAUCET_PORT: "{{ .Values.ports.faucet }}" ETH_FAUCET_EVM_PROVIDER_URL: "{{ tpl .Values.config.providerUrl . }}" ETH_FAUCET_AMOUNT: "{{ .Values.config.amount }}" + ETH_FAUCET_INTERVAL: "{{ .Values.config.intervalMinutes }}" {{- if not .Values.secretProvider.enabled }} ETH_FAUCET_EVM_PRIVATE_KEY: "{{ .Values.config.privateKey.devContent }}" {{- end }} diff --git a/charts/evm-faucet/templates/deployment.yaml b/charts/evm-faucet/templates/deployment.yaml index 6f6c753..f71d689 100644 --- a/charts/evm-faucet/templates/deployment.yaml +++ b/charts/evm-faucet/templates/deployment.yaml @@ -24,6 +24,7 @@ spec: - -wallet.provider=$(ETH_FAUCET_EVM_PROVIDER_URL) - -wallet.privkey=$(ETH_FAUCET_EVM_PRIVATE_KEY) - -faucet.amount=$(ETH_FAUCET_AMOUNT) + - -faucet.minutes=$(ETH_FAUCET_INTERVAL) - -proxycount=$(ETH_FAUCET_PROXYCOUNT) image: {{ .Values.images.faucet.repo }}:{{ .Values.images.faucet.tag }} imagePullPolicy: {{ .Values.images.faucet.pullPolicy }} @@ -58,6 +59,6 @@ spec: driver: secrets-store.csi.k8s.io readOnly: true volumeAttributes: - secretProviderClass: evm-faucet-private-key + secretProviderClass: faucet-private-key {{- end }} --- diff --git a/charts/evm-faucet/values.yaml b/charts/evm-faucet/values.yaml index b79100f..c7362c0 100644 --- a/charts/evm-faucet/values.yaml +++ b/charts/evm-faucet/values.yaml @@ -27,6 +27,7 @@ config: key: token # The amount of token to give per request amount: 1 + intervalMinutes: 100 providerUrl: http://{{ .Values.config.rollupName }}-evm-service.{{ include "evmFaucet.namespace" . }}.svc.cluster.local:8545 ingress: diff --git a/charts/evm-stack/Chart.lock b/charts/evm-stack/Chart.lock index b2152ed..7de9972 100644 --- a/charts/evm-stack/Chart.lock +++ b/charts/evm-stack/Chart.lock @@ -10,7 +10,7 @@ dependencies: version: 1.0.0 - name: evm-faucet repository: file://../evm-faucet - version: 0.1.3 + version: 0.1.4 - name: evm-bridge-withdrawer repository: file://../evm-bridge-withdrawer version: 1.0.1 @@ -20,5 +20,5 @@ dependencies: - name: blockscout-stack repository: https://blockscout.github.io/helm-charts version: 1.6.8 -digest: sha256:d89234a3481aa511fb32e38b9d5799efb5848f490e67dc67e837e4eb6af670d1 -generated: "2024-12-12T18:24:37.475398+02:00" +digest: sha256:4715e557b6ceb0fa85c9efe86f5b26d665783f0be9162728efe808fa3a35d727 +generated: "2024-12-12T19:52:24.992658+02:00" diff --git a/charts/evm-stack/Chart.yaml b/charts/evm-stack/Chart.yaml index e11034c..dea0641 100644 --- a/charts/evm-stack/Chart.yaml +++ b/charts/evm-stack/Chart.yaml @@ -15,7 +15,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: 1.0.5 +version: 1.0.6 dependencies: - name: celestia-node @@ -30,7 +30,7 @@ dependencies: repository: "file://../composer" condition: composer.enabled - name: evm-faucet - version: 0.1.3 + version: 0.1.4 repository: "file://../evm-faucet" condition: evm-faucet.enabled - name: evm-bridge-withdrawer