fix: use dev daemon to provision bria (#3216)

GaloyMoney · Jun 3, 2023 · fd3118f · fd3118f
1 parent a57eb6d
commit fd3118f
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 81 deletions.
diff --git a/charts/bria/templates/bria-deployment.yaml b/charts/bria/templates/bria-deployment.yaml
@@ -58,7 +58,16 @@ spec:
         args:
         - bria
         - daemon
+        {{ if .Values.bria.devDaemon.enabled }}
+        - dev
+        - -x
+        - tpubDDDDGYiFda8HfJRc2AHFJDxVzzEtBPrKsbh35EaW2UGd5qfzrF2G87ewAgeeRyHEz4iB3kvhAYW1sH6dpLepTkFUzAktumBN8AXeXWE9nd1
+        - -d
+        - m/84h/0h/0h
+        {{ else }}
         - run
+        {{ end }}
+
         volumeMounts:
         - name: "config"
           mountPath: "/bria.yml"
@@ -83,6 +92,10 @@ spec:
             fieldRef:
               apiVersion: v1
               fieldPath: spec.nodeName
+        {{ if .Values.bria.devDaemon.enabled }}
+        - name: BITCOIND_SIGNER_ENDPOINT
+          value: {{ .Values.bria.devDaemon.bitcoindSignerHost }}
+        {{ end }}
         startupProbe:
           grpc:
             port: {{ .Values.bria.api.service.port }}
@@ -91,30 +104,6 @@ spec:
             port: {{ .Values.bria.api.service.port }}
         resources:
         {{- toYaml .Values.bria.resources | nindent 10 }}
-
-      {{ if .Values.bria.provisionAdmin }}
-      - name: provision-admin-api-key
-        image: "{{ .Values.bria.provisionAdminSidecarImage.repository }}@{{ .Values.bria.provisionAdminSidecarImage.digest }}"
-        command:
-        - "bash"
-        - "-c"
-        - |
-          sleep 5 # for bria daemon to be up
-          bria admin bootstrap
-
-          if [ -f ".bria/admin-api-key" ]; then
-            echo "Admin API Key exists, saving to kubernetes secret."
-
-            export BRIA_ADMIN_KEY=$(cat .bria/admin-api-key)
-            kubectl create secret generic {{ template "bria.fullname" . }}-admin-api-key --from-literal=admin-api-key=$BRIA_ADMIN_KEY
-          fi
-
-          while true; do sleep 2s; done
-        env:
-        - name: BRIA_ADMIN_API_URL
-          value: http://{{ template "bria.fullname" . }}-admin:{{ .Values.bria.admin.service.port }}
-      {{ end }}
-
       volumes:
       - name: config
         configMap:

diff --git a/charts/bria/templates/bria-sa.yaml b/charts/bria/templates/bria-sa.yaml
diff --git a/charts/bria/values.yaml b/charts/bria/values.yaml
@@ -1,8 +1,10 @@
 fullnameOverride: ""
 nameOverride: ""
 bria:
+  devDaemon:
+    enabled: false
+    bitcoindSignerEndpoint: https://bitcoind-onchain.default.svc.cluster.local:18543
   resources: {}
-  provisionAdmin: true
   tracing:
     jaegerHost: localhost
     port: 6831
@@ -31,9 +33,6 @@ bria:
     repository: us.gcr.io/galoy-org/bria
     digest: "sha256:e42b35482a042c64af02911ddc959cd4624f313f6720703cf03f97336da1e1a2"
     git_ref: "7e9faf8"
-  provisionAdminSidecarImage:
-    repository: us.gcr.io/galoy-org/bria-provision-admin-sidecar
-    digest: "sha256:155fa7f3c30cbbd59df6e211b42da925690fc52312cd543d79ee4f6be8823a73"
   replicas: 2
   annotations:
   secrets:

diff --git a/ci/testflight/bria/testflight-values.yml.tmpl b/ci/testflight/bria/testflight-values.yml.tmpl
@@ -1,6 +1,4 @@
 bria:
-  provisionAdmin: true
-
   blockchain:
     electrumUrl: fulcrum.${bitcoin_namespace}.svc.cluster.local
 

diff --git a/dev/bitcoin/bria-values.yml b/dev/bitcoin/bria-values.yml
@@ -1,6 +1,6 @@
 bria:
-  provisionAdmin: false
-
+  devDaemon:
+    enabled: true
   blockchain:
     electrumUrl: fulcrum.galoy-dev-bitcoin.svc.cluster.local
 

diff --git a/dev/bitcoin/bria.tf b/dev/bitcoin/bria.tf
@@ -24,9 +24,8 @@ resource "helm_release" "bria" {
   ]
 
   depends_on = [
-    helm_release.bitcoind,
+    helm_release.bitcoind_onchain,
     helm_release.fulcrum,
-    helm_release.lnd,
     kubernetes_secret.bria_secrets
   ]
 

diff --git a/dev/galoy/main.tf b/dev/galoy/main.tf
@@ -60,7 +60,7 @@ resource "kubernetes_secret" "bria" {
   }
 
   data = {
-    api-key = ""
+    api-key = "bria_dev_000000000000000000000"
   }
 }