Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(deps): update uds to v0.10.4 #228

Merged
merged 40 commits into from
May 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
f9ae3cc
chore(deps): update uds to v0.10.4
renovate[bot] May 8, 2024
ac41abc
adding --no-progress and --no-tea
TristanHoladay May 9, 2024
afce6bc
adding --no-progress and --no-tea
TristanHoladay May 9, 2024
c83f850
yamllint
TristanHoladay May 9, 2024
06b5aaa
remove double --no-progress flag
TristanHoladay May 9, 2024
40b386d
ls zarf cache
TristanHoladay May 9, 2024
e1a2a3a
ls zarf cache
TristanHoladay May 9, 2024
ef6cafb
yamllint
TristanHoladay May 9, 2024
9f63f50
check for identity config sha in zarf cache
TristanHoladay May 9, 2024
2ae492e
check for identity config sha in zarf cache
TristanHoladay May 9, 2024
9c53d05
try clear cache
TristanHoladay May 9, 2024
b78d998
remove zarf cache tests
TristanHoladay May 9, 2024
3afdbdd
revert to uds 0.10.1 for testing cache issue.
TristanHoladay May 9, 2024
2297420
back to 0.10.4 and remove create:slim-dev-package from all test
TristanHoladay May 9, 2024
fecfda3
testing slim-dev in core test after bundle create
TristanHoladay May 9, 2024
289310a
move create:slim-dev-package first
TristanHoladay May 9, 2024
b540e81
trying slim dev above standard again
TristanHoladay May 9, 2024
c8ed8b3
kick off again
TristanHoladay May 9, 2024
a57541a
remove ls
TristanHoladay May 9, 2024
4d2c503
slim above standard
TristanHoladay May 9, 2024
8820784
ls zarf cache images
TristanHoladay May 9, 2024
70acc69
switching back
TristanHoladay May 9, 2024
60a28a6
changing package references in slim dev package.
TristanHoladay May 9, 2024
b7592ee
fix package import in slim dev package
TristanHoladay May 9, 2024
2392239
yamllint
TristanHoladay May 9, 2024
20d48f3
adding debug to create:slim-dev-package
TristanHoladay May 9, 2024
a6ee6bf
Merge branch 'main' into renovate/uds
TristanHoladay May 9, 2024
eba463d
remove registry1 from matrix
TristanHoladay May 9, 2024
eaace5a
adding zarf clear cache to fix cache corruption bug.
TristanHoladay May 10, 2024
93a197c
Merge branch 'main' into renovate/uds
TristanHoladay May 10, 2024
34df0bd
revert test changes
TristanHoladay May 10, 2024
286fd58
remove create:slim-dev-package from test-uds-core
TristanHoladay May 10, 2024
bfdc91c
Merge branch 'main' into renovate/uds
TristanHoladay May 10, 2024
179916f
Merge branch 'main' into renovate/uds
TristanHoladay May 10, 2024
81b7df3
clear-cache before running validate in test-uds-core
TristanHoladay May 10, 2024
c33fad5
clear cache in uds-core-upgrade before validate
TristanHoladay May 10, 2024
2f624b2
fix not found task
TristanHoladay May 10, 2024
2a50265
Merge branch 'main' into renovate/uds
TristanHoladay May 10, 2024
75ccea6
Merge branch 'main' into renovate/uds
mjnagel May 10, 2024
c5ddaa6
add clear-cache after all creates in publish workflow
TristanHoladay May 13, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/actions/setup/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,4 @@ runs:
- name: Install UDS CLI
shell: bash
# renovate: datasource=github-tags depName=defenseunicorns/uds-cli versioning=semver
run: brew install defenseunicorns/tap/uds@0.9.2
run: brew install defenseunicorns/tap/uds@0.10.4
20 changes: 14 additions & 6 deletions .github/workflows/publish.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ jobs:
uses: ./.github/actions/setup

- name: Login to GHCR
run: uds run registry-login --set REGISTRY=ghcr.io --set REGISTRY_USERNAME=dummy --set REGISTRY_PASSWORD=${{ secrets.GITHUB_TOKEN }} --set REGISTRY_RETRY_INTERVAL=90
run: uds run registry-login --set REGISTRY=ghcr.io --set REGISTRY_USERNAME=dummy --set REGISTRY_PASSWORD=${{ secrets.GITHUB_TOKEN }} --set REGISTRY_RETRY_INTERVAL=90 --no-progress

- name: Login to registry1
run: uds run registry-login --set REGISTRY=registry1.dso.mil --set REGISTRY_USERNAME=${{ secrets.IRON_BANK_ROBOT_USERNAME }} --set REGISTRY_PASSWORD=${{ secrets.IRON_BANK_ROBOT_PASSWORD }} --set REGISTRY_RETRY_INTERVAL=90
run: uds run registry-login --set REGISTRY=registry1.dso.mil --set REGISTRY_USERNAME=${{ secrets.IRON_BANK_ROBOT_USERNAME }} --set REGISTRY_PASSWORD=${{ secrets.IRON_BANK_ROBOT_PASSWORD }} --set REGISTRY_RETRY_INTERVAL=90 --no-progress

- name: (Snapshot) Get snapshot version using git commit short sha and date
if: ${{ inputs.snapshot }}
Expand All @@ -50,15 +50,23 @@ 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 All @@ -74,19 +82,19 @@ jobs:

- name: Publish Standard Package
if: ${{ !inputs.snapshot }}
run: uds run -f tasks/publish.yaml standard-package --set FLAVOR=${{ matrix.flavor }}
run: uds run -f tasks/publish.yaml standard-package --set FLAVOR=${{ matrix.flavor }} --no-progress

- name: Publish Upstream Flavored Bundles
if: ${{ !inputs.snapshot && matrix.flavor != 'registry1' }}
run: uds run -f tasks/publish.yaml bundles
run: uds run -f tasks/publish.yaml bundles --no-progress

- name: (Snapshot) Publish Standard Package
if: ${{ inputs.snapshot }}
run: uds run -f tasks/publish.yaml standard-package --set FLAVOR=${{ matrix.flavor }} --set TARGET_REPO="ghcr.io/defenseunicorns/packages/uds/snapshots" --set VERSION="${SNAPSHOT_VERSION}"
run: uds run -f tasks/publish.yaml standard-package --set FLAVOR=${{ matrix.flavor }} --set TARGET_REPO="ghcr.io/defenseunicorns/packages/uds/snapshots" --set VERSION="${SNAPSHOT_VERSION}" --no-progress

- name: (Snapshot) Publish Upstream Flavored Bundles
if: ${{ inputs.snapshot && matrix.flavor != 'registry1' }}
run: uds run -f tasks/publish.yaml bundles --set TARGET_REPO="ghcr.io/defenseunicorns/packages/uds/snapshots" --set VERSION="${SNAPSHOT_VERSION}"
run: uds run -f tasks/publish.yaml bundles --set TARGET_REPO="ghcr.io/defenseunicorns/packages/uds/snapshots" --set VERSION="${SNAPSHOT_VERSION}" --no-progress

- name: Save logs
if: always()
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pull-request-conditionals.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ jobs:
- name: Install UDS CLI
shell: bash
# renovate: datasource=github-tags depName=defenseunicorns/uds-cli versioning=semver
run: brew install defenseunicorns/tap/uds@0.9.2
run: brew install defenseunicorns/tap/uds@0.10.4
- name: Run Formatting Checks
run: uds run lint-check
run: uds run lint-check --no-progress

# This job checks if there are changes in specific paths source packages.
check-paths:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/slim-dev-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
- name: Environment setup
uses: ./.github/actions/setup
- name: Deploy Slim Dev Bundle
run: uds run slim-dev
run: uds run slim-dev --no-progress
- name: Debug Output
if: ${{ always() }}
uses: ./.github/actions/debug-output
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/test-eks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,25 +41,25 @@ jobs:
uses: ./.github/actions/setup

- name: Install eksctl
run: uds run -f tasks/iac.yaml install-eksctl
run: uds run -f tasks/iac.yaml install-eksctl --no-progress

- name: Setup Terraform
uses: hashicorp/setup-terraform@v3
with:
terraform_version: "1.5.7"

- name: Create UDS Core Package
run: ZARF_ARCHITECTURE=amd64 uds run -f tasks/create.yaml standard-package
run: ZARF_ARCHITECTURE=amd64 uds run -f tasks/create.yaml standard-package --no-progress

- name: Create Core Bundle
run: uds create .github/bundles --confirm

- name: Create Cluster
run: uds run -f tasks/iac.yaml create-cluster
run: uds run -f tasks/iac.yaml create-cluster --no-progress
timeout-minutes: 60

- name: Create IAC
run: uds run -f tasks/iac.yaml create-iac
run: uds run -f tasks/iac.yaml create-iac --no-progress
timeout-minutes: 20

- name: Deploy Core Bundle
Expand All @@ -76,12 +76,12 @@ jobs:

- name: Remove IAC
if: always()
run: uds run -f tasks/iac.yaml destroy-iac
run: uds run -f tasks/iac.yaml destroy-iac --no-progress
timeout-minutes: 10
continue-on-error: true

- name: Teardown EKS cluster
if: always()
run: uds run -f tasks/iac.yaml destroy-cluster
run: uds run -f tasks/iac.yaml destroy-cluster --no-progress
timeout-minutes: 30
continue-on-error: true
10 changes: 5 additions & 5 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,22 +51,22 @@ jobs:
uses: ./.github/actions/setup

- name: Login to GHCR
run: uds run registry-login --set REGISTRY=ghcr.io --set REGISTRY_USERNAME=dummy --set REGISTRY_PASSWORD=${{ secrets.GITHUB_TOKEN }} --set REGISTRY_RETRY_INTERVAL=90
run: uds run registry-login --set REGISTRY=ghcr.io --set REGISTRY_USERNAME=dummy --set REGISTRY_PASSWORD=${{ secrets.GITHUB_TOKEN }} --set REGISTRY_RETRY_INTERVAL=90 --no-progress

- name: Login to registry1
run: uds run registry-login --set REGISTRY=registry1.dso.mil --set REGISTRY_USERNAME=${{ secrets.IRON_BANK_ROBOT_USERNAME }} --set REGISTRY_PASSWORD=${{ secrets.IRON_BANK_ROBOT_PASSWORD }} --set REGISTRY_RETRY_INTERVAL=90
run: uds run registry-login --set REGISTRY=registry1.dso.mil --set REGISTRY_USERNAME=${{ secrets.IRON_BANK_ROBOT_USERNAME }} --set REGISTRY_PASSWORD=${{ secrets.IRON_BANK_ROBOT_PASSWORD }} --set REGISTRY_RETRY_INTERVAL=90 --no-progress

- name: Test a single source package
if: ${{ inputs.package != 'all' && inputs.test_type == 'install' }}
run: uds run test-single-package --set FLAVOR=${{ inputs.flavor }}
run: uds run test-single-package --set FLAVOR=${{ inputs.flavor }} --no-progress

- name: Test UDS Core Install
if: ${{ inputs.package == 'all' && inputs.test_type == 'install' }}
run: uds run test-uds-core --set FLAVOR=${{ inputs.flavor }}
run: uds run test-uds-core --set FLAVOR=${{ inputs.flavor }} --no-progress

- name: Test UDS Core Upgrade
if: ${{ inputs.package == 'all' && inputs.test_type == 'upgrade' }}
run: uds run test-uds-core-upgrade --set FLAVOR=${{ inputs.flavor }}
run: uds run test-uds-core-upgrade --set FLAVOR=${{ inputs.flavor }} --no-progress

- name: Debug Output
if: ${{ always() }}
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.9.2/uds.schema.json": [
"https://raw.githubusercontent.com/defenseunicorns/uds-cli/v0.10.4/uds.schema.json": [
"uds-bundle.yaml"
],

// renovate: datasource=github-tags depName=defenseunicorns/uds-cli versioning=semver
"https://raw.githubusercontent.com/defenseunicorns/uds-cli/v0.9.2/tasks.schema.json": [
"https://raw.githubusercontent.com/defenseunicorns/uds-cli/v0.10.4/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.9.2/zarf.schema.json": [
"https://raw.githubusercontent.com/defenseunicorns/uds-cli/v0.10.4/zarf.schema.json": [
"zarf.yaml"
]
},
Expand Down
11 changes: 6 additions & 5 deletions packages/slim-dev/zarf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,26 +23,27 @@ components:
- name: istio-admin-gateway
required: true
import:
path: ../standard
path: ../../src/istio

- name: istio-tenant-gateway
required: true
import:
path: ../standard
path: ../../src/istio

- name: istio-passthrough-gateway
required: true
import:
path: ../standard
path: ../../src/istio

# Pepr the world
- name: pepr-uds-core
required: true
import:
path: ../standard
path: ../../dist
name: module

# Keycloak
- name: keycloak
required: true
import:
path: ../standard
path: ../../src/keycloak
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
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

- 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 --set=uds-k3d-dev.K3D_IMAGE=${K3D_IMAGE} --confirm --no-progress --no-tea

- name: single-package
actions:
Expand Down
3 changes: 2 additions & 1 deletion tasks/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ tasks:
description: "Build and test UDS Core"
actions:
- task: create:standard-package
- task: create:slim-dev-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,4 +40,5 @@ tasks:
- task: deploy:latest-package-release
- task: create:standard-package
- task: deploy:standard-package
- cmd: uds zarf tools clear-cache
- task: validate-packages