working on bundle/package/image

Author: gphorvath

.github/workflows/build-images.yaml

@@ -12,10 +12,6 @@ permissions:
   contents: read
   packages: write
 
-env:
-  K3S_TAG: ""
-  CUDA_TAG: ""
-
 jobs:
   build-and-publish-images:
     runs-on: ubuntu-latest
@@ -24,11 +20,9 @@ jobs:
       - name: Checkout Repo
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
 
-      - name: Read tags from config
-        id: read_tags
-        run: |
-          echo "K3S_TAG=$(jq -r .k3s_tag packages/k3d-gpu/version_config.json)" >> $GITHUB_ENV
-          echo "CUDA_TAG=$(jq -r .cuda_tag packages/k3d-gpu/version_config.json)" >> $GITHUB_ENV
+      - name: Version
+        id: get_version
+        uses: battila7/get-version-action@90eb8fc70f6dfcf3f9b95ed8f164d2c05038e729 # v2.2.1
 
       - name: Login to GitHub Container Registry
         uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d # v3.0.0
@@ -37,12 +31,19 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Build and Publish k3d-gpu
+      - name: Install Zarf
+        uses: defenseunicorns/setup-zarf@f95763914e20e493bb5d45d63e30e17138f981d6 # v1.0.0
+
+      - name: Build and Publish k3d-gpu image
         run: |
           docker build \
             --platform linux/amd64 \
-            --build-arg K3S_TAG=${{ env.K3S_TAG }} \
-            --build-arg CUDA_TAG=${{ env.CUDA_TAG }} \
-            -t ghcr.io/defenseunicorns/leapfrogai/k3d-gpu:latest \
+            -t ghcr.io/defenseunicorns/leapfrogai/k3d-gpu:${{ steps.get_version.outputs.version-without-v }} \
             -f packages/k3d-gpu/Dockerfile .
-          docker push ghcr.io/defenseunicorns/leapfrogai/k3d-gpu:latest
+          docker push ghcr.io/defenseunicorns/leapfrogai/k3d-gpu:${{ steps.get_version.outputs.version-without-v }}
+
+      - name: Build and Publish k3d-gpu package
+        run: |
+          zarf package create packages/k3d-gpu --set=VERSION=${{ steps.get_version.outputs.version-without-v }} --confirm
+          zarf package publish zarf-package-leapfrogai-k3d-gpu-amd64-${{ steps.get_version.outputs.version-without-v }}.tar.zst \
+            oci://ghcr.io/defenseunicorns/packages/leapfrogai

packages/k3d-gpu/Dockerfile

@@ -1,5 +1,5 @@
-ARG K3S_TAG
-ARG CUDA_TAG
+ARG K3S_TAG=v1.28.8-k3s1
+ARG CUDA_TAG=12.4.1-base-ubuntu22.04
 
 FROM rancher/k3s:$K3S_TAG AS k3s
 FROM nvidia/cuda:$CUDA_TAG

packages/k3d-gpu/Makefile

@@ -1,6 +1,6 @@
 MAKEFILE_DIR := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
 
-k3d-gpu-package:
+build-k3d-gpu:
 	@cd ${MAKEFILE_DIR} && \
 	uds zarf package create
 

packages/k3d-gpu/zarf-config.yaml

@@ -4,4 +4,6 @@ package:
       # x-release-please-start-version
       version: 0.9.1
       # x-release-please-end
-      reg_name: registry
+      uds_flavor: k3d-core-slim-dev
+      uds_version: 0.24.0
+      arch: amd64

packages/k3d-gpu/zarf.yaml

@@ -7,77 +7,26 @@ metadata:
   description: >
     k3d base image with GPU support
 
-variables:
-  - name: REG_PORT
-    description: "Local registry port"
-    default: "5000"
-  - name: UDS_CORE
-    description: "UDS Core version to use"
-    default: "k3d-core-slim-dev:0.24.0"
-  - name: K3S_TAG
-    description: "K3s version to use"
-    default: "v1.28.8-k3s1"
-  - name: CUDA_TAG
-    description: "CUDA version to use"
-    default: "12.4.1-base-ubuntu22.04"
-
 components:
-  - name: create-local-registry
+  - name: create-uds-cluster
     required: true
     actions:
-      onDeploy:
-        before:
-          - cmd: |
-              set +e
-              docker run -d --name ###ZARF_PKG_TMPL_REG_NAME### -p ${ZARF_VAR_REG_PORT}:5000 registry:2
-              set -e
-            description: "Start the local registry"
-      onRemove:
+      onCreate:
         before:
           - cmd: |
-              set +e
-              docker stop ###ZARF_PKG_TMPL_REG_NAME###
-              docker rm ###ZARF_PKG_TMPL_REG_NAME###
-              set -e
-            description: "Stop and remove the local registry"
+              uds pull ghcr.io/defenseunicorns/packages/uds/bundles/###ZARF_PKG_TMPL_UDS_FLAVOR###:###ZARF_PKG_TMPL_UDS_VERSION### -a ###ZARF_PKG_TMPL_ARCH###
+            description: "Pull the UDS K3D slim dev bundle"
 
-  - name: build-image
-    required: true
-    files:
-      - source: Dockerfile
-        target: Dockerfile
-      - source: plugin/device-plugin-daemonset.yaml
-        target: plugin/device-plugin-daemonset.yaml
-    actions:
-      onDeploy:
-        before:
           - cmd: |
-              docker build \
-                --platform linux/amd64 \
-                --build-arg K3S_TAG=${ZARF_VAR_K3S_TAG} \
-                --build-arg CUDA_TAG=${ZARF_VAR_CUDA_TAG} \
-                -t ghcr.io/defenseunicorns/leapfrogai/k3d-gpu:###ZARF_PKG_TMPL_VERSION### \
-                -f ./Dockerfile .
-
-              docker tag \
-                ghcr.io/defenseunicorns/leapfrogai/k3d-gpu:###ZARF_PKG_TMPL_VERSION### \
-                localhost:${ZARF_VAR_REG_PORT}/defenseunicorns/leapfrogai/k3d-gpu:###ZARF_PKG_TMPL_VERSION###
-            description: "Build the k3d-gpu image"
-        after:
-          - cmd:
-              docker push localhost:${ZARF_VAR_REG_PORT}/defenseunicorns/leapfrogai/k3d-gpu:###ZARF_PKG_TMPL_VERSION###
-            description: "Push the image to the local registry"
-
-  - name: create-cluster
-    required: true
-    actions:
+              docker pull ghcr.io/defenseunicorns/leapfrogai/k3d-gpu:###ZARF_PKG_TMPL_VERSION###
+            description: "Pull the k3d-gpu image"
       onDeploy:
         before:
           - cmd: |
-              uds deploy ${ZARF_VAR_UDS_CORE} \
+              uds deploy uds-bundle-###ZARF_PKG_TMPL_UDS_FLAVOR###-###ZARF_PKG_TMPL_ARCH###-###ZARF_PKG_TMPL_UDS_VERSION###.tar.zst \
                 --set K3D_EXTRA_ARGS="--gpus=all \
-                --image=localhost:${ZARF_VAR_REG_PORT}/defenseunicorns/leapfrogai/k3d-gpu:###ZARF_PKG_TMPL_VERSION###" \
-                --no-progress --insecure --confirm
+                --image=ghcr.io/defenseunicorns/leapfrogai/k3d-gpu:###ZARF_PKG_TMPL_VERSION###" \
+                --no-progress --confirm
             description: "Create a k3d cluster with GPU support"
       onRemove:
         before: