Skip to content

Commit

Permalink
Merge pull request #81 from kyma-project/workflow-korifi
Browse files Browse the repository at this point in the history
update workflows to use dynamic korifi ref
  • Loading branch information
szeort authored Oct 9, 2024
2 parents 98e7d9c + b63322e commit b3f3a5d
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
7 changes: 3 additions & 4 deletions .github/workflows/release-draft.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ on:
workflow_dispatch:

env:
V_KORIFI: '0.11.2'
REGISTRY: ghcr.io
IMAGE_NAME: ${{ github.repository }}

Expand All @@ -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'
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit b3f3a5d

Please sign in to comment.