From 434844b827e01808b504abf5ee6af83fba813cb6 Mon Sep 17 00:00:00 2001 From: Chance <139784371+UnicornChance@users.noreply.github.com> Date: Thu, 30 May 2024 10:15:31 -0600 Subject: [PATCH] fix: remove no-tea and update uds version (#446) ## Description Make necessary changes for latest uds release v0.11.0 ## Related Issue Fixes #445 ## Type of change - [x] Bug fix (non-breaking change which fixes an issue) - [ ] New feature (non-breaking change which adds functionality) - [ ] Other (security config, docs update, etc) ## Checklist before merging - [x] Test, docs, adr added or updated as needed - [x] [Contributor Guide Steps](https://github.com/defenseunicorns/uds-template-capability/blob/main/CONTRIBUTING.md)(https://github.com/defenseunicorns/uds-template-capability/blob/main/CONTRIBUTING.md#submitting-a-pull-request) followed --- .github/actions/setup/action.yaml | 2 +- .github/workflows/publish.yaml | 8 -------- .github/workflows/pull-request-conditionals.yaml | 2 +- .vscode/settings.json | 6 +++--- tasks.yaml | 2 +- tasks/deploy.yaml | 4 ++-- tasks/test.yaml | 2 -- 7 files changed, 8 insertions(+), 18 deletions(-) diff --git a/.github/actions/setup/action.yaml b/.github/actions/setup/action.yaml index eb9b6cb7c..c0dff9a4d 100644 --- a/.github/actions/setup/action.yaml +++ b/.github/actions/setup/action.yaml @@ -30,7 +30,7 @@ runs: - name: Install UDS CLI shell: bash # renovate: datasource=github-tags depName=defenseunicorns/uds-cli versioning=semver - run: brew install defenseunicorns/tap/uds@0.10.4 + run: brew install defenseunicorns/tap/uds@0.11.0 - name: Iron Bank Login if: ${{ inputs.registry1Username != '' }} diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index a78140303..a823e44b5 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -48,23 +48,15 @@ jobs: - name: Create Packages and Bundles run: | ZARF_ARCHITECTURE=amd64 uds run -f tasks/create.yaml standard-package --no-progress --set FLAVOR=${{ matrix.flavor }} - uds zarf tools clear-cache ZARF_ARCHITECTURE=amd64 uds run -f tasks/create.yaml k3d-standard-bundle --no-progress - uds zarf tools clear-cache ZARF_ARCHITECTURE=amd64 uds run -f tasks/create.yaml slim-dev-package --no-progress --set FLAVOR=${{ matrix.flavor }} - uds zarf tools clear-cache ZARF_ARCHITECTURE=amd64 uds run -f tasks/create.yaml k3d-slim-dev-bundle --no-progress - uds zarf tools clear-cache if [ "${{ matrix.flavor }}" != "registry1" ]; then ZARF_ARCHITECTURE=arm64 uds run -f tasks/create.yaml standard-package --no-progress --set FLAVOR=${{ matrix.flavor }} - uds zarf tools clear-cache ZARF_ARCHITECTURE=arm64 uds run -f tasks/create.yaml k3d-standard-bundle --no-progress - uds zarf tools clear-cache ZARF_ARCHITECTURE=arm64 uds run -f tasks/create.yaml slim-dev-package --no-progress --set FLAVOR=${{ matrix.flavor }} - uds zarf tools clear-cache ZARF_ARCHITECTURE=arm64 uds run -f tasks/create.yaml k3d-slim-dev-bundle --no-progress - uds zarf tools clear-cache fi # Standard Package by default tests what's in the Istio Package diff --git a/.github/workflows/pull-request-conditionals.yaml b/.github/workflows/pull-request-conditionals.yaml index abcf6560e..4ac0a6dbe 100644 --- a/.github/workflows/pull-request-conditionals.yaml +++ b/.github/workflows/pull-request-conditionals.yaml @@ -36,7 +36,7 @@ jobs: - name: Install UDS CLI shell: bash # renovate: datasource=github-tags depName=defenseunicorns/uds-cli versioning=semver - run: brew install defenseunicorns/tap/uds@0.10.4 + run: brew install defenseunicorns/tap/uds@0.11.0 - name: Run Formatting Checks run: uds run lint-check --no-progress diff --git a/.vscode/settings.json b/.vscode/settings.json index 51a172b8f..f49cde929 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -9,18 +9,18 @@ }, "yaml.schemas": { // renovate: datasource=github-tags depName=defenseunicorns/uds-cli versioning=semver - "https://raw.githubusercontent.com/defenseunicorns/uds-cli/v0.10.4/uds.schema.json": [ + "https://raw.githubusercontent.com/defenseunicorns/uds-cli/v0.11.0/uds.schema.json": [ "uds-bundle.yaml" ], // renovate: datasource=github-tags depName=defenseunicorns/uds-cli versioning=semver - "https://raw.githubusercontent.com/defenseunicorns/uds-cli/v0.10.4/tasks.schema.json": [ + "https://raw.githubusercontent.com/defenseunicorns/uds-cli/v0.11.0/tasks.schema.json": [ "tasks.yaml", "tasks/**/*.yaml", "src/**/validate.yaml" ], // renovate: datasource=github-tags depName=defenseunicorns/uds-cli versioning=semver - "https://raw.githubusercontent.com/defenseunicorns/uds-cli/v0.10.4/zarf.schema.json": [ + "https://raw.githubusercontent.com/defenseunicorns/uds-cli/v0.11.0/zarf.schema.json": [ "zarf.yaml" ] }, diff --git a/tasks.yaml b/tasks.yaml index 4c166497b..e01ce4443 100644 --- a/tasks.yaml +++ b/tasks.yaml @@ -5,7 +5,7 @@ variables: - name: PKG - name: K3D_IMAGE - default: "ghcr.io/defenseunicorns/oss/uds-k3d-k3s:v1.29.4-k3s1" + default: "rancher/k3s:v1.29.5-k3s1" includes: - create: ./tasks/create.yaml diff --git a/tasks/deploy.yaml b/tasks/deploy.yaml index 4dc2aa63f..9b34f8016 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 --no-tea + 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 --set=uds-k3d-dev.K3D_IMAGE=${K3D_IMAGE} --confirm --no-progress --no-tea + 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/test.yaml b/tasks/test.yaml index bffdbd5bb..7c66726d4 100644 --- a/tasks/test.yaml +++ b/tasks/test.yaml @@ -30,7 +30,6 @@ tasks: - task: create:standard-package - task: create:k3d-standard-bundle - task: deploy:k3d-standard-bundle - - cmd: uds zarf tools clear-cache - task: validate-packages - name: uds-core-upgrade @@ -40,5 +39,4 @@ tasks: - task: deploy:latest-package-release - task: create:standard-package - task: deploy:standard-package - - cmd: uds zarf tools clear-cache - task: validate-packages