k8s: deploy (non-)worker pods in respective nodes

.env

@@ -1,6 +1,6 @@
-FAASM_VERSION=0.22.0
-FAASM_CLI_IMAGE=faasm.azurecr.io/cli:0.22.0
-FAASM_WORKER_IMAGE=faasm.azurecr.io/worker:0.22.0
+FAASM_VERSION=0.23.0
+FAASM_CLI_IMAGE=faasm.azurecr.io/cli:0.23.0
+FAASM_WORKER_IMAGE=faasm.azurecr.io/worker:0.23.0
 
 FAABRIC_VERSION=0.15.0
 FAABRIC_PLANNER_IMAGE=faasm.azurecr.io/planner:0.15.0

.github/workflows/azure.yml

@@ -35,7 +35,7 @@ jobs:
     env:
       CLUSTER_NAME_BASE: gha-cluster
       FAASM_INI_FILE: ./faasm.ini
-      FAASM_VERSION: 0.22.0
+      FAASM_VERSION: 0.23.0
       FAASM_WASM_VM: ${{ matrix.wasm_vm }}
     steps:
       - name: "Check out the experiment-base code"
@@ -56,7 +56,7 @@ jobs:
           ./bin/inv_wrapper.sh cluster.credentials --name ${{ env.CLUSTER_NAME }}
         working-directory: ${{ github.workspace }}/experiment-base
       - name: "Install faasmctl"
-        run: source ./bin/workon.sh && pip3 install faasmctl==0.33.1
+        run: source ./bin/workon.sh && pip3 install faasmctl==0.34.0
         working-directory: ${{ github.workspace }}/experiment-base
       - name: "Deploy Faasm on k8s cluster"
         run: source ./bin/workon.sh && faasmctl deploy.k8s --workers=4

.github/workflows/sgx_hw.yml

@@ -15,7 +15,7 @@ jobs:
     runs-on: self-hosted
     env:
       VM_BASE_NAME: gha-sgx-hw-vm
-      FAASM_VERSION: 0.22.0
+      FAASM_VERSION: 0.23.0
     steps:
       - name: "Check out the experiment-base code"
         uses: actions/checkout@v4

.github/workflows/tests.yml

@@ -21,15 +21,15 @@ env:
   CONAN_CACHE_MOUNT_SOURCE: .conan
   FAABRIC_VERSION: 0.15.0
   FAASM_INI_FILE: ./faasm.ini
-  FAASM_VERSION: 0.22.0
-  FAASMCTL_VERSION: 0.33.1
+  FAASM_VERSION: 0.23.0
+  FAASMCTL_VERSION: 0.34.0
 
 jobs:
   checks:
     if: github.event.pull_request.draft == false
     runs-on: ubuntu-latest
     container:
-      image: faasm.azurecr.io/cli:0.22.0
+      image: faasm.azurecr.io/cli:0.23.0
       credentials:
         username: ${{ secrets.ACR_SERVICE_PRINCIPAL_ID }}
         password: ${{ secrets.ACR_SERVICE_PRINCIPAL_PASSWORD }}
@@ -395,18 +395,18 @@ jobs:
       HOST_TYPE: ci
       IS_SGX_CI: true
     container:
-      image: faasm.azurecr.io/cli-sgx-sim:0.22.0
+      image: faasm.azurecr.io/cli-sgx-sim:0.23.0
       credentials:
         username: ${{ secrets.ACR_SERVICE_PRINCIPAL_ID }}
         password: ${{ secrets.ACR_SERVICE_PRINCIPAL_PASSWORD }}
     services:
       redis:
-        image: faasm.azurecr.io/redis:0.22.0
+        image: faasm.azurecr.io/redis:0.23.0
         credentials:
           username: ${{ secrets.ACR_SERVICE_PRINCIPAL_ID }}
           password: ${{ secrets.ACR_SERVICE_PRINCIPAL_PASSWORD }}
       minio:
-        image: faasm.azurecr.io/minio:0.22.0
+        image: faasm.azurecr.io/minio:0.23.0
         credentials:
           username: ${{ secrets.ACR_SERVICE_PRINCIPAL_ID }}
           password: ${{ secrets.ACR_SERVICE_PRINCIPAL_PASSWORD }}

VERSION

@@ -1 +1 @@
-0.22.0
+0.23.0

deploy/k8s-common/minio.yml

@@ -9,9 +9,18 @@ metadata:
     app: faasm
     role: minio
 spec:
+  affinity:
+    nodeAffinity:
+      requiredDuringSchedulingIgnoredDuringExecution:
+        nodeSelectorTerms:
+        - matchExpressions:
+          - key: faasm.io/role
+            operator: In
+            values:
+            - control
   containers:
     - name: minio-main
-      image: faasm.azurecr.io/minio:0.22.0
+      image: faasm.azurecr.io/minio:0.23.0
       env:
         - name: MINIO_ROOT_USER
           value: "minio"

deploy/k8s-common/planner.yml

@@ -9,6 +9,15 @@ metadata:
     app: faasm
     role: planner
 spec:
+  affinity:
+    nodeAffinity:
+      requiredDuringSchedulingIgnoredDuringExecution:
+        nodeSelectorTerms:
+        - matchExpressions:
+          - key: faasm.io/role
+            operator: In
+            values:
+            - control
   containers:
     - name: planner
       image: faasm.azurecr.io/planner:0.15.0

deploy/k8s-common/redis.yml

@@ -9,9 +9,18 @@ metadata:
     app: faasm
     role: redis-queue
 spec:
+  affinity:
+    nodeAffinity:
+      requiredDuringSchedulingIgnoredDuringExecution:
+        nodeSelectorTerms:
+        - matchExpressions:
+          - key: faasm.io/role
+            operator: In
+            values:
+            - control
   containers:
     - name: master
-      image: faasm.azurecr.io/redis:0.22.0
+      image: faasm.azurecr.io/redis:0.23.0
       ports:
         - containerPort: 6379
 
@@ -26,9 +35,18 @@ metadata:
     app: faasm
     role: redis-state
 spec:
+  affinity:
+    nodeAffinity:
+      requiredDuringSchedulingIgnoredDuringExecution:
+        nodeSelectorTerms:
+        - matchExpressions:
+          - key: faasm.io/role
+            operator: In
+            values:
+            - control
   containers:
     - name: master
-      image: faasm.azurecr.io/redis:0.22.0
+      image: faasm.azurecr.io/redis:0.23.0
       ports:
         - containerPort: 6379
 

deploy/k8s-sgx/upload.yml

@@ -9,9 +9,18 @@ metadata:
     app: faasm
     role: upload
 spec:
+  affinity:
+    nodeAffinity:
+      requiredDuringSchedulingIgnoredDuringExecution:
+        nodeSelectorTerms:
+        - matchExpressions:
+          - key: faasm.io/role
+            operator: In
+            values:
+            - control
   containers:
     - name: upload
-      image: faasm.azurecr.io/upload:0.22.0
+      image: faasm.azurecr.io/upload:0.23.0
       ports:
         - containerPort: 8002
         - containerPort: 5000

deploy/k8s-sgx/worker.yml

@@ -19,6 +19,16 @@ spec:
         role: worker
     spec:
       affinity:
+        # Require all worker pods to be scheduled in worker nodes
+        nodeAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            nodeSelectorTerms:
+            - matchExpressions:
+              - key: faasm.io/role
+                operator: In
+                values:
+                - worker
+        # If possible, give each pod a worker node in isolation
         podAntiAffinity:
           preferredDuringSchedulingIgnoredDuringExecution:
             - podAffinityTerm:
@@ -32,7 +42,7 @@ spec:
               weight: 100
 
       containers:
-        - image: faasm.azurecr.io/worker-sgx:0.22.0
+        - image: faasm.azurecr.io/worker-sgx:0.23.0
           name: faasm-worker
           ports:
             - containerPort: 8080

deploy/k8s-wamr/upload.yml

@@ -9,9 +9,18 @@ metadata:
     app: faasm
     role: upload
 spec:
+  affinity:
+    nodeAffinity:
+      requiredDuringSchedulingIgnoredDuringExecution:
+        nodeSelectorTerms:
+        - matchExpressions:
+          - key: faasm.io/role
+            operator: In
+            values:
+            - control
   containers:
     - name: upload
-      image: faasm.azurecr.io/upload:0.22.0
+      image: faasm.azurecr.io/upload:0.23.0
       ports:
         - containerPort: 8002
         - containerPort: 5000

deploy/k8s-wamr/worker.yml

@@ -19,6 +19,16 @@ spec:
         role: worker
     spec:
       affinity:
+        # Require all worker pods to be scheduled in worker nodes
+        nodeAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            nodeSelectorTerms:
+            - matchExpressions:
+              - key: faasm.io/role
+                operator: In
+                values:
+                - worker
+        # If possible, give each pod a worker node in isolation
         podAntiAffinity:
           preferredDuringSchedulingIgnoredDuringExecution:
             - podAffinityTerm:
@@ -32,7 +42,7 @@ spec:
               weight: 100
 
       containers:
-        - image: faasm.azurecr.io/worker:0.22.0
+        - image: faasm.azurecr.io/worker:0.23.0
           name: faasm-worker
           ports:
             - containerPort: 8080

deploy/k8s/upload.yml

@@ -9,9 +9,18 @@ metadata:
     app: faasm
     role: upload
 spec:
+  affinity:
+    nodeAffinity:
+      requiredDuringSchedulingIgnoredDuringExecution:
+        nodeSelectorTerms:
+        - matchExpressions:
+          - key: faasm.io/role
+            operator: In
+            values:
+            - control
   containers:
     - name: upload
-      image: faasm.azurecr.io/upload:0.22.0
+      image: faasm.azurecr.io/upload:0.23.0
       ports:
         - containerPort: 8002
         - containerPort: 5000

deploy/k8s/worker.yml

@@ -19,6 +19,16 @@ spec:
         role: worker
     spec:
       affinity:
+        # Require all worker pods to be scheduled in worker nodes
+        nodeAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+            nodeSelectorTerms:
+            - matchExpressions:
+              - key: faasm.io/role
+                operator: In
+                values:
+                - worker
+        # If possible, give each pod a worker node in isolation
         podAntiAffinity:
           preferredDuringSchedulingIgnoredDuringExecution:
             - podAffinityTerm:
@@ -32,7 +42,7 @@ spec:
               weight: 100
 
       containers:
-        - image: faasm.azurecr.io/worker:0.22.0
+        - image: faasm.azurecr.io/worker:0.23.0
           name: faasm-worker
           ports:
             - containerPort: 8080

requirements.txt

@@ -1,6 +1,6 @@
 black>=23.12.0
 breathe>=4.35.0
-faasmctl==0.33.1
+faasmctl==0.34.0
 flake8>=7.0.0
 invoke>=2.0.0
 myst_parser>=2.0.0