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
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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) .
Expand Down Expand Up @@ -161,7 +161,7 @@ HELM ?= helm
HELM_REPO ?= ghcr.io/kbind-dev/charts
VERSION ?= 0.0.0-dev
CHART_VERSION ?= $(VERSION)
IMAGE_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
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 \
Expand Down
2 changes: 1 addition & 1 deletion deploy/charts/backend-v2/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion deploy/charts/konnector-v2/values.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
8 changes: 4 additions & 4 deletions hack/tilt/Tiltfile
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down Expand Up @@ -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'],
Expand All @@ -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',
]),
Expand Down
2 changes: 1 addition & 1 deletion pkg/konnectorinstall/install.go
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down