Cache prod and staging images for ubuntu-24.04 and dind

Author: luhenry

.github/workflows/deploy.yaml .github/workflows/release.yml.github/workflows/deploy.yaml renamed to .github/workflows/release.yml

@@ -2,19 +2,34 @@ name: Build, Push, and Deploy
 
 on:
   push:
-    branches: [main]
+    branches:
+      - main
+      - staging
+  pull_request:
+    branches:
+      - staging
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: ${{ github.ref != 'refs/heads/main' }}
+
+env:
+  REGISTRY: rg.fr-par.scw.cloud/funcscwriseriscvrunnerappqdvknz9s
+  IMAGE: riscv-runner
+  RELEASE_ENVIRONMENT: ${{ (github.ref == 'refs/heads/main' && 'prod') || (github.ref == 'refs/heads/staging' && 'staging') || '' }}
 
 jobs:
   build-and-deploy:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
 
       - name: Login to Scaleway Container Registry
         if: github.repository_owner == 'riseproject-dev'
         uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4.0.0
         with:
-          registry: rg.fr-par.scw.cloud/funcscwriseriscvrunnerappqdvknz9s
+          registry: ${{ env.REGISTRY }}
           username: nologin
           password: ${{ secrets.SCW_SECRET_KEY }}
 

Makefile

@@ -1,5 +1,6 @@
-IMAGE_REPO ?= rg.fr-par.scw.cloud/funcscwriseriscvrunnerappqdvknz9s/riscv-runner
-GOARCH     ?= riscv64
+REGISTRY ?= rg.fr-par.scw.cloud/funcscwriseriscvrunnerappqdvknz9s
+IMAGE    ?= riscv-runner
+GOARCH   ?= riscv64
 
 .PHONY: build
 build: build-device-plugin build-node-labeller
@@ -17,24 +18,24 @@ container-build: container-build-device-plugin container-build-node-labeller
 
 .PHONY: container-build-device-plugin
 container-build-device-plugin:
-	docker build --platform linux/riscv64 -f Dockerfile -t $(IMAGE_REPO):device-plugin-latest .
+	docker build --platform linux/riscv64 -f Dockerfile -t $(REGISTRY)/$(IMAGE):device-plugin-latest .
 
 .PHONY: container-build-node-labeller
 container-build-node-labeller:
-	docker build --platform linux/riscv64 -f labeller.Dockerfile -t $(IMAGE_REPO):node-labeller-latest .
+	docker build --platform linux/riscv64 -f labeller.Dockerfile -t $(REGISTRY)/$(IMAGE):node-labeller-latest .
 
 .PHONY: container-push
 container-push: container-push-device-plugin container-push-node-labeller
 
 .PHONY: container-push-device-plugin
 container-push-device-plugin:
-	docker build --platform linux/riscv64 -f Dockerfile -t $(IMAGE_REPO):device-plugin-latest .
-	docker push $(IMAGE_REPO):device-plugin-latest
+	docker build --platform linux/riscv64 -f Dockerfile -t $(REGISTRY)/$(IMAGE):device-plugin-latest .
+	docker push $(REGISTRY)/$(IMAGE):device-plugin-latest
 
 .PHONY: container-push-node-labeller
 container-push-node-labeller:
-	docker build --platform linux/riscv64 -f labeller.Dockerfile -t $(IMAGE_REPO):node-labeller-latest .
-	docker push $(IMAGE_REPO):node-labeller-latest
+	docker build --platform linux/riscv64 -f labeller.Dockerfile -t $(REGISTRY)/$(IMAGE):node-labeller-latest .
+	docker push $(REGISTRY)/$(IMAGE):node-labeller-latest
 
 .PHONY: kubectl-apply
 kubectl-apply: kubectl-apply-device-plugin kubectl-apply-node-labeller

k8s-ds-device-plugin.yaml

@@ -25,8 +25,20 @@ spec:
         kubernetes.io/arch: riscv64
       priorityClassName: system-node-critical
       initContainers:
-        - name: ubuntu-2404-image-cache
-          image: rg.fr-par.scw.cloud/funcscwriseriscvrunnerappqdvknz9s/riscv-runner:ubuntu-24.04-2.331.0
+        - name: ubuntu-2404-latest-image-cache
+          image: rg.fr-par.scw.cloud/funcscwriseriscvrunnerappqdvknz9s/riscv-runner:ubuntu-24.04-latest
+          imagePullPolicy: Always
+          command: ["true"]
+        - name: ubuntu-2404-staging-image-cache
+          image: rg.fr-par.scw.cloud/funcscwriseriscvrunnerappqdvknz9s/riscv-runner:ubuntu-24.04-staging
+          imagePullPolicy: Always
+          command: ["true"]
+        - name: dind-latest-image-cache
+          image: rg.fr-par.scw.cloud/funcscwriseriscvrunnerappqdvknz9s/riscv-runner:dind-latest
+          imagePullPolicy: Always
+          command: ["true"]
+        - name: dind-staging-image-cache
+          image: rg.fr-par.scw.cloud/funcscwriseriscvrunnerappqdvknz9s/riscv-runner:dind-staging
           imagePullPolicy: Always
           command: ["true"]
       containers: