feat: add blink-terminal Tilt dev setup

charts/blink-terminal/templates/deployment.yaml

@@ -48,7 +48,10 @@ spec:
               key: "database-url"
       containers:
       - name: blink-terminal
-        image: "{{ .Values.image.repository }}@{{ .Values.image.digest }}"
+        image: "{{ .Values.image.repository }}{{ if .Values.image.digest }}@{{ .Values.image.digest }}{{ else }}:{{ .Values.image.tag | default "latest" }}{{ end }}"
+        {{- if .Values.image.pullPolicy }}
+        imagePullPolicy: {{ .Values.image.pullPolicy }}
+        {{- end }}
         ports:
         - containerPort: {{ .Values.service.port }}
         readinessProbe:
@@ -64,6 +67,8 @@ spec:
           initialDelaySeconds: 15
           periodSeconds: 30
         env:
+        - name: HOSTNAME
+          value: "0.0.0.0"
         - name: BLINK_API_URL
           value: {{ .Values.blinkTerminal.blinkApiUrl }}
         - name: BLINK_ENVIRONMENT
@@ -128,9 +133,6 @@ spec:
               name: {{ template "blink-terminal.fullname" . }}
               key: "citrusrate-api-key"
         - name: CITRUSRATE_BASE_URL
-          valueFrom:
-            secretKeyRef:
-              name: {{ template "blink-terminal.fullname" . }}
-              key: "citrusrate-base-url"
+          value: {{ .Values.blinkTerminal.citrusrateBaseUrl }}
         resources:
           {{ toYaml .Values.resources | nindent 10 }}

charts/blink-terminal/templates/secrets.yaml

@@ -18,5 +18,4 @@ data:
   blinkpos-btc-wallet-id: {{ .Values.secrets.blinkposBtcWalletId | b64enc | quote }}
   blink-webhook-secret: {{ .Values.secrets.blinkWebhookSecret | b64enc | quote }}
   citrusrate-api-key: {{ .Values.secrets.citrusrateApiKey | b64enc | quote }}
-  citrusrate-base-url: {{ .Values.secrets.citrusrateBaseUrl | b64enc | quote }}
 {{- end }}

charts/blink-terminal/values.yaml

@@ -12,7 +12,6 @@ secrets:
   blinkposBtcWalletId: ""
   blinkWebhookSecret: ""
   citrusrateApiKey: ""
-  citrusrateBaseUrl: ""
 blinkTerminal:
   blinkApiUrl: "http://galoy-oathkeeper-proxy.galoy-dev-galoy.svc.cluster.local:4455/graphql"
   blinkEnvironment: "staging"
@@ -23,6 +22,7 @@ blinkTerminal:
   loglevel: "info"
   otelExporterOtlpEndpoint: http://localhost:4318
   tracingServiceName: "blink-terminal"
+  citrusrateBaseUrl: "https://citrusrate-be.onrender.com"
 image:
   repository: us.gcr.io/galoy-org/blink-terminal
   digest: "sha256:f905ff77db8455fc5c7e0a0ff77e7056d2eb34a5276a54c2ff7c7b37ecd7ef02" # METADATA:: repository=https://github.com/blinkbitcoin/blink-terminal;commit_ref=5541b76;app=blink-terminal;

ci/testflight/blink-terminal/main.tf

@@ -57,7 +57,6 @@ resource "kubernetes_secret" "blink_terminal" {
     "blinkpos-btc-wallet-id" : "dummy"
     "blink-webhook-secret" : "dummy"
     "citrusrate-api-key" : "dummy"
-    "citrusrate-base-url" : "https://api.citrusrate.com"
     "pg-user-pw" : random_password.postgresql.result
   }
 }

dev/Tiltfile

@@ -7,4 +7,4 @@ include('./stablesats/Tiltfile')
 include('./kafka-connect/Tiltfile')
 include('./smoketest/Tiltfile')
 
-watch_settings(ignore=['**/charts/*.tgz', '**/tmpcharts-*'])
+watch_settings(ignore=['**/charts/*.tgz', '**/tmpcharts-*', '**/tmpcharts-*/**'])

dev/addons/Tiltfile

@@ -154,3 +154,41 @@ helm_release(
 )
 
 k8s_resource(workload='voucher', labels='addons')
+
+# blink-terminal
+k8s_yaml(secret_from_dict(
+  name='blink-terminal',
+  namespace=addons_namespace,
+  inputs={
+    "database-url" : "postgres://blink_terminal:blink_terminal@blink-terminal-postgresql:5432/blink_terminal",
+    "redis-password" : "",
+    "jwt-secret" : "dummy-jwt-secret-for-dev",
+    "encryption-key" : "dummy-encryption-key-for-dev",
+    "network-encryption-key" : "dummy-network-encryption-key",
+    "blinkpos-api-key" : "dummy",
+    "blinkpos-btc-wallet-id" : "dummy",
+    "blink-webhook-secret" : "dummy",
+    "citrusrate-api-key" : "dummy",
+    "pg-user-pw" : "blink_terminal"
+  }
+))
+
+helm_release(
+  '../../charts/blink-terminal',
+  name = 'blink-terminal',
+  namespace = addons_namespace,
+  values = ['./blink-terminal-values.yml'],
+  dependency_build=True,
+  add_repos=True
+)
+
+k8s_resource(workload='blink-terminal', labels='addons', port_forwards='3100:3000')
+
+k8s_yaml(secret_from_dict(
+  name='blink-terminal-smoketest',
+  namespace=smoketest_namespace,
+  inputs={
+    'blink_terminal_endpoint' : 'blink-terminal.{}.svc.cluster.local'.format(addons_namespace),
+    'blink_terminal_port'     : '3000'
+  }
+))

dev/addons/blink-terminal-values.yml

@@ -0,0 +1,16 @@
+secrets:
+  create: false
+
+blinkTerminal:
+  blinkApiUrl: "http://galoy-oathkeeper-proxy.galoy-dev-galoy.svc.cluster.local:4455/graphql"
+  blinkEnvironment: "development"
+  enableHybridStorage: "false"
+
+postgresql:
+  auth:
+    existingSecret: blink-terminal
+    secretKeys:
+      userPasswordKey: "pg-user-pw"
+  primary:
+    persistence:
+      enabled: false