Skip to content

Commit

Permalink
fix: remove no-tea and update uds version (#446)
Browse files Browse the repository at this point in the history
## 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
  • Loading branch information
UnicornChance authored May 30, 2024
1 parent f1dba17 commit 434844b
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 18 deletions.
2 changes: 1 addition & 1 deletion .github/actions/setup/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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 != '' }}
Expand Down
8 changes: 0 additions & 8 deletions .github/workflows/publish.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pull-request-conditionals.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 3 additions & 3 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
]
},
Expand Down
2 changes: 1 addition & 1 deletion tasks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions tasks/deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 0 additions & 2 deletions tasks/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

0 comments on commit 434844b

Please sign in to comment.