Skip to content

Commit 434844b

Browse files
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
1 parent f1dba17 commit 434844b

File tree

7 files changed

+8
-18
lines changed

7 files changed

+8
-18
lines changed

.github/actions/setup/action.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ runs:
3030
- name: Install UDS CLI
3131
shell: bash
3232
# renovate: datasource=github-tags depName=defenseunicorns/uds-cli versioning=semver
33-
run: brew install defenseunicorns/tap/uds@0.10.4
33+
run: brew install defenseunicorns/tap/uds@0.11.0
3434

3535
- name: Iron Bank Login
3636
if: ${{ inputs.registry1Username != '' }}

.github/workflows/publish.yaml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -48,23 +48,15 @@ jobs:
4848
- name: Create Packages and Bundles
4949
run: |
5050
ZARF_ARCHITECTURE=amd64 uds run -f tasks/create.yaml standard-package --no-progress --set FLAVOR=${{ matrix.flavor }}
51-
uds zarf tools clear-cache
5251
ZARF_ARCHITECTURE=amd64 uds run -f tasks/create.yaml k3d-standard-bundle --no-progress
53-
uds zarf tools clear-cache
5452
ZARF_ARCHITECTURE=amd64 uds run -f tasks/create.yaml slim-dev-package --no-progress --set FLAVOR=${{ matrix.flavor }}
55-
uds zarf tools clear-cache
5653
ZARF_ARCHITECTURE=amd64 uds run -f tasks/create.yaml k3d-slim-dev-bundle --no-progress
57-
uds zarf tools clear-cache
5854
5955
if [ "${{ matrix.flavor }}" != "registry1" ]; then
6056
ZARF_ARCHITECTURE=arm64 uds run -f tasks/create.yaml standard-package --no-progress --set FLAVOR=${{ matrix.flavor }}
61-
uds zarf tools clear-cache
6257
ZARF_ARCHITECTURE=arm64 uds run -f tasks/create.yaml k3d-standard-bundle --no-progress
63-
uds zarf tools clear-cache
6458
ZARF_ARCHITECTURE=arm64 uds run -f tasks/create.yaml slim-dev-package --no-progress --set FLAVOR=${{ matrix.flavor }}
65-
uds zarf tools clear-cache
6659
ZARF_ARCHITECTURE=arm64 uds run -f tasks/create.yaml k3d-slim-dev-bundle --no-progress
67-
uds zarf tools clear-cache
6860
fi
6961
7062
# Standard Package by default tests what's in the Istio Package

.github/workflows/pull-request-conditionals.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ jobs:
3636
- name: Install UDS CLI
3737
shell: bash
3838
# renovate: datasource=github-tags depName=defenseunicorns/uds-cli versioning=semver
39-
run: brew install defenseunicorns/tap/uds@0.10.4
39+
run: brew install defenseunicorns/tap/uds@0.11.0
4040
- name: Run Formatting Checks
4141
run: uds run lint-check --no-progress
4242

.vscode/settings.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,18 @@
99
},
1010
"yaml.schemas": {
1111
// renovate: datasource=github-tags depName=defenseunicorns/uds-cli versioning=semver
12-
"https://raw.githubusercontent.com/defenseunicorns/uds-cli/v0.10.4/uds.schema.json": [
12+
"https://raw.githubusercontent.com/defenseunicorns/uds-cli/v0.11.0/uds.schema.json": [
1313
"uds-bundle.yaml"
1414
],
1515

1616
// renovate: datasource=github-tags depName=defenseunicorns/uds-cli versioning=semver
17-
"https://raw.githubusercontent.com/defenseunicorns/uds-cli/v0.10.4/tasks.schema.json": [
17+
"https://raw.githubusercontent.com/defenseunicorns/uds-cli/v0.11.0/tasks.schema.json": [
1818
"tasks.yaml",
1919
"tasks/**/*.yaml",
2020
"src/**/validate.yaml"
2121
],
2222
// renovate: datasource=github-tags depName=defenseunicorns/uds-cli versioning=semver
23-
"https://raw.githubusercontent.com/defenseunicorns/uds-cli/v0.10.4/zarf.schema.json": [
23+
"https://raw.githubusercontent.com/defenseunicorns/uds-cli/v0.11.0/zarf.schema.json": [
2424
"zarf.yaml"
2525
]
2626
},

tasks.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ variables:
55
- name: PKG
66

77
- name: K3D_IMAGE
8-
default: "ghcr.io/defenseunicorns/oss/uds-k3d-k3s:v1.29.4-k3s1"
8+
default: "rancher/k3s:v1.29.5-k3s1"
99

1010
includes:
1111
- create: ./tasks/create.yaml

tasks/deploy.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ tasks:
1111
- name: k3d-standard-bundle
1212
actions:
1313
- description: "Deploy the UDS Core Standard Bundle"
14-
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
14+
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
1515

1616
- name: k3d-slim-dev-bundle
1717
actions:
1818
- description: "Deploy the UDS Core Slim Dev Only Bundle"
19-
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
19+
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
2020

2121
- name: single-package
2222
actions:

tasks/test.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ tasks:
3030
- task: create:standard-package
3131
- task: create:k3d-standard-bundle
3232
- task: deploy:k3d-standard-bundle
33-
- cmd: uds zarf tools clear-cache
3433
- task: validate-packages
3534

3635
- name: uds-core-upgrade
@@ -40,5 +39,4 @@ tasks:
4039
- task: deploy:latest-package-release
4140
- task: create:standard-package
4241
- task: deploy:standard-package
43-
- cmd: uds zarf tools clear-cache
4442
- task: validate-packages

0 commit comments

Comments
 (0)