diff --git a/.github/actions/setup/action.yaml b/.github/actions/setup/action.yaml index 60eca6bce..141f57fab 100644 --- a/.github/actions/setup/action.yaml +++ b/.github/actions/setup/action.yaml @@ -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 diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 77cb5b219..59813acc2 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -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 }} @@ -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 @@ -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() diff --git a/.github/workflows/pull-request-conditionals.yaml b/.github/workflows/pull-request-conditionals.yaml index ccf8c0edd..d72f8699c 100644 --- a/.github/workflows/pull-request-conditionals.yaml +++ b/.github/workflows/pull-request-conditionals.yaml @@ -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: diff --git a/.github/workflows/slim-dev-test.yaml b/.github/workflows/slim-dev-test.yaml index cce0b767a..819ed3515 100644 --- a/.github/workflows/slim-dev-test.yaml +++ b/.github/workflows/slim-dev-test.yaml @@ -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 diff --git a/.github/workflows/test-eks.yaml b/.github/workflows/test-eks.yaml index a7bba6669..666d03a9e 100644 --- a/.github/workflows/test-eks.yaml +++ b/.github/workflows/test-eks.yaml @@ -41,7 +41,7 @@ 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 @@ -49,17 +49,17 @@ jobs: 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 @@ -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 diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 7f233978b..a2c7b08ee 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -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() }} diff --git a/.vscode/settings.json b/.vscode/settings.json index da5e9a3cd..51a172b8f 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.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" ] }, diff --git a/packages/slim-dev/zarf.yaml b/packages/slim-dev/zarf.yaml index e3b9d9acb..24d498579 100644 --- a/packages/slim-dev/zarf.yaml +++ b/packages/slim-dev/zarf.yaml @@ -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 diff --git a/tasks/deploy.yaml b/tasks/deploy.yaml index 82820b45e..9f296492e 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 --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: diff --git a/tasks/test.yaml b/tasks/test.yaml index 73c753576..bffdbd5bb 100644 --- a/tasks/test.yaml +++ b/tasks/test.yaml @@ -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 @@ -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