Skip to content
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
21 changes: 20 additions & 1 deletion .github/workflows/image.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
name: Image

# Build and push the konnector + backend images. Pushes only on tags:
# Build and push the konnector + backend images and Helm charts on tags:
# - tags v* -> ghcr.io/<owner>/konnector:<version>, ghcr.io/<owner>/backend:<version>
# - tags v* -> oci://ghcr.io/kbind/charts/{konnector-v2,backend-v2}:<version>
# No :latest or :<sha> tags — the image repo is shared with v1/main images.
on:
push:
Expand Down Expand Up @@ -47,3 +48,21 @@ jobs:
--push \
.
done

publish-chart:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2

- name: Install Helm
uses: azure/setup-helm@9bc31f4ebc9c6b171d7bfbaa5d006ae7abdb4310 # v5.0.1

- name: Log in to GHCR for Helm
run: echo "${{ secrets.GITHUB_TOKEN }}" | helm registry login ghcr.io --username ${{ github.actor }} --password-stdin

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

- name: Package and push Helm charts (OCI)
run: make helm-push VERSION=${{ steps.v.outputs.version }}
26 changes: 24 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ CONTROLLER_GEN ?= go run sigs.k8s.io/controller-tools/cmd/controller-gen@v0.17.2
GOLANGCI_LINT ?= golangci-lint
ENVTEST_K8S_VERSION ?= 1.34.1
SETUP_ENVTEST ?= go run sigs.k8s.io/controller-runtime/tools/setup-envtest@release-0.21
CHART ?= deploy/charts/konnector
BACKEND_CHART ?= deploy/charts/backend
CHART ?= deploy/charts/konnector-v2
BACKEND_CHART ?= deploy/charts/backend-v2
IMAGE ?= ghcr.io/kbind/konnector:dev

.PHONY: all
Expand Down Expand Up @@ -150,3 +150,25 @@ tilt-ci:
tilt-down:
kind delete cluster --name kbind-provider || true
kind delete cluster --name kbind-consumer || true

# Helm publishing parameters
HELM ?= helm
HELM_REPO ?= ghcr.io/kbind/charts
VERSION ?= 0.0.0-dev
CHART_VERSION ?= $(VERSION)
IMAGE_VERSION ?= $(VERSION)
HELM_CHARTS ?= konnector-v2 backend-v2

## helm-push: Package and push Helm charts to $(HELM_REPO) as OCI artifacts
.PHONY: helm-push
helm-push:
mkdir -p bin/charts
@for chart in $(HELM_CHARTS); do \
echo "==> packaging $$chart $(CHART_VERSION)"; \
$(HELM) package deploy/charts/$$chart \
--version $(CHART_VERSION) \
--app-version $(IMAGE_VERSION) \
--destination bin/charts || exit 1; \
echo "==> pushing $$chart-$(CHART_VERSION).tgz to oci://$(HELM_REPO)"; \
$(HELM) push bin/charts/$$chart-$(CHART_VERSION).tgz oci://$(HELM_REPO) || exit 1; \
done
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
apiVersion: v2
name: backend
name: backend-v2
description: kbind v2 backend — the optional provider-side service layer (gateway, issuer, reaper).
type: application

Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
apiVersion: v2
name: konnector
name: konnector-v2
description: kbind v2 slim-core konnector — the consumer-side sync engine.
type: application

Expand Down
2 changes: 1 addition & 1 deletion hack/e2e.sh
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ NO_BUILD=${NO_BUILD:-0}
HERE="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
ROOT="$(cd "${HERE}/.." && pwd)"
SAMPLES="${ROOT}/config/samples"
CHART="${ROOT}/deploy/charts/konnector"
CHART="${ROOT}/deploy/charts/konnector-v2"
PROVIDER_KC="$(mktemp -t kbind-e2e-provider.XXXXXX)"
CONSUMER_KC="$(mktemp -t kbind-e2e-consumer.XXXXXX)"
# Kubeconfig reachable from inside the consumer cluster (server = provider node's
Expand Down