From 3c84f14d3d9af385df68b55ed38a07f1af0f0948 Mon Sep 17 00:00:00 2001 From: Friedrich Date: Thu, 18 Jan 2024 16:23:09 +0100 Subject: [PATCH] Cherry pick changes to release workflow (#418) * Use correct job name in release workflow (#413) * Bump eventing-manager image version for 1.1.0 release * Use correct job name in release workflow * fix broken release workflow (#415) * fix the setting of env var PULL_BASE_REF in `Create release` (#416) * Correct `manager.yaml` name (#417) * Correct `manager.yaml` name * Correct the name of `manager.yaml` in all files --------- Co-authored-by: Carina Kothe <69976260+grischperl@users.noreply.github.com> --- .github/workflows/create-release.yml | 8 ++++---- README.md | 2 +- scripts/cleanup_modules.sh | 2 +- scripts/render_and_upload_manifests.sh | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml index c372a920..bf0b5f6f 100644 --- a/.github/workflows/create-release.yml +++ b/.github/workflows/create-release.yml @@ -35,7 +35,7 @@ jobs: create-draft: name: Create draft release - needs: verify-head-status + needs: verify-release runs-on: ubuntu-latest env: VERSION: ${{ needs.verify-release.outputs.VERSION }} @@ -58,7 +58,7 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: | - RELEASE_ID=$(./scripts/create_draft_release.sh $VERSION + RELEASE_ID=$(./scripts/create_draft_release.sh $VERSION) echo "release_id=$RELEASE_ID" >> $GITHUB_OUTPUT - name: Create lightweight tag @@ -71,7 +71,7 @@ jobs: - name: Create and upload eventing-manager.yaml and eventing-default-cr.yaml env: - PULL_BASE_REF: $VERSION + PULL_BASE_REF: ${{ needs.verify-release.outputs.VERSION }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} IMG: "europe-docker.pkg.dev/kyma-project/prod/eventing-manager:${VERSION}" MODULE_REGISTRY: "europe-docker.pkg.dev/kyma-project/prod/unsigned" @@ -81,7 +81,7 @@ jobs: publish-release: name: Publish release - needs: [verify-head-status, create-draft] + needs: [verify-release, create-draft] runs-on: ubuntu-latest steps: diff --git a/README.md b/README.md index a0c8f2c4..b064882b 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ You need a Kubernetes cluster to run against. You can use [k3d](https://k3d.io/) 2. To install the latest version of the default Eventing custom resource (CR) on your cluster, run: ```bash - kubectl apply -f https://github.com/kyma-project/eventing-manager/releases/latest/download/eventing_default_cr.yaml + kubectl apply -f https://github.com/kyma-project/eventing-manager/releases/latest/download/eventing-default-cr.yaml ``` ## Development diff --git a/scripts/cleanup_modules.sh b/scripts/cleanup_modules.sh index eca45182..7cb5491a 100755 --- a/scripts/cleanup_modules.sh +++ b/scripts/cleanup_modules.sh @@ -19,7 +19,7 @@ log::banner "Deleting all API Rules" kubectl delete --timeout=120s --wait=false -A apirules.gateway.kyma-project.io --all log::banner "Uninstalling Eventing module" -kubectl delete --timeout=120s --ignore-not-found -f https://github.com/kyma-project/eventing-manager/releases/latest/download/eventing_default_cr.yaml +kubectl delete --timeout=120s --ignore-not-found -f https://github.com/kyma-project/eventing-manager/releases/latest/download/eventing-default-cr.yaml make undeploy log::banner "Uninstalling NATS module" diff --git a/scripts/render_and_upload_manifests.sh b/scripts/render_and_upload_manifests.sh index 8ca2f33a..95196d0c 100755 --- a/scripts/render_and_upload_manifests.sh +++ b/scripts/render_and_upload_manifests.sh @@ -68,4 +68,4 @@ UPLOAD_URL="https://uploads.github.com/repos/kyma-project/eventing-manager/relea uploadFile "eventing-manager.yaml" "${UPLOAD_URL}?name=eventing-manager.yaml" # TODO completly remove the rendering of the module-template from the repository. # uploadFile "module-template.yaml" "${UPLOAD_URL}?name=module-template.yaml" -uploadFile "config/samples/default.yaml" "${UPLOAD_URL}?name=eventing_default_cr.yaml" +uploadFile "config/samples/default.yaml" "${UPLOAD_URL}?name=eventing-default-cr.yaml"