Skip to content

Commit

Permalink
chore: refactor ci for releases to remove certain artifacts (#125)
Browse files Browse the repository at this point in the history
## Description
refactor ci for releases to remove core-istio package and remove
registry1 flavor of test bundles

## Related Issue

Fixes #
<!-- or -->
Relates to #

## Type of change

- [ ] Bug fix (non-breaking change which fixes an issue)
- [ ] New feature (non-breaking change which adds functionality)
- [x] Other (security config, docs update, etc)

## Checklist before merging

- [ ] Test, docs, adr added or updated as needed
- [ ] [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
zachariahmiller authored Jan 23, 2024
1 parent 5d54cd1 commit c08a062
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 21 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/tag-and-release.yml
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
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
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
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
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

0 comments on commit c08a062

Please sign in to comment.