Merge branch 'pow-faucet' of github.com:tqtezos/tezos-k8s into HEAD

oxheadalpha · Aug 23, 2023 · 2653782 · 2653782
2 parents f7dd747 + 1a8e87b
commit 2653782
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 3 deletions.
diff --git a/charts/tezos-faucet/templates/configmap.yaml b/charts/tezos-faucet/templates/configmap.yaml
@@ -22,6 +22,8 @@ metadata:
   name: faucet-backend-config
   namespace: {{ .Release.Namespace }}
 data:
+  profiles.json: {{ .Values.profiles | mustToPrettyJson | quote }}
+
   AUTHORIZED_HOST: "{{ .Values.authorizedHost }}"
   DISABLE_CHALLENGES: "{{ .Values.disableChallenges }}"
   ENABLE_CAPTCHA: "{{ .Values.enableCaptcha }}"

diff --git a/charts/tezos-faucet/templates/deployment.yaml b/charts/tezos-faucet/templates/deployment.yaml
@@ -39,7 +39,18 @@ spec:
                 name: faucet-backend-config
             - secretRef:
                 name: faucet-backend-secret
-    {{- if .Values.enableUI }}
+          env:
+          # profiles.json gets set via the configmap. We store it there for easy
+          # access to mount as a file instead of in a new configmap. We don't
+          # need it to be an env var so we make it empty here.
+            - name: profiles.json
+              value: ""
+          volumeMounts:
+            - name: faucet-backend-config
+              mountPath: /app/dist/profiles.json
+              subPath: profiles.json
+              readOnly: true
+      {{- if .Values.enableUI }}
         - image: {{ .Values.images.tezosFaucet }}
           name: faucet
           securityContext:
@@ -53,12 +64,16 @@ spec:
               mountPath: /app/public/config.json
               subPath: config.json
               readOnly: true
+      {{- end }}
       volumes:
+        - name: faucet-backend-config
+          configMap:
+            name: faucet-backend-config
+      {{- if .Values.enableUI }}
         - name: faucet-config
           configMap:
             name: faucet-config
-
-    {{- end }}
+      {{- end }}
 
       {{- with .Values.nodeSelector }}
       nodeSelector: