add default faucet to defaults.yaml file, use faucet.type to set imag…

…e and params for it (#243)
cosmology-tech · Sep 15, 2023 · 1b0afa4 · 1b0afa4
1 parent 6b2102d
commit 1b0afa4
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 10 deletions.
diff --git a/charts/devnet/defaults.yaml b/charts/devnet/defaults.yaml
@@ -707,3 +707,8 @@ defaultScripts:
   buildChain:
     name: build-chain.sh
     file: scripts/build-chain.sh
+
+defaultFaucet:
+  cosmjs:
+    image: ghcr.io/cosmology-tech/starship/cosmjs-faucet:v0.31.1
+    concurrency: 5
diff --git a/charts/devnet/templates/chains/cosmos/genesis.yaml b/charts/devnet/templates/chains/cosmos/genesis.yaml
@@ -15,6 +15,9 @@
 {{ $faucet := get $chain "faucet" | default dict }}
 {{ $faucet = mergeOverwrite ($.Values.faucet | deepCopy) $faucet }}
 
+{{ $defaultFaucet := get $defaultFile.defaultFaucet $faucet.type | default dict }}
+{{ $faucet = merge $faucet $defaultFaucet }}
+
 {{ $image := $chain.image }}
 {{- if $toBuild }}
 {{ $image = "ghcr.io/cosmology-tech/starship/runner:latest" }}
@@ -177,6 +180,7 @@ spec:
             - mountPath: /configs
               name: addresses
         {{- if $faucet.enabled }}
+        {{- if eq $faucet.type "cosmjs" }}
         - name: faucet
           image: {{ $faucet.image }}
           imagePullPolicy: Always
@@ -235,6 +239,7 @@ spec:
             initialDelaySeconds: 10
             periodSeconds: 10
         {{- end }}
+        {{- end }}
       volumes:
         - name: node
           emptyDir: { }

diff --git a/charts/devnet/values.schema.json b/charts/devnet/values.schema.json
@@ -43,6 +43,12 @@
         "enabled": {
           "type": "boolean"
         },
+        "type": {
+          "type": "string",
+          "enum": [
+            "cosmjs"
+          ]
+        },
         "image": {
           "type": "string"
         },
@@ -210,6 +216,12 @@
               "enabled": {
                 "type": "boolean"
               },
+              "type": {
+                "type": "string",
+                "enum": [
+                  "cosmjs"
+                ]
+              },
               "image": {
                 "type": "string"
               },

diff --git a/charts/devnet/values.yaml b/charts/devnet/values.yaml
@@ -29,16 +29,6 @@ exposer:
     cpu: "0.2"
     memory: "200M"
 
-faucet:
-  enabled: true
-  image: ghcr.io/cosmology-tech/starship/cosmjs-faucet:v0.31.1
-  concurrency: 10
-  ports:
-    rest: 8000
-  resources:
-    cpu: "0.2"
-    memory: "200M"
-
 # Chain timeouts
 timeouts:
   time_iota_ms: 10
@@ -228,3 +218,12 @@ registry:
   resources:
     cpu: "0.2"
     memory: "200M"
+
+faucet:
+  enabled: true
+  type: cosmjs
+  ports:
+    rest: 8000
+  resources:
+    cpu: "0.2"
+    memory: "200M"