chore!: remove bitcoind as galoy dep (cold storage in bria)

GaloyMoney · Aug 3, 2023 · 252e710 · 252e710
1 parent 984ad38
commit 252e710
Show file tree

Hide file tree

Showing 9 changed files with 3 additions and 51 deletions.
diff --git a/charts/galoy/templates/_helpers.tpl b/charts/galoy/templates/_helpers.tpl
@@ -118,21 +118,6 @@ Return Galoy environment variables for MongoDB configuration
 {{ end }}
 {{- end -}}
 
-{{/*
-Return Galoy environment variables for BitcoinD configuration
-*/}}
-{{- define "galoy.bitcoind.env" -}}
-- name: BITCOINDADDR
-  value: {{ .Values.galoy.bitcoind.dns | quote }}
-- name: BITCOINDPORT
-  value: {{ .Values.galoy.bitcoind.port | quote }}
-- name: BITCOINDRPCPASS
-  valueFrom:
-    secretKeyRef:
-      name: {{ .Values.galoy.bitcoind.rpcPasswordExistingSecret.name }}
-      key: {{ .Values.galoy.bitcoind.rpcPasswordExistingSecret.key }}
-{{- end -}}
-
 {{/*
 Return Galoy environment variables for LND 1 configuration
 */}}

diff --git a/charts/galoy/templates/api-deployment.yaml b/charts/galoy/templates/api-deployment.yaml
@@ -80,7 +80,6 @@ spec:
 {{ include "galoy.redis.env" . | indent 8 }}
 
 {{/* Bitcoin/LND */}}
-{{ include "galoy.bitcoind.env" . | indent 8 }}
 {{ include "galoy.lnd1.env" . | indent 8 }}
 {{ include "galoy.lnd2.env" . | indent 8 }}
 {{ include "galoy.bria.env" . | indent 8 }}

diff --git a/charts/galoy/templates/balance-notification-cronjob.yaml b/charts/galoy/templates/balance-notification-cronjob.yaml
@@ -61,7 +61,6 @@ spec:
 {{ include "galoy.redis.env" . | indent 12 }}
 
 {{/* Bitcoin/LND */}}
-{{ include "galoy.bitcoind.env" . | indent 12 }}
 {{ include "galoy.lnd1.env" . | indent 12 }}
 {{ include "galoy.lnd2.env" . | indent 12 }}
 

diff --git a/charts/galoy/templates/exporter-deployment.yaml b/charts/galoy/templates/exporter-deployment.yaml
@@ -83,7 +83,6 @@ spec:
 {{ include "galoy.redis.env" . | indent 8 }}
 
 {{/* Bitcoin/LND */}}
-{{ include "galoy.bitcoind.env" . | indent 8 }}
 {{ include "galoy.lnd1.env" . | indent 8 }}
 {{ include "galoy.lnd2.env" . | indent 8 }}
 {{ include "galoy.bria.env" . | indent 8 }}

diff --git a/charts/galoy/templates/galoy-cronjob.yaml b/charts/galoy/templates/galoy-cronjob.yaml
@@ -63,7 +63,6 @@ spec:
 {{ include "galoy.redis.env" . | indent 12 }}
 
 {{/* Bitcoin/LND */}}
-{{ include "galoy.bitcoind.env" . | indent 12 }}
 {{ include "galoy.lnd1.env" . | indent 12 }}
 {{ include "galoy.lnd2.env" . | indent 12 }}
 {{ include "galoy.bria.env" . | indent 12 }}

diff --git a/charts/galoy/templates/galoy-secrets.yaml b/charts/galoy/templates/galoy-secrets.yaml
@@ -99,19 +99,6 @@ data:
   {{ .Values.galoy.twilioExistingSecret.account_sid_key }}: {{ .Values.secrets.twilioAccountSid | toString | b64enc }}
   {{ .Values.galoy.twilioExistingSecret.auth_token_key }}: {{ .Values.secrets.twilioAuthToken | toString | b64enc }}
 
----
-
-apiVersion: v1
-kind: Secret
-metadata:
-  name: {{ .Values.galoy.bitcoind.rpcPasswordExistingSecret.name }}
-  labels:
-    app: {{ template "galoy.name" . }}
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-    release: "{{ .Release.Name }}"
-type: Opaque
-data:
-  {{ .Values.galoy.bitcoind.rpcPasswordExistingSecret.key }}: {{ .Values.secrets.bitcoindRpcPassword | toString | b64enc }}
 
 ---
 

diff --git a/charts/galoy/templates/trigger-deployment.yaml b/charts/galoy/templates/trigger-deployment.yaml
@@ -76,7 +76,6 @@ spec:
 {{ include "galoy.redis.env" . | indent 8 }}
 
 {{/* Bitcoin/LND */}}
-{{ include "galoy.bitcoind.env" . | indent 8 }}
 {{ include "galoy.lnd1.env" . | indent 8 }}
 {{ include "galoy.lnd2.env" . | indent 8 }}
 {{ include "galoy.bria.env" . | indent 8 }}

diff --git a/charts/galoy/templates/websocket-deployment.yaml b/charts/galoy/templates/websocket-deployment.yaml
@@ -70,7 +70,6 @@ spec:
 {{ include "galoy.redis.env" . | indent 8 }}
 
 {{/* Bitcoin/LND */}}
-{{ include "galoy.bitcoind.env" . | indent 8 }}
 {{ include "galoy.lnd1.env" . | indent 8 }}
 {{ include "galoy.lnd2.env" . | indent 8 }}
 

diff --git a/charts/galoy/values.yaml b/charts/galoy/values.yaml
@@ -36,6 +36,9 @@ galoy:
       hotWalletName: dev
       queueNames:
         fast: fast
+      coldStorage:
+        walletName: cold
+        hotToColdRebalanceQueueName: dev
     appcheckConfig:
       audience: projects/72279297366
       issuer: https://firebaseappcheck.googleapis.com/72279297366
@@ -455,21 +458,6 @@ galoy:
       macaroon_key: loop_macaroon_base64
       ## TLS Key
       tls_key: tls_base64
-  ## Configuration values for establishing connection to BITCOIND
-  ## TODO: This should be injected as ConfigMap from Bitcoin Chart
-  ##
-  bitcoind:
-    ## DNS for bitcoind
-    dns: bitcoind.default.svc.cluster.local
-    ## Port on which bitcoind is running
-    port: 8332
-    ## RPC Password Secret
-    ##
-    rpcPasswordExistingSecret:
-      ## Secret Name
-      name: bitcoind-rpcpassword
-      ## Secret Key
-      key: password
   bria:
     host: bria-api.default.svc.cluster.local
     port: 2742
@@ -613,8 +601,6 @@ secrets:
   twilioVerifyService:
   twilioAccountSid:
   twilioAuthToken:
-  ## Bitcoin RPC password
-  bitcoindRpcPassword:
   ## Secrets for LND1
   lnd1Macaroon:
   lnd1Tls: