feat: support image building for arm64 (#4228)

Add support for building images for `linux/arm64` to be used when running sessions at CSCS.

Other changes include support for storing the `platform` of resource pools and for getting `platform` information about container images. These changes help support users who want to run sessions on `linux/arm64`.

Author: leafty

helm-chart/renku/requirements.yaml

@@ -18,11 +18,11 @@ dependencies:
     condition: enableV1Services
   - name: amalthea
     repository: "https://swissdatasciencecenter.github.io/helm-charts/"
-    version: "0.22.0"
+    version: "0.22.1"
     condition: enableV1Services
   - name: amalthea-sessions
     repository: "https://swissdatasciencecenter.github.io/helm-charts/"
-    version: "0.22.0"
+    version: "0.22.1"
   - name: dlf-chart
     repository: "https://swissdatasciencecenter.github.io/datashim/"
     version: "0.3.9-renku-2"

helm-chart/renku/templates/data-service/deployment.yaml

@@ -132,8 +132,10 @@ spec:
               value: {{ .Values.dataService.imageBuilders.enabled | quote }}
             - name: BUILD_OUTPUT_IMAGE_PREFIX
               value: {{ .Values.dataService.imageBuilders.outputImagePrefix | default "" | quote }}
-            - name: BUILD_VSCODIUM_PYTHON_RUN_IMAGE
-              value: {{ .Values.dataService.imageBuilders.vscodiumPythonRunImage | default "" | quote }}
+            - name: BUILD_BUILDER_IMAGE
+              value: {{ .Values.dataService.imageBuilders.builderImage | default "" | quote }}
+            - name: BUILD_RUN_IMAGE
+              value: {{ .Values.dataService.imageBuilders.runImage | default "" | quote }}
             - name: BUILD_STRATEGY_NAME
               value: {{ .Values.dataService.imageBuilders.strategyName | default "" | quote }}
             - name: BUILD_PUSH_SECRET_NAME
@@ -152,6 +154,10 @@ spec:
             - name: BUILD_NODE_TOLERATIONS
               value: {{ toJson . | quote }}
             {{- end }}
+            {{- with .Values.dataService.imageBuilders.platformOverrides }}
+            - name: BUILD_PLATFORM_OVERRIDES
+              value: {{ toJson . | quote }}
+            {{- end }}
             - name: V1_SESSIONS_ENABLED
               value: {{ .Values.ui.client.supportLegacySessions | default false | quote }}
             - name: ENABLE_INTERNAL_GITLAB

helm-chart/renku/values.yaml

@@ -581,7 +581,7 @@ ui:
     replicaCount: 1
     image:
       repository: renku/renku-ui
-      tag: "4.12.0"
+      tag: "4.13.0"
       pullPolicy: IfNotPresent
       ## Optionally specify an array of imagePullSecrets.
       ## Secrets must be manually created in the namespace.
@@ -765,7 +765,7 @@ ui:
     keepCookies: []
     image:
       repository: renku/renku-ui-server
-      tag: "4.12.0"
+      tag: "4.13.0"
       pullPolicy: IfNotPresent
     imagePullSecrets: []
     nameOverride: ""
@@ -1474,18 +1474,18 @@ dataService:
     create: true
   image:
     repository: renku/renku-data-service
-    tag: "0.61.0"
+    tag: "0.62.0"
     pullPolicy: IfNotPresent
   k8sWatcher:
     image:
       repository: renku/data-service-k8s-watcher
-      tag: "0.61.0"
+      tag: "0.62.0"
       pullPolicy: IfNotPresent
     resources: {}
   dataTasks:
     image:
       repository: renku/data-service-data-tasks
-      tag: "0.61.0"
+      tag: "0.62.0"
       pullPolicy: IfNotPresent
     resources: {}
   service:
@@ -1523,10 +1523,30 @@ dataService:
     enabled: false
     ## The container image prefix for images built from code
     outputImagePrefix: harbor.dev.renku.ch/renku-build/
-    ## The run image used for Python + VSCodium images
-    vscodiumPythonRunImage: renku/renkulab-vscodium-python-runimage:ubuntu-59fcea4
+    ## The builder image (see https://buildpacks.io/docs/for-platform-operators/concepts/builder/)
+    builderImage: "ghcr.io/swissdatasciencecenter/renku-frontend-buildpacks/selector:0.2.2"
+    ## The run image (see https://buildpacks.io/docs/for-platform-operators/concepts/base-images/)
+    runImage: "ghcr.io/swissdatasciencecenter/renku-frontend-buildpacks/run-image:0.2.2"
     ## The name of the BuildStrategy to use for image builds.
-    strategyName: renku-buildpacks
+    strategyName: renku-buildpacks-v3
+    ## Configuration overrides for specific target platforms
+    platformOverrides: {}
+      # linux/arm64:
+      #   builderImage: "ghcr.io/swissdatasciencecenter/renku-frontend-buildpacks/cuda-selector:0.2.2"
+      #   runImage: "ghcr.io/swissdatasciencecenter/renku-frontend-buildpacks/cuda-run-image:0.2.2"
+      #   strategyName: renku-buildpacks-v3
+      #   nodeSelector:
+      #     kubernetes.io/arch: arm64
+      #     renku.io/node-purpose: image-build
+      #   tolerations:
+      #     - effect: NoSchedule
+      #       key: renku.io/dedicated
+      #       operator: Equal
+      #       value: image-build
+      #     - effect: NoSchedule
+      #       key: renku.io/arch
+      #       operator: Equal
+      #       value: arm64
     ## The name of the secret used to push images built from code.
     pushSecretName: renku-build-docker-secret
     ## The TTL for BuildRuns
@@ -1583,7 +1603,7 @@ authz:
 secretsStorage:
   image:
     repository: renku/secrets-storage
-    tag: "0.61.0"
+    tag: "0.62.0"
     pullPolicy: IfNotPresent
   service:
     type: ClusterIP

helm-chart/values.yaml.changelog.md

@@ -11,6 +11,9 @@ Please follow this convention when adding a new row
   Legacy (v1) services are now deprecated in Renku and version 2.11 is the last Renku
   release where legacy services can be enabled. In the next Renku release (2.12),
   the `enableV1Services` chart value will be removed.
+* NEW `dataService.imageBuilders.builderImage`, sets the builder image used for Renku builds.
+* NEW `dataService.imageBuilders.runImage`, sets the run image used for Renku builds.
+* DELETE `dataService.imageBuilders.vscodiumPythonRunImage`, as it is replaced by `dataService.imageBuilders.runImage`.
 
 ## Upgrading to Renku 2.9.0