diff --git a/.github/workflows/release-draft.yml b/.github/workflows/release-draft.yml index d0df8cf..2294917 100644 --- a/.github/workflows/release-draft.yml +++ b/.github/workflows/release-draft.yml @@ -7,7 +7,6 @@ on: workflow_dispatch: env: - V_KORIFI: '0.11.2' REGISTRY: ghcr.io IMAGE_NAME: ${{ github.repository }} @@ -29,7 +28,7 @@ jobs: uses: actions/checkout@v3 with: repository: unified-runtime/korifi-trinity - ref: v${{ env.V_KORIFI }} + ref: ${{ vars.KORIFI_REF }} github-server-url: 'https://github.tools.sap' token: ${{ secrets.KORIFI_TRINITY_TOKEN }} path: '.korifi' @@ -43,14 +42,14 @@ jobs: - name: Create korifi release artifacts env: - VERSION: ${{ env.V_KORIFI }} + VERSION: ${{ vars.KORIFI_REF }} DOCKER_REGISTRY: ${{ env.REGISTRY }} DOCKER_REGISTRY_USER: ${{ github.actor }} DOCKER_REGISTRY_PASS: ${{ secrets.GITHUB_TOKEN }} shell: bash working-directory: '.korifi' run: | - ../scripts/create-korifi-release.sh ${{ env.V_KORIFI }} + ../scripts/create-korifi-release.sh ${{ vars.KORIFI_REF }} - name: set version run: echo "version=${GITHUB_REF_NAME#v}" >> $GITHUB_OUTPUT diff --git a/Makefile b/Makefile index 07715d9..5864672 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ VERSION ?= 0.0.0 #IMG ?= trinity.common.repositories.cloud.sap/kyma-module/cfapi-controller-$(VERSION) REGISTRY = ghcr.io IMG ?= kyma-project/cfapi/cfapi-controller -V_KORIFI ?= 0.11.2 +KORIFI_REF ?= v0.11.2 # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary. ENVTEST_K8S_VERSION = 1.24.1 @@ -83,7 +83,7 @@ run: manifests generate fmt vet ## Run a controller from your host. .PHONY: docker-build docker-build: ## Build docker image with the manager. - docker build -t ${REGISTRY}/${IMG} --build-arg TARGETARCH=amd64 --build-arg V_KORIFI=${V_KORIFI} . + docker build -t ${REGISTRY}/${IMG} --build-arg TARGETARCH=amd64 --build-arg V_KORIFI=${KORIFI_REF} . docker tag ${REGISTRY}/${IMG} ${VERSION} .PHONY: docker-push