From f54f7732ab6343e61c647c8b1754306b106927d9 Mon Sep 17 00:00:00 2001 From: Robert Vasek Date: Tue, 25 Aug 2026 16:38:58 +0200 Subject: [PATCH 1/2] Fix image registry base It should be ghcr.io/kbind-dev On-behalf-of: @SAP robert.vasek@sap.com Signed-off-by: Robert Vasek --- Makefile | 5 ++--- README.md | 6 +++--- deploy/charts/backend-v2/values.yaml | 2 +- deploy/charts/konnector-v2/values.yaml | 2 +- hack/tilt/Tiltfile | 8 ++++---- pkg/konnectorinstall/install.go | 2 +- 6 files changed, 12 insertions(+), 13 deletions(-) diff --git a/Makefile b/Makefile index 603c6575f..021f2bc78 100644 --- a/Makefile +++ b/Makefile @@ -21,7 +21,7 @@ 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-v2 BACKEND_CHART ?= deploy/charts/backend-v2 -IMAGE ?= ghcr.io/kbind/konnector:dev +IMAGE ?= ghcr.io/kbind-dev/konnector:dev .PHONY: all all: codegen build @@ -54,7 +54,7 @@ cli-snapshot: image: docker build -t $(IMAGE) . -BACKEND_IMAGE ?= ghcr.io/kbind/backend:dev +BACKEND_IMAGE ?= ghcr.io/kbind-dev/backend:dev .PHONY: image-backend image-backend: docker build --target backend -t $(BACKEND_IMAGE) . @@ -161,7 +161,6 @@ HELM ?= helm HELM_REPO ?= ghcr.io/kbind-dev/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 diff --git a/README.md b/README.md index 1c06f7b31..b5f9cafef 100644 --- a/README.md +++ b/README.md @@ -194,10 +194,10 @@ The konnector runs in (or against) the **consumer** cluster — it is the only running component of the core (no backend, no provider-side controllers). ```sh -make image IMAGE=ghcr.io/kbind/konnector:dev # build the image +make image IMAGE=ghcr.io/kbind-dev/konnector:dev # build the image helm install konnector deploy/charts/konnector \ -n kbind --create-namespace \ - --set image.repository=ghcr.io/kbind/konnector --set image.tag=dev + --set image.repository=ghcr.io/kbind-dev/konnector --set image.tag=dev ``` The chart ([deploy/charts/konnector](deploy/charts/konnector)) ships the core @@ -220,7 +220,7 @@ The **backend** deploys on the provider with its own chart ([deploy/charts/backend](deploy/charts/backend)): ```sh -make image-backend BACKEND_IMAGE=ghcr.io/kbind/backend:dev +make image-backend BACKEND_IMAGE=ghcr.io/kbind-dev/backend:dev helm install backend deploy/charts/backend \ -n kbind-system --create-namespace \ --set externalURL=https://kbind.example.com \ diff --git a/deploy/charts/backend-v2/values.yaml b/deploy/charts/backend-v2/values.yaml index 4318b890e..8976d02f6 100644 --- a/deploy/charts/backend-v2/values.yaml +++ b/deploy/charts/backend-v2/values.yaml @@ -2,7 +2,7 @@ # **provider** cluster. image: - repository: ghcr.io/kbind/backend + repository: ghcr.io/kbind-dev/backend # Defaults to the chart appVersion when empty. tag: "" pullPolicy: IfNotPresent diff --git a/deploy/charts/konnector-v2/values.yaml b/deploy/charts/konnector-v2/values.yaml index 5151dfa6e..1f51cd900 100644 --- a/deploy/charts/konnector-v2/values.yaml +++ b/deploy/charts/konnector-v2/values.yaml @@ -1,7 +1,7 @@ # Default values for the konnector chart. image: - repository: ghcr.io/kbind/konnector + repository: ghcr.io/kbind-dev/konnector # Defaults to the chart appVersion when empty. tag: "" pullPolicy: IfNotPresent diff --git a/hack/tilt/Tiltfile b/hack/tilt/Tiltfile index 431512540..c6b0c8895 100644 --- a/hack/tilt/Tiltfile +++ b/hack/tilt/Tiltfile @@ -21,7 +21,7 @@ if k8s_context() != 'kind-kbind-provider': # ---------------------------------------------------------------- provider -- docker_build( - 'ghcr.io/kbind/backend', + 'ghcr.io/kbind-dev/backend', '../..', dockerfile='../../Dockerfile', target='backend', @@ -75,8 +75,8 @@ local_resource( local_resource( 'konnector-image', cmd=' && '.join([ - 'docker build --target konnector -t ghcr.io/kbind/konnector:tilt ../..', - 'kind load docker-image ghcr.io/kbind/konnector:tilt --name kbind-consumer', + 'docker build --target konnector -t ghcr.io/kbind-dev/konnector:tilt ../..', + 'kind load docker-image ghcr.io/kbind-dev/konnector:tilt --name kbind-consumer', ]), deps=['../../cmd/konnector', '../../engine', '../../sdk/apis', '../../go.mod'], labels=['consumer'], @@ -87,7 +87,7 @@ local_resource( cmd=' && '.join([ 'helm upgrade --install konnector ../../deploy/charts/konnector' + ' --kube-context kind-kbind-consumer --namespace kbind --create-namespace' - + ' --set image.repository=ghcr.io/kbind/konnector --set image.tag=tilt', + + ' --set image.repository=ghcr.io/kbind-dev/konnector --set image.tag=tilt', 'kubectl --context kind-kbind-consumer -n kbind rollout restart deployment/konnector', 'kubectl --context kind-kbind-consumer -n kbind rollout status deployment/konnector --timeout=120s', ]), diff --git a/pkg/konnectorinstall/install.go b/pkg/konnectorinstall/install.go index 8bbde7da4..614aefacf 100644 --- a/pkg/konnectorinstall/install.go +++ b/pkg/konnectorinstall/install.go @@ -39,7 +39,7 @@ import ( var manifests embed.FS // DefaultImage is the konnector image installed when none is specified. -const DefaultImage = "ghcr.io/kbind/konnector:latest" +const DefaultImage = "ghcr.io/kbind-dev/konnector:latest" // Manifests returns the full konnector install (CRDs first, then namespace, // RBAC and Deployment) as one YAML multi-doc with the image resolved. From 5bad294a2d691578d57f7adfaf5209ada5c457c5 Mon Sep 17 00:00:00 2001 From: Robert Vasek Date: Tue, 25 Aug 2026 16:38:58 +0200 Subject: [PATCH 2/2] Image tag should be prepended with `v` On-behalf-of: @SAP robert.vasek@sap.com Signed-off-by: Robert Vasek --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 021f2bc78..768f8efc0 100644 --- a/Makefile +++ b/Makefile @@ -161,6 +161,7 @@ HELM ?= helm HELM_REPO ?= ghcr.io/kbind-dev/charts VERSION ?= 0.0.0-dev CHART_VERSION ?= $(VERSION) +IMAGE_VERSION ?= v$(VERSION) HELM_CHARTS ?= konnector-v2 backend-v2 ## helm-push: Package and push Helm charts to $(HELM_REPO) as OCI artifacts