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.

Sign up for GitHub

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

Jump to bottom

chore: refactor ci for releases to remove certain artifacts #125

Merged
merged 3 commits into from
Jan 23, 2024
Merged

chore: refactor ci for releases to remove certain artifacts #125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
17b9125
chore: refactor ci for releases to remove core-istio package and remo…
zachariahmiller Jan 23, 2024
20131d5
chore: remove extra conditionals after omitting registry1 flavor from…
zachariahmiller Jan 23, 2024
810b1b6
chore: update deploy task with new bundle names
zachariahmiller Jan 23, 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
3 changes: 2 additions & 1 deletion .github/workflows/tag-and-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,8 @@ jobs:
run: uds run -f tasks/publish.yaml packages --set FLAVOR=${{ matrix.flavor }}

- name: Publish UDS Bundles
run: uds run -f tasks/publish.yaml bundles --set FLAVOR=${{ matrix.flavor }}
if: ${{ matrix.flavor != 'registry1' }}
run: uds run -f tasks/publish.yaml bundles

- name: Save logs
if: always()
Expand Down
2 changes: 1 addition & 1 deletion bundles/k3d-istio/uds-bundle.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
kind: UDSBundle
metadata:
name: k3d-core-istio
name: k3d-core-istio-dev
description: A UDS bundle for deploying Istio from UDS Core on a development cluster
# x-release-please-start-version
version: "0.9.1"
Expand Down
2 changes: 1 addition & 1 deletion bundles/k3d-standard/uds-bundle.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
kind: UDSBundle
metadata:
name: k3d-core
name: k3d-core-demo
description: A UDS bundle for deploying the standard UDS Core package on a development cluster
# x-release-please-start-version
version: "0.9.1"
Expand Down
4 changes: 2 additions & 2 deletions tasks/deploy.yaml
View file
Open in desktop
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-${UDS_ARCH}-${VERSION}.tar.zst --confirm --no-progress
cmd: uds deploy bundles/k3d-standard/uds-bundle-k3d-core-demo-${UDS_ARCH}-${VERSION}.tar.zst --confirm --no-progress

- name: k3d-istio-bundle
actions:
- description: "Deploy the UDS Core Istio Only Bundle"
cmd: uds deploy bundles/k3d-istio/uds-bundle-k3d-core-istio-${UDS_ARCH}-${VERSION}.tar.zst --confirm --no-progress
cmd: uds deploy bundles/k3d-istio/uds-bundle-k3d-core-istio-dev-${UDS_ARCH}-${VERSION}.tar.zst --confirm --no-progress

- name: single-package
actions:
Expand Down
22 changes: 6 additions & 16 deletions tasks/publish.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,9 @@ tasks:
cmd: |
set -e
zarf package publish build/zarf-package-core-amd64-${VERSION}.tar.zst ${TARGET_REPO}
zarf package publish build/zarf-package-core-istio-amd64-${VERSION}.tar.zst ${TARGET_REPO}

# dont publish arm64 for registry1 since IB images are only amd64
if [ "${FLAVOR}" != "registry1" ]; then
zarf package publish build/zarf-package-core-istio-arm64-${VERSION}.tar.zst ${TARGET_REPO}
zarf package publish build/zarf-package-core-arm64-${VERSION}.tar.zst ${TARGET_REPO}
fi

Expand All @@ -57,22 +55,14 @@ tasks:
- description: "Publish the bundles"
cmd: |
set -e
uds publish bundles/k3d-standard/uds-bundle-k3d-core-amd64-${VERSION}.tar.zst ${TARGET_REPO}/bundles/${FLAVOR} --no-progress
uds publish bundles/k3d-istio/uds-bundle-k3d-core-istio-amd64-${VERSION}.tar.zst ${TARGET_REPO}/bundles/${FLAVOR} --no-progress

# dont publish arm64 for registry1 since IB images are only amd64
if [ "${FLAVOR}" != "registry1" ]; then
uds publish bundles/k3d-standard/uds-bundle-k3d-core-arm64-${VERSION}.tar.zst ${TARGET_REPO}/bundles/${FLAVOR} --no-progress
uds publish bundles/k3d-istio/uds-bundle-k3d-core-istio-arm64-${VERSION}.tar.zst ${TARGET_REPO}/bundles/${FLAVOR} --no-progress
fi
uds publish bundles/k3d-standard/uds-bundle-k3d-core-demo-arm64-${VERSION}.tar.zst ${TARGET_REPO}/bundles --no-progress
uds publish bundles/k3d-istio/uds-bundle-k3d-core-istio-dev-arm64-${VERSION}.tar.zst ${TARGET_REPO}/bundles --no-progress
uds publish bundles/k3d-standard/uds-bundle-k3d-core-demo-amd64-${VERSION}.tar.zst ${TARGET_REPO}/bundles --no-progress
uds publish bundles/k3d-istio/uds-bundle-k3d-core-istio-dev-amd64-${VERSION}.tar.zst ${TARGET_REPO}/bundles --no-progress

- description: "Tag the latest bundles"
cmd: |
set -e
pkgPath="ghcr.io/defenseunicorns/packages/uds/bundles/${FLAVOR}/k3d-core"
# dont tag arm64 for registry1 since IB images are only amd64
if [ "${FLAVOR}" != "registry1" ]; then
zarf tools registry copy ${pkgPath}:${VERSION}-arm64 ${pkgPath}:arm64
fi

pkgPath="ghcr.io/defenseunicorns/packages/uds/bundles/k3d-core-demo"
zarf tools registry copy ${pkgPath}:${VERSION}-arm64 ${pkgPath}:arm64
zarf tools registry copy ${pkgPath}:${VERSION}-amd64 ${pkgPath}:amd64
Loading