Skip to content

Commit

Permalink
fix: release workflow k3d image (#316)
Browse files Browse the repository at this point in the history
## Description

Changes the release workflow deploy task to properly pick up the k3d
image default. Also reverts previously committed 0.18.0 updates.

## Related Issue

N/A

## 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
mjnagel authored Mar 29, 2024
1 parent 40e6b7b commit e7835e0
Show file tree
Hide file tree
Showing 11 changed files with 16 additions and 40 deletions.
4 changes: 1 addition & 3 deletions .github/workflows/tag-and-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,6 @@ jobs:
- name: Create release tag
id: tag
uses: google-github-actions/release-please-action@a37ac6e4f6449ce8b3f7607e4d97d0146028dc0b # v4
with:
command: manifest # use configs in release-please-config.json
- id: release-flag
run: echo "release_created=${{ steps.tag.outputs.release_created || false }}" >> $GITHUB_OUTPUT

Expand Down Expand Up @@ -63,7 +61,7 @@ jobs:
# Standard Package by default tests what's in the Istio Package
- name: Test amd64 Bundle
run: |
uds run -f tasks/deploy.yaml k3d-standard-bundle --no-progress
uds run deploy-standard-bundle --no-progress
uds run -f tasks/test.yaml validate-packages --no-progress
- name: Debug Output
Expand Down
2 changes: 1 addition & 1 deletion .release-please-manifest.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{
".": "0.18.0"
".": "0.17.0"
}
26 changes: 0 additions & 26 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,32 +2,6 @@

All notable changes to this project will be documented in this file.

## [0.18.0](https://github.com/defenseunicorns/uds-core/compare/v0.17.0...v0.18.0) (2024-03-29)


### Features

* switch loki to simple scalable ([#156](https://github.com/defenseunicorns/uds-core/issues/156)) ([1661b15](https://github.com/defenseunicorns/uds-core/commit/1661b154657eba1b30fc5bcec64179cbf6037c03))


### Bug Fixes

* add kubeapi egress for neuvector enforcer ([#291](https://github.com/defenseunicorns/uds-core/issues/291)) ([87fc886](https://github.com/defenseunicorns/uds-core/commit/87fc886bc736104a9a3c3aefc4c7d232ed74a4f2))
* pepr ironbank renovate update ([#299](https://github.com/defenseunicorns/uds-core/issues/299)) ([287e40d](https://github.com/defenseunicorns/uds-core/commit/287e40db5d65f7472a9e9216aae91f3ad92403d9))
* unwanted exemption deletions ([#290](https://github.com/defenseunicorns/uds-core/issues/290)) ([50b0cd4](https://github.com/defenseunicorns/uds-core/commit/50b0cd4211964a90139347558028d6c461956da9))


### Miscellaneous

* add debug output to release workflow ([#285](https://github.com/defenseunicorns/uds-core/issues/285)) ([5f96865](https://github.com/defenseunicorns/uds-core/commit/5f968651fb4f0da563d9c388efab761863f9ea08))
* **deps:** update dependency defenseunicorns/uds-common to v0.3.6 ([#261](https://github.com/defenseunicorns/uds-core/issues/261)) ([1b5398b](https://github.com/defenseunicorns/uds-core/commit/1b5398b7b778ead8ac3265080ae0bd2b5761066e))
* **deps:** update githubactions ([#242](https://github.com/defenseunicorns/uds-core/issues/242)) ([1eb2e2c](https://github.com/defenseunicorns/uds-core/commit/1eb2e2cd2018f0cd8fb55d8e6576b7e36fa8c3cf))
* **deps:** update pepr to v0.28.6 ([#300](https://github.com/defenseunicorns/uds-core/issues/300)) ([86b43e4](https://github.com/defenseunicorns/uds-core/commit/86b43e478521aa88a3a4843948ca96b9cbe55985))
* **deps:** update prometheus-stack ([#190](https://github.com/defenseunicorns/uds-core/issues/190)) ([f9a605a](https://github.com/defenseunicorns/uds-core/commit/f9a605a4c828128fc19f0bdb1d2443f65fb87b8a))
* **deps:** update uds-k3d to v0.6.0 ([#240](https://github.com/defenseunicorns/uds-core/issues/240)) ([6a26523](https://github.com/defenseunicorns/uds-core/commit/6a2652368fde3a3bdbe5bb81fd258830dfaeb5c8))
* **deps:** update velero ([#260](https://github.com/defenseunicorns/uds-core/issues/260)) ([f352008](https://github.com/defenseunicorns/uds-core/commit/f35200833a4d4d50de9f632f6918320f7d8fff5e))
* support headless keycloak admin user ([#307](https://github.com/defenseunicorns/uds-core/issues/307)) ([a0e51b6](https://github.com/defenseunicorns/uds-core/commit/a0e51b649822619b63478b140bb5dbbebeb20ff3))

## [0.17.0](https://github.com/defenseunicorns/uds-core/compare/v0.16.1...v0.17.0) (2024-03-22)


Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ If you want to try out UDS Core, you can use the [k3d-core-demo bundle](./bundle
<!-- x-release-please-start-version -->

```bash
uds deploy k3d-core-demo:0.18.0
uds deploy k3d-core-demo:0.17.0
```

<!-- x-release-please-end -->
Expand All @@ -67,7 +67,7 @@ Deploy Istio, Keycloak and Pepr:
<!-- x-release-please-start-version -->

```bash
uds deploy k3d-core-slim-dev:0.18.0
uds deploy k3d-core-slim-dev:0.17.0
```

<!-- x-release-please-end -->
Expand Down
4 changes: 2 additions & 2 deletions bundles/k3d-slim-dev/uds-bundle.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ metadata:
name: k3d-core-slim-dev
description: A UDS bundle for deploying Istio from UDS Core on a development cluster
# x-release-please-start-version
version: "0.18.0"
version: "0.17.0"
# x-release-please-end

packages:
Expand Down Expand Up @@ -36,7 +36,7 @@ packages:
- name: core-slim-dev
path: ../../build/
# x-release-please-start-version
ref: 0.18.0
ref: 0.17.0
# x-release-please-end
overrides:
istio-admin-gateway:
Expand Down
4 changes: 2 additions & 2 deletions bundles/k3d-standard/uds-bundle.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ metadata:
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.18.0"
version: "0.17.0"
# x-release-please-end

packages:
Expand Down Expand Up @@ -36,7 +36,7 @@ packages:
- name: core
path: ../../build/
# x-release-please-start-version
ref: 0.18.0
ref: 0.17.0
# x-release-please-end
overrides:
loki:
Expand Down
2 changes: 1 addition & 1 deletion packages/slim-dev/zarf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
description: "UDS Core (Istio, UDS Operator and Keycloak)"
authors: "Defense Unicorns - Product"
# x-release-please-start-version
version: "0.18.0"
version: "0.17.0"
# x-release-please-end

components:
Expand Down
2 changes: 1 addition & 1 deletion packages/standard/zarf.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ metadata:
description: "UDS Core"
authors: "Defense Unicorns - Product"
# x-release-please-start-version
version: "0.18.0"
version: "0.17.0"
# x-release-please-end

components:
Expand Down
4 changes: 4 additions & 0 deletions tasks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,10 @@ tasks:
actions:
- task: deploy:single-package

- name: deploy-standard-bundle
actions:
- task: deploy:k3d-standard-bundle

- name: test-single-package
actions:
- task: test:single-package
Expand Down
2 changes: 1 addition & 1 deletion tasks/deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ variables:
- name: VERSION
description: "The version of the packages to deploy"
# x-release-please-start-version
default: "0.18.0"
default: "0.17.0"
# x-release-please-end
- name: FLAVOR
default: upstream
Expand Down
2 changes: 1 addition & 1 deletion tasks/publish.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ variables:
- name: VERSION
description: "The version of the packages to build"
# x-release-please-start-version
default: "0.18.0"
default: "0.17.0"
# x-release-please-end

tasks:
Expand Down

0 comments on commit e7835e0

Please sign in to comment.