chore!: move to nix images (#4438)

* chore!: move to nix images * chore(deps): bump galoy image to 'sha256:d082389a7df48ebfcf975337a2b4ab6d869badbddb30a57b20a14c5a066e1fc2' * chore: bump images --------- Co-authored-by: CI Bot <[email protected]>
GaloyMoney · Oct 11, 2023 · ea106c0 · ea106c0
1 parent ff8a8d8
commit ea106c0
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 28 deletions.
diff --git a/charts/galoy/Chart.yaml b/charts/galoy/Chart.yaml
@@ -16,7 +16,7 @@ version: 0.23.0-dev
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
-appVersion: 0.14.3
+appVersion: 0.14.5
 dependencies:
   - name: redis
     repository: https://charts.bitnami.com/bitnami

diff --git a/charts/galoy/templates/api-deployment.yaml b/charts/galoy/templates/api-deployment.yaml
@@ -44,10 +44,6 @@ spec:
       containers:
       - name: api
         image: "{{ .Values.galoy.images.app.repository }}@{{ .Values.galoy.images.app.digest }}"
-        args:
-        - "-r"
-        - "/app/lib/services/tracing.js"
-        - "lib/servers/graphql-main-server.js"
         resources:
           {{ toYaml .Values.galoy.api.resources | nindent 10 }}
         ports:

diff --git a/charts/galoy/templates/exporter-deployment.yaml b/charts/galoy/templates/exporter-deployment.yaml
@@ -48,11 +48,7 @@ spec:
 
       containers:
       - name: exporter
-        image: "{{ .Values.galoy.images.app.repository }}@{{ .Values.galoy.images.app.digest }}"
-        args:
-        - "-r"
-        - "/app/lib/services/tracing.js"
-        - "lib/servers/exporter.js"
+        image: "{{ .Values.galoy.images.exporter.repository }}@{{ .Values.galoy.images.exporter.digest }}"
         resources:
           {{ toYaml .Values.galoy.exporter.resources | nindent 10 }}
         ports:

diff --git a/charts/galoy/templates/trigger-deployment.yaml b/charts/galoy/templates/trigger-deployment.yaml
@@ -43,11 +43,7 @@ spec:
 
       containers:
       - name: api
-        image: "{{ .Values.galoy.images.app.repository }}@{{ .Values.galoy.images.app.digest }}"
-        args:
-        - "-r"
-        - "/app/lib/services/tracing.js"
-        - "lib/servers/trigger.js"
+        image: "{{ .Values.galoy.images.trigger.repository }}@{{ .Values.galoy.images.trigger.digest }}"
         resources:
           {{ toYaml .Values.galoy.trigger.resources | nindent 10 }}
         ports:

diff --git a/charts/galoy/templates/websocket-deployment.yaml b/charts/galoy/templates/websocket-deployment.yaml
@@ -35,10 +35,6 @@ spec:
       containers:
       - name: websocket
         image: "{{ .Values.galoy.images.websocket.repository }}@{{ .Values.galoy.images.websocket.digest }}"
-        args:
-        - "-r"
-        - "/app/lib/services/tracing.js"
-        - "lib/servers/ws-server.js"
         resources:
           {{ toYaml .Values.galoy.websocket.resources | nindent 10 }}
         ports:

diff --git a/charts/galoy/values.yaml b/charts/galoy/values.yaml
@@ -33,23 +33,29 @@ galoy:
     ## Galoy Application Image details
     ##
     app:
-      ## Has api, trigger and exporter
-      ##
-      repository: us.gcr.io/galoy-org/galoy-app
+      repository: us.gcr.io/galoy-org/galoy-api
       ## Digest of the image
       ##
-      digest: "sha256:b8d2924fc016fdd5271c710e1fad258991caa1ca66cd59bacc753bd006394d48"
+      digest: "sha256:e75dc80eabd370da460471bee72d5475b6a438d094bee2fd5b0c28aab5209890"
       ## Not used by Helm, just used to ref to the source https://github.com/GaloyMoney/galoy.git
       ## Reference for timestamping the corresponding docker image and used by internal CI.
       ##
-      git_ref: "a11e548"
+      git_ref: "415e8c3"
     websocket:
-      ## Has websocket
+      repository: us.gcr.io/galoy-org/galoy-api-ws-server
+      ## Digest of the image
+      ##
+      digest: "sha256:2503e5f53329c2fd674339e43c32c561eb29a94f53c2f9a48312cc3f2e3c5550"
+    trigger:
+      repository: us.gcr.io/galoy-org/galoy-api-trigger
+      ## Digest of the image
       ##
-      repository: us.gcr.io/galoy-org/galoy-app-websocket
+      digest: "sha256:2bd3e626a2449d3498e02ebf8d0a98d7e9abc10df041fbce1f658dc5ecf21c72"
+    exporter:
+      repository: us.gcr.io/galoy-org/galoy-api-exporter
       ## Digest of the image
       ##
-      digest: "sha256:cf3a6cf6ead7657b1837ab533e1546e3d2e2eab57c700416488dda00068abea3"
+      digest: "sha256:adc58e26555f14fb841cbb45683bbfbda115545e107e5c2b4b6bf84e3a41fcfa"
     ## Galoy Application MongoDB Migration Image details
     ##
     mongodbMigrate:
@@ -58,7 +64,7 @@ galoy:
       repository: us.gcr.io/galoy-org/galoy-app-migrate
       ## Digest of the image
       ##
-      digest: "sha256:5f445ccb47f48b810b9e0e57f163577b3575148b8a3578ce5d9f4eb8598c3de5"
+      digest: "sha256:574fbb651aaf6e0286a1e9483ecd1e466d23fe427db9e363bd2e2bf0b324fa77"
     ## Galoy Application MongoDB Backup Image details
     ##
     mongoBackup:

diff --git a/flake.nix b/flake.nix
@@ -30,6 +30,7 @@
               ytt
               yq-go
               kubernetes-helm
+              terraform
             ];
 
             shellHook = ''
-Original file line number
+Diff line change
@@ Expand Up / @@ -30,6 +30,7 @@ @@
                   ytt
                   yq-go
                   kubernetes-helm
+                  terraform
                 ];
                 shellHook = ''
@@ Expand Down @@