Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Config korifi GitHub #85

Merged
merged 2 commits into from
Oct 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .github/workflows/build-korifi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ jobs:
- name: 'Checkout Korifi-Trinity'
uses: actions/checkout@v3
with:
repository: unified-runtime/korifi-trinity
ref: ${{ vars.KORIFI_REF }}
github-server-url: 'https://github.tools.sap'
repository: ${{ vars.KORIFI_GITHUB_REPOSITORY }}
ref: ${{ vars.KORIFI_GITHUB_REF }}
github-server-url: ${{ vars.KORIFI_GITHUB_SERVER }}
token: ${{ secrets.KORIFI_TRINITY_TOKEN }}
path: '.korifi'

Expand All @@ -38,14 +38,14 @@ jobs:

- name: Create korifi release artifacts
env:
VERSION: ${{ vars.KORIFI_REF }}
VERSION: ${{ vars.KORIFI_GITHUB_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 ${{ vars.KORIFI_REF }}
../scripts/create-korifi-release.sh ${{ vars.KORIFI_GITHUB_REF }}



12 changes: 6 additions & 6 deletions .github/workflows/release-draft.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ jobs:
- name: Checkout Korifi-Trinity
uses: actions/checkout@v3
with:
repository: unified-runtime/korifi-trinity
ref: ${{ vars.KORIFI_REF }}
github-server-url: 'https://github.tools.sap'
repository: ${{ vars.KORIFI_GITHUB_REPOSITORY }}
ref: ${{ vars.KORIFI_GITHUB_REF }}
github-server-url: ${{ vars.KORIFI_GITHUB_SERVER }}
token: ${{ secrets.KORIFI_TRINITY_TOKEN }}
path: '.korifi'

Expand All @@ -42,21 +42,21 @@ jobs:

- name: Create korifi release artifacts
env:
VERSION: ${{ vars.KORIFI_REF }}
VERSION: ${{ vars.KORIFI_GITHUB_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 ${{ vars.KORIFI_REF }}
../scripts/create-korifi-release.sh ${{ vars.KORIFI_GITHUB_REF }}

- name: set version
run: echo "version=${GITHUB_REF_NAME#v}" >> $GITHUB_OUTPUT
id: version

- name: docker build
run: VERSION=${{ steps.version.outputs.version }} KORIFI_REF=${{ vars.KORIFI_REF }} make docker-build
run: VERSION=${{ steps.version.outputs.version }} KORIFI_REF=${{ vars.KORIFI_GITHUB_REF }} make docker-build

- name: docker-push
run: VERSION=${{ steps.version.outputs.version }} make docker-push
Expand Down
16 changes: 8 additions & 8 deletions .github/workflows/run-kyma.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
name: Run-On-Kyma

on:
push:
branches: [ "main" ]
pull_request:
branches: [ "main" ]
#push:
# branches: [ "main" ]
#pull_request:
# branches: [ "main" ]
workflow_dispatch:

env:
Expand Down Expand Up @@ -38,9 +38,9 @@ jobs:
- name: 'Checkout Korifi-Trinity'
uses: actions/checkout@v3
with:
repository: unified-runtime/korifi-trinity
ref: v${{ env.V_KORIFI }}
github-server-url: 'https://github.tools.sap'
repository: ${{ vars.KORIFI_GITHUB_REPOSITORY }}
ref: ${{ vars.KORIFI_GITHUB_REF }}
github-server-url: ${{ vars.KORIFI_GITHUB_SERVER }}
token: ${{ secrets.KORIFI_TRINITY_TOKEN }}
path: '.korifi'

Expand All @@ -53,7 +53,7 @@ jobs:
shell: bash
working-directory: '.korifi'
run: |
../scripts/create-korifi-release.sh ${{ env.V_KORIFI }}
../scripts/create-korifi-release.sh ${{ vars.KORIFI_GITHUB_REF }}

- name: docker build
run: make docker-build
Expand Down
15 changes: 13 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
KORIFI_REF ?= v0.11.2
KORIFI_GITHUB_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=${KORIFI_REF} .
docker build -t ${REGISTRY}/${IMG} --build-arg TARGETARCH=amd64 --build-arg V_KORIFI=${KORIFI_GITHUB_REF} .
docker tag ${REGISTRY}/${IMG} ${VERSION}

.PHONY: docker-push
Expand All @@ -104,6 +104,17 @@ release: manifests kustomize
pushd config/manager && $(KUSTOMIZE) edit set image controller=$(IMG_SHA) && popd
$(KUSTOMIZE) build config/default > release-$(VERSION)/cfapi-manager.yaml

##@ Kubeconfig
.PHONY: kubeconfig
kubeconfig:
kubectl apply -f tools/kubeconfig/serviceaccount.yaml
kubectl wait --for=jsonpath='{.data.token}' secret/admin-serviceaccount
$(eval SA_TOKEN=$(kubectl get secret admin-serviceaccount -o=go-template='{{.data.token | base64decode}}'))
cp ~/.kube/config kubeconfig-sa.yaml
yq -i ".users |= [{\"name\":\"admin-serviceaccount\", \"user\": {\"token\":\"$SA_TOKEN\"}}]" kubeconfig-sa.yaml
yq -i ".contexts[0].context.user |= \"admin-serviceaccount\"" kubeconfig-sa.yaml


##@ Deployment

ifndef ignore-not-found
Expand Down