Skip to content

Commit

Permalink
fix: metadata has wrong ec version (#701)
Browse files Browse the repository at this point in the history
* fix: metadata has wrong versions in it

* f

* f

* f
  • Loading branch information
emosbaugh authored Jun 14, 2024
1 parent b911508 commit b58b9b8
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 1 deletion.
4 changes: 4 additions & 0 deletions .github/workflows/pull-request.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ jobs:
export LOCAL_ARTIFACT_MIRROR_IMAGE=registry.staging.replicated.com/library/embedded-cluster-local-artifact-mirror
make build-and-push-local-artifact-mirror-image VERSION="${SHORT_SHA}"
make build-and-push-local-artifact-mirror-image VERSION="${SHORT_SHA}-previous-k0s"
make build-and-push-local-artifact-mirror-image VERSION="${SHORT_SHA}-upgrade"
- name: Build Linux AMD64 and Output Metadata
run: |
Expand All @@ -75,6 +76,9 @@ jobs:
make -B embedded-cluster-linux-amd64 K0S_VERSION=$(make print-PREVIOUS_K0S_VERSION) VERSION="${SHORT_SHA}-previous-k0s"
tar -C output/bin -czvf embedded-cluster-linux-amd64-previous-k0s.tgz embedded-cluster
./output/bin/embedded-cluster version metadata > metadata-previous-k0s.json
make -B embedded-cluster-linux-amd64 VERSION="${SHORT_SHA}-upgrade"
tar -C output/bin -czvf embedded-cluster-linux-amd64-upgrade.tgz embedded-cluster
./output/bin/embedded-cluster version metadata > metadata-upgrade.json
make -B embedded-cluster-linux-amd64 VERSION="${SHORT_SHA}"
tar -C output/bin -czvf embedded-cluster-linux-amd64.tgz embedded-cluster
./output/bin/embedded-cluster version metadata > metadata.json
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/release-dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ jobs:
export LOCAL_ARTIFACT_MIRROR_IMAGE=registry.staging.replicated.com/library/embedded-cluster-local-artifact-mirror
make build-and-push-local-artifact-mirror-image VERSION="${SHORT_SHA}"
make build-and-push-local-artifact-mirror-image VERSION="${SHORT_SHA}-previous-k0s"
make build-and-push-local-artifact-mirror-image VERSION="${SHORT_SHA}-upgrade"
- name: Build Linux AMD64 and Output Metadata
run: |
Expand All @@ -42,6 +43,9 @@ jobs:
make -B embedded-cluster-linux-amd64 K0S_VERSION=$(make print-PREVIOUS_K0S_VERSION) VERSION="${SHORT_SHA}-previous-k0s"
tar -C output/bin -czvf embedded-cluster-linux-amd64-previous-k0s.tgz embedded-cluster
./output/bin/embedded-cluster version metadata > metadata-previous-k0s.json
make -B embedded-cluster-linux-amd64 VERSION="${SHORT_SHA}-upgrade"
tar -C output/bin -czvf embedded-cluster-linux-amd64-upgrade.tgz embedded-cluster
./output/bin/embedded-cluster version metadata > metadata-upgrade.json
make -B embedded-cluster-linux-amd64 VERSION="${SHORT_SHA}"
tar -C output/bin -czvf embedded-cluster-linux-amd64.tgz embedded-cluster
./output/bin/embedded-cluster version metadata > metadata.json
Expand Down
2 changes: 1 addition & 1 deletion scripts/create-upgrade-release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ function metadata() {
if [ -f metadata.json ]; then
sudo apt-get install jq -y

jq '(.Configs.charts[] | select(.name == "embedded-cluster-operator")).values += "resources:\n requests:\n cpu: 123m"' metadata.json > upgrade-metadata.json
jq '(.Configs.charts[] | select(.name == "embedded-cluster-operator")).values += "resources:\n requests:\n cpu: 123m"' metadata-upgrade.json > upgrade-metadata.json
cat upgrade-metadata.json

retry 3 aws s3 cp upgrade-metadata.json "s3://${S3_BUCKET}/metadata/${EC_VERSION}.json"
Expand Down

0 comments on commit b58b9b8

Please sign in to comment.