fix: deploy rc scripts

Author: xgui3783

.github/workflows/docker-img.yml

@@ -16,6 +16,10 @@ env:
 
 jobs:
   build-docker-img:
+    outputs:
+      DOCKER_IMGSHA_SERVER: ${{ steps.dockerimg_sha.outputs.DOCKER_IMGSHA-server }}
+      DOCKER_IMGSHA_WORKER: ${{ steps.dockerimg_sha.outputs.DOCKER_IMGSHA-worker }}
+      DOCKER_IMGSHA_WORKER_V4: ${{ steps.dockerimg_sha.outputs.DOCKER_IMGSHA-worker-v4 }}
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
@@ -46,6 +50,16 @@ jobs:
         docker pull $cached_image || true
         docker build --build-arg GIT_HASH=$GIT_HASH -t siibra-api-tmp-img -f ${{ matrix.dockerfile }} .
 
+    - name: "Output"
+      id: dockerimg_sha
+      run: |
+        SHA=$(docker inspect \
+          --format='{{ index .RepoDigests 0 }}'\
+          siibra-api-tmp-img | sed -E 's/^.*?@//' -)
+        echo SHA:$SHA
+        echo "DOCKER_IMGSHA${{ matrix.tag_suffix }}=$SHA" >> "$GITHUB_OUTPUT"
+
+
     - name: "Tag and Push (rc)"
       if: ${{ contains(github.ref, 'rc') }}
       run: |
@@ -196,10 +210,15 @@ jobs:
   
   deploy-rc-via-helm:
     needs:
+    - build-docker-img
     - warmup-rc-at-helm
     - setup-envvar
     if:  ${{ github.event_name == 'release' && contains(github.ref, 'rc') }}
     runs-on: ubuntu-latest
+    env:
+      DOCKER_IMGSHA_SERVER: ${{ needs.build-docker-img.outputs.DOCKER_IMGSHA_SERVER }}
+      DOCKER_IMGSHA_WORKER: ${{ needs.build-docker-img.outputs.DOCKER_IMGSHA_WORKER }}
+      DOCKER_IMGSHA_WORKER_V4: ${{ needs.build-docker-img.outputs.DOCKER_IMGSHA_WORKER_V4 }}
     steps:
     - uses: actions/checkout@v4
     - uses: ./.github/workflows/composite-set-k8s-cred

.helm/deployments/prod/server.yaml

@@ -1,9 +1,9 @@
 sapi:
   flavor: "prod"
-  version: "0.3.22"
+  version: "0.3.23"
 
 image:
-  spec: 0.3.22-server
+  spec: 0.3.23-server
 
 # managed via adhoc k8s configs
 ingress:

.helm/deployments/prod/worker-compounds.yaml

@@ -1,10 +1,10 @@
 sapi:
   flavor: "prod"
-  version: "0.3.22"
+  version: "0.3.23"
   worker: "api.worker.app"
-  queue: "0.3.22.prod.compounds"
+  queue: "0.3.23.prod.compounds"
   resources:
     flavor: "high"
 
 image:
-  spec: 0.3.22-worker
+  spec: 0.3.23-worker

.helm/deployments/prod/worker-core.yaml

@@ -1,10 +1,10 @@
 sapi:
   flavor: "prod"
-  version: "0.3.22"
+  version: "0.3.23"
   worker: "api.worker.app"
-  queue: "0.3.22.prod.core"
+  queue: "0.3.23.prod.core"
   resources:
     flavor: "low"
 
 image:
-  spec: 0.3.22-worker
+  spec: 0.3.23-worker

.helm/deployments/prod/worker-features.yaml

@@ -1,10 +1,10 @@
 sapi:
   flavor: "prod"
-  version: "0.3.22"
+  version: "0.3.23"
   worker: "api.worker.app"
-  queue: "0.3.22.prod.features"
+  queue: "0.3.23.prod.features"
   resources:
     flavor: "high"
 
 image:
-  spec: 0.3.22-worker
+  spec: 0.3.23-worker

.helm/deployments/prod/worker-v4.yaml

@@ -1,10 +1,10 @@
 sapi:
   flavor: "prod"
-  version: "0.3.22"
+  version: "0.3.23"
   worker: ""
   queue: ""
   resources:
     flavor: "low"
 
 image:
-  spec: 0.3.22-worker-v4
+  spec: 0.3.23-worker-v4

.helm/deployments/rc/deploy.sh

@@ -10,31 +10,47 @@ do
     HELM_STATUS=$?
 
     helm_path=""
+    spec=""
     if [[ "$file" == *"server"* ]]
     then
         helm_path=.helm/siibra-api-v4-server/
+        spec=$DOCKER_IMGSHA_SERVER
     fi
 
     if [[ "$file" == *"worker"* ]]
     then
         helm_path=.helm/siibra-api-v4-worker/
+        spec="$DOCKER_IMGSHA_WORKER"
+        if [[ "$file" == *"worker-v4.yaml" ]]
+        then
+            spec="$DOCKER_IMGSHA_WORKER_V4"
+        fi
     fi
 
-    if [[ $helm_path == "" ]]
+    if [[ "$helm_path" == "" ]]
     then
         echo "$file does not match to any, skipping"
         continue
     fi
+    
+    if [[ "$spec" == "" ]]
+    then
+        echo "spec not set. Something went wrong."
+        exit 1
+    fi
 
     if [[ "$HELM_STATUS" == "0" ]]
     then
         echo "upgrading $prefix$file ..."
         helm upgrade -f $f \
+            --set spec=$spec \
             --history-max 3 \
             $prefix$file \
             $helm_path
     else
         echo "[NEW] installing $prefix$file ..."
-        helm install -f $f $prefix$file $helm_path
+        helm install -f $f \
+            --set spec=$spec \
+            $prefix$file $helm_path
     fi
 done

.helm/deployments/rc/server.yaml

@@ -2,5 +2,7 @@ sapi:
   flavor: "rc"
 
 image:
-  tag: rc-server
-  pullPolicy: Always
+  # n.b. need to define spec
+  # spec: sha256:e30afd3a150eac4d5f48b0abf69c16f88824c2d0eb33c2e612b406ae882d17a9
+  pullPolicy: Always
+  

.helm/deployments/rc/worker-compounds.yaml

@@ -1,8 +1,8 @@
 sapi:
   flavor: "rc"
-  version: "0.3.22"
+  version: "0.3.23"
   worker: "api.worker.app"
-  queue: "0.3.22.rc.compounds"
+  queue: "0.3.23.rc.compounds"
   resources:
     flavor: "high"
 

.helm/deployments/rc/worker-core.yaml

@@ -1,8 +1,8 @@
 sapi:
   flavor: "rc"
-  version: "0.3.22"
+  version: "0.3.23"
   worker: "api.worker.app"
-  queue: "0.3.22.rc.core"
+  queue: "0.3.23.rc.core"
   resources:
     flavor: "low"
 

.helm/deployments/rc/worker-features.yaml

@@ -1,8 +1,8 @@
 sapi:
   flavor: "rc"
-  version: "0.3.22"
+  version: "0.3.23"
   worker: "api.worker.app"
-  queue: "0.3.22.rc.features"
+  queue: "0.3.23.rc.features"
   resources:
     flavor: "high"
 

.helm/deployments/rc/worker-v4.yaml

@@ -1,6 +1,6 @@
 sapi:
   flavor: "rc"
-  version: "0.3.22"
+  version: "0.3.23"
   worker: ""
   queue: ""
   resources: