From 648409c1d43e57edeab480a6c6905cd29b9112ff Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 16 Jul 2024 19:59:19 +0000 Subject: [PATCH 1/3] chore(deps): update uds-k3d to v0.8.0 | datasource | package | from | to | | ----------- | ---------------------------------------- | ------ | ------ | | github-tags | defenseunicorns/uds-k3d | v0.7.0 | v0.8.0 | | docker | ghcr.io/defenseunicorns/packages/uds-k3d | 0.7.0 | 0.8.0 | --- bundles/k3d-slim-dev/uds-bundle.yaml | 2 +- bundles/k3d-standard/uds-bundle.yaml | 2 +- tasks/setup.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bundles/k3d-slim-dev/uds-bundle.yaml b/bundles/k3d-slim-dev/uds-bundle.yaml index e0b96a0b4..aa56cbff1 100644 --- a/bundles/k3d-slim-dev/uds-bundle.yaml +++ b/bundles/k3d-slim-dev/uds-bundle.yaml @@ -9,7 +9,7 @@ metadata: packages: - name: uds-k3d-dev repository: ghcr.io/defenseunicorns/packages/uds-k3d - ref: 0.7.0 + ref: 0.8.0 overrides: uds-dev-stack: minio: diff --git a/bundles/k3d-standard/uds-bundle.yaml b/bundles/k3d-standard/uds-bundle.yaml index 1a0a432a9..e6c1428de 100644 --- a/bundles/k3d-standard/uds-bundle.yaml +++ b/bundles/k3d-standard/uds-bundle.yaml @@ -9,7 +9,7 @@ metadata: packages: - name: uds-k3d-dev repository: ghcr.io/defenseunicorns/packages/uds-k3d - ref: 0.7.0 + ref: 0.8.0 overrides: uds-dev-stack: minio: diff --git a/tasks/setup.yaml b/tasks/setup.yaml index 7faff8b98..e6b97f172 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.7.0 --set=K3D_IMAGE=${K3D_IMAGE} --confirm --no-progress" + cmd: "uds zarf package deploy oci://defenseunicorns/uds-k3d:0.8.0 --set=K3D_IMAGE=${K3D_IMAGE} --confirm --no-progress" - name: k3d-test-cluster actions: From 879254eacd77c2f20eb965e2b7f1c4be9e9d101e Mon Sep 17 00:00:00 2001 From: Micah Nagel Date: Thu, 18 Jul 2024 20:13:15 -0600 Subject: [PATCH 2/3] chore: drop k3d image override --- tasks.yaml | 3 --- tasks/setup.yaml | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/tasks.yaml b/tasks.yaml index 75ee60243..733dcd98b 100644 --- a/tasks.yaml +++ b/tasks.yaml @@ -4,9 +4,6 @@ variables: - name: PKG - - name: K3D_IMAGE - default: "rancher/k3s:v1.29.5-k3s1" - includes: - create: ./tasks/create.yaml - setup: ./tasks/setup.yaml diff --git a/tasks/setup.yaml b/tasks/setup.yaml index e6b97f172..869fcc87e 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.8.0 --set=K3D_IMAGE=${K3D_IMAGE} --confirm --no-progress" + cmd: "uds zarf package deploy oci://defenseunicorns/uds-k3d:0.8.0 --confirm --no-progress" - name: k3d-test-cluster actions: From dc056274dddb961284a93dea2120590e1e1e4421 Mon Sep 17 00:00:00 2001 From: Micah Nagel Date: Thu, 18 Jul 2024 20:21:21 -0600 Subject: [PATCH 3/3] fix: extra cleanup --- tasks/deploy.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tasks/deploy.yaml b/tasks/deploy.yaml index b4deb8e64..a838d7488 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 --set=uds-k3d-dev.K3D_IMAGE=${K3D_IMAGE} --confirm --no-progress + cmd: uds deploy bundles/k3d-standard/uds-bundle-k3d-core-demo-${UDS_ARCH}-${VERSION}.tar.zst --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 --set=uds-k3d-dev.K3D_IMAGE=${K3D_IMAGE} --confirm --no-progress + cmd: uds deploy bundles/k3d-slim-dev/uds-bundle-k3d-core-slim-dev-${UDS_ARCH}-${VERSION}.tar.zst --confirm --no-progress - name: single-package actions: