Fix deployment to staging

.github/workflows/build-images.yml

@@ -8,15 +8,9 @@ on:
   workflow_dispatch:
   workflow_call:
     outputs:
-      api_image:
-        description: "The full API image tag"
-        value: ${{ jobs.build-api.outputs.image_tag }}
-      queue_image:
-        description: "The full Queue image tag"
-        value: ${{ jobs.build-queue.outputs.image_tag }}
-      ui_image:
-        description: "The full UI image tag"
-        value: ${{ jobs.build-ui.outputs.image_tag }}
+      image_tag:
+        description: "The tag for all images in this run"
+        value: ${{ jobs.setup.outputs.version }}
 
 jobs:
   setup:
@@ -34,11 +28,6 @@ jobs:
   build-api:
     needs: setup
     runs-on: ubuntu-latest
-    outputs:
-      image_tag: ${{ steps.image_tag.outputs.value }}
-    permissions:
-      contents: read
-      packages: write
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
@@ -76,11 +65,6 @@ jobs:
   build-queue:
     needs: setup
     runs-on: ubuntu-latest
-    outputs:
-      image_tag: ${{ steps.image_tag.outputs.value }}
-    permissions:
-      contents: read
-      packages: write
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
@@ -118,11 +102,6 @@ jobs:
   build-ui:
     needs: setup
     runs-on: ubuntu-latest
-    outputs:
-      image_tag: ${{ steps.image_tag.outputs.value }}
-    permissions:
-      contents: read
-      packages: write
     steps:
       - name: Checkout code
         uses: actions/checkout@v4

.github/workflows/build-web.yml → .github/workflows/build-ui.yml

@@ -1,4 +1,4 @@
-name: build web
+name: build ui
 
 on:
   push:
@@ -9,11 +9,6 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
-
-    defaults:
-      run:
-        working-directory: packages/web
-
     steps:
       - uses: actions/checkout@v4
 
@@ -24,14 +19,14 @@ jobs:
           cache: "yarn"
           cache-dependency-path: |
             yarn.lock
-            packages/web/yarn.lock
+            services/barn-ui/yarn.lock
 
       # Cache the build output directory
       - name: Cache build output
         uses: actions/cache@v4
         with:
           path: |
-            packages/web/.svelte-kit
+            services/barn-ui/.svelte-kit
           key: ${{ runner.os }}-web-build-${{ github.sha }}
           restore-keys: |
             ${{ runner.os }}-web-build-
@@ -42,7 +37,7 @@ jobs:
         with:
           path: |
             node_modules
-            packages/web/node_modules
+            services/barn-ui/node_modules
           key: ${{ runner.os }}-node-modules-${{ hashFiles('**/yarn.lock') }}
           restore-keys: |
             ${{ runner.os }}-node-modules-

.github/workflows/deploy-staging.yml

@@ -1,4 +1,4 @@
-name: Deploy to Staging
+name: deploy - staging
 
 on:
   workflow_dispatch:
@@ -14,25 +14,27 @@ jobs:
   deploy:
     runs-on: ubuntu-latest
     environment: staging
-
+    needs: build
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
 
       - name: Install doctl
         uses: digitalocean/action-doctl@v2
         with:
-          token: ${{ secrets.DIGITALOCEAN_ACCESS_TOKEN }}
+          token: ${{ secrets.DO_REGISTRY_KEY }}
 
       - name: Save DigitalOcean kubeconfig
         run: doctl kubernetes cluster kubeconfig save ${{ vars.CLUSTER_NAME }}
 
       - name: Update kustomization
         run: |
           cd k8s/overlays/staging
-          kustomize edit set image api=${{ needs.build.outputs.api_image }}
+          kustomize edit set image api=${{ secrets.DO_REGISTRY }}/${{ vars.API_IMAGE }}:${{ needs.build.outputs.image_tag }}
+          kustomize edit set image queue=${{ secrets.DO_REGISTRY }}/${{ vars.QUEUE_IMAGE }}:${{ needs.build.outputs.image_tag }}
+          kustomize edit set image ui=${{ secrets.DO_REGISTRY }}/${{ vars.UI_IMAGE }}:${{ needs.build.outputs.image_tag }}
 
       - name: Deploy to staging
         run: |
           kubectl apply -k k8s/overlays/staging
-          kubectl rollout status deployment/api -n staging
+          kubectl rollout status deployment/farmhand-api-staging -n staging --timeout=2m

README.md

@@ -1,7 +1,7 @@
 # farmhand
 
 [![build api](https://github.com/sneakycrow/farmhand/actions/workflows/build-api.yml/badge.svg)](https://github.com/sneakycrow/farmhand/actions/workflows/build-api.yml)
-[![build web](https://github.com/sneakycrow/farmhand/actions/workflows/build-web.yml/badge.svg)](https://github.com/sneakycrow/farmhand/actions/workflows/build-web.yml)
+[![build ui](https://github.com/sneakycrow/farmhand/actions/workflows/build-ui.yml/badge.svg)](https://github.com/sneakycrow/farmhand/actions/workflows/build-ui.yml)
 [![build queue](https://github.com/sneakycrow/farmhand/actions/workflows/build-queue.yml/badge.svg)](https://github.com/sneakycrow/farmhand/actions/workflows/build-queue.yml)
 
 Farmhand is a powerful, open-source clip and VOD management system built for creators and artists who want more control over their content.

config/queue.Dockerfile

@@ -40,5 +40,8 @@ RUN apt-get update && apt-get install -y \
 # Copy the binary from builder
 COPY --from=builder /usr/local/bin/forge /usr/local/bin/forge
 
+# Expose the health check server
+EXPOSE 8080
+
 # Set the entrypoint
 ENTRYPOINT ["/usr/local/bin/forge"]

k8s/base/api/configmap.yaml

@@ -3,4 +3,8 @@ kind: ConfigMap
 metadata:
   name: farmhand-api-config
 data:
+  FRONTEND_URL: "https://staging.farmhand.witchscrow.com"
+  RUST_LOG: "api=debug,db=debug,queue=debug,tower_http=debug,axum::rejection=trace"
+  FFMPEG_LOCATION: "/opt/homebrew/bin/ffmpeg" # TODO: Make this is the right path for docker context
+  TWITCH_REDIRECT_URI: "https://staging.api.farmhand.witchscrow.com/auth/twitch/callback"
   LOG_LEVEL: "api=debug"

k8s/base/api/deployment.yaml

@@ -18,7 +18,28 @@ spec:
             - containerPort: 3000
           envFrom:
             - configMapRef:
-                name: api-config
+                name: farmhand-api-config
+          env:
+            - name: DATABASE_URL
+              valueFrom:
+                secretKeyRef:
+                  name: farmhand-db
+                  key: uri
+            - name: TWITCH_CLIENT_ID
+              valueFrom:
+                secretKeyRef:
+                  name: twitch-credentials
+                  key: client-id
+            - name: TWITCH_CLIENT_SECRET
+              valueFrom:
+                secretKeyRef:
+                  name: twitch-credentials
+                  key: client-secret
+            - name: JWT_SECRET
+              valueFrom:
+                secretKeyRef:
+                  name: jwt
+                  key: secret
           resources:
             requests:
               cpu: "100m"

k8s/base/api/kustomization.yaml

@@ -5,8 +5,3 @@ resources:
   - deployment.yaml
   - service.yaml
   - configmap.yaml
-
-images:
-  - name: api
-    newName: placeholder
-    newTag: placeholder

k8s/base/queue/configmap.yaml

@@ -0,0 +1,6 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: farmhand-queue-config
+data:
+  LOG_LEVEL: "queue=debug"

k8s/base/queue/deployment.yaml

@@ -0,0 +1,40 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: farmhand-queue
+spec:
+  selector:
+    matchLabels:
+      app: farmhand-queue
+  template:
+    metadata:
+      labels:
+        app: farmhand-queue
+    spec:
+      containers:
+        - name: farmhand-queue
+          image: queue
+          ports:
+            - containerPort: 8080
+          envFrom:
+            - configMapRef:
+                name: farmhand-queue-config
+          env:
+            - name: DATABASE_URL
+              valueFrom:
+                secretKeyRef:
+                  name: farmhand-db
+                  key: uri
+          resources:
+            requests:
+              cpu: "100m"
+              memory: "256Mi"
+            limits:
+              cpu: "500m"
+              memory: "512Mi"
+          readinessProbe:
+            httpGet:
+              path: /health
+              port: 8080
+            initialDelaySeconds: 5
+            periodSeconds: 10

k8s/base/queue/kustomization.yaml

@@ -0,0 +1,6 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+resources:
+  - deployment.yaml
+  - configmap.yaml

k8s/base/ui/configmap.yaml

@@ -0,0 +1,6 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: farmhand-ui-config
+data:
+  API_URL: "https://staging.api.farmhand.witchscrow.com"

k8s/base/ui/deployment.yaml

@@ -0,0 +1,34 @@
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: farmhand-ui
+spec:
+  selector:
+    matchLabels:
+      app: farmhand-ui
+  template:
+    metadata:
+      labels:
+        app: farmhand-ui
+    spec:
+      containers:
+        - name: farmhand-ui
+          image: ui
+          ports:
+            - containerPort: 3000
+          envFrom:
+            - configMapRef:
+                name: farmhand-ui-config
+          resources:
+            requests:
+              cpu: "100m"
+              memory: "256Mi"
+            limits:
+              cpu: "500m"
+              memory: "512Mi"
+          readinessProbe:
+            httpGet:
+              path: /health
+              port: 3000
+            initialDelaySeconds: 5
+            periodSeconds: 10

k8s/base/ui/kustomization.yaml

@@ -0,0 +1,7 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+resources:
+  - deployment.yaml
+  - service.yaml
+  - configmap.yaml

k8s/base/ui/service.yaml

@@ -0,0 +1,11 @@
+apiVersion: v1
+kind: Service
+metadata:
+  name: farmhand-ui
+spec:
+  selector:
+    app: farmhand-ui
+  ports:
+    - port: 80
+      targetPort: 3000
+  type: ClusterIP