From 12784a30252e7863fdf586bf8c0641e834735dbd Mon Sep 17 00:00:00 2001 From: Rob Ferguson Date: Tue, 26 Mar 2024 11:06:28 -0500 Subject: [PATCH 1/2] ci: set custom k3s image --- tasks.yaml | 3 +++ tasks/setup.yaml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/tasks.yaml b/tasks.yaml index 4407a78f9..4dda2473f 100644 --- a/tasks.yaml +++ b/tasks.yaml @@ -4,6 +4,9 @@ variables: - name: PKG + - name: UDS_K3D_IMAGE + default: "ghcr.io/defenseunicorns/oss/uds-k3d-k3s:v1.28.7-k3s1" + includes: - create: ./tasks/create.yaml - setup: ./tasks/setup.yaml diff --git a/tasks/setup.yaml b/tasks/setup.yaml index d1e0d3a04..33ef78044 100644 --- a/tasks/setup.yaml +++ b/tasks/setup.yaml @@ -3,7 +3,7 @@ tasks: actions: - description: "Create the K3d cluster" # renovate: datasource=github-tags depName=defenseunicorns/uds-k3d versioning=semver - cmd: "uds zarf package deploy oci://defenseunicorns/uds-k3d:0.5.0 --confirm" + cmd: "uds zarf package deploy oci://defenseunicorns/uds-k3d:0.5.0 --set=K3D_IMAGE=${UDS_K3D_IMAGE} --confirm" - name: k3d-test-cluster actions: From a09b7d7c5cac173dc35f95360a0fd64aabfb7065 Mon Sep 17 00:00:00 2001 From: Rob Ferguson Date: Tue, 26 Mar 2024 14:04:46 -0500 Subject: [PATCH 2/2] update to use sets for package vars --- tasks.yaml | 2 +- tasks/deploy.yaml | 4 ++-- tasks/setup.yaml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tasks.yaml b/tasks.yaml index 4dda2473f..9a081813a 100644 --- a/tasks.yaml +++ b/tasks.yaml @@ -4,7 +4,7 @@ variables: - name: PKG - - name: UDS_K3D_IMAGE + - name: K3D_IMAGE default: "ghcr.io/defenseunicorns/oss/uds-k3d-k3s:v1.28.7-k3s1" includes: diff --git a/tasks/deploy.yaml b/tasks/deploy.yaml index e5e59e28a..05b1792cd 100644 --- a/tasks/deploy.yaml +++ b/tasks/deploy.yaml @@ -11,12 +11,12 @@ tasks: - name: k3d-standard-bundle actions: - description: "Deploy the UDS Core Standard Bundle" - cmd: uds deploy bundles/k3d-standard/uds-bundle-k3d-core-demo-${UDS_ARCH}-${VERSION}.tar.zst --confirm --no-progress + cmd: uds deploy bundles/k3d-standard/uds-bundle-k3d-core-demo-${UDS_ARCH}-${VERSION}.tar.zst --set=uds-k3d-dev.K3D_IMAGE=${K3D_IMAGE} --confirm --no-progress - name: k3d-slim-dev-bundle actions: - description: "Deploy the UDS Core Slim Dev Only Bundle" - cmd: uds deploy bundles/k3d-slim-dev/uds-bundle-k3d-core-slim-dev-${UDS_ARCH}-${VERSION}.tar.zst --confirm --no-progress + cmd: uds deploy bundles/k3d-slim-dev/uds-bundle-k3d-core-slim-dev-${UDS_ARCH}-${VERSION}.tar.zst --set=uds-k3d-dev.K3D_IMAGE=${K3D_IMAGE} --confirm --no-progress - name: single-package actions: diff --git a/tasks/setup.yaml b/tasks/setup.yaml index 33ef78044..d82a70361 100644 --- a/tasks/setup.yaml +++ b/tasks/setup.yaml @@ -3,7 +3,7 @@ tasks: actions: - description: "Create the K3d cluster" # renovate: datasource=github-tags depName=defenseunicorns/uds-k3d versioning=semver - cmd: "uds zarf package deploy oci://defenseunicorns/uds-k3d:0.5.0 --set=K3D_IMAGE=${UDS_K3D_IMAGE} --confirm" + cmd: "uds zarf package deploy oci://defenseunicorns/uds-k3d:0.5.0 --set=K3D_IMAGE=${K3D_IMAGE} --confirm" - name: k3d-test-cluster actions: