Skip to content

Commit ee3f1f0

Browse files
committed
update revew
1 parent 2521204 commit ee3f1f0

4 files changed

Lines changed: 30 additions & 20 deletions

File tree

Makefile

Lines changed: 19 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -409,33 +409,42 @@ build-web:
409409
PLATFORMS ?= linux/$(ARCH)
410410
.PHONY: image-local
411411
image-local:
412-
@echo "Building multi-arch images locally with tag $(REV) for platforms: $(PLATFORMS)"
412+
@echo "Building images locally with tag $(REV) for platforms: $(PLATFORMS)"
413413
@command -v docker >/dev/null 2>&1 || { echo "docker not found. Please install Docker"; exit 1; }
414414
@docker buildx version >/dev/null 2>&1 || { echo "docker buildx not found. Please enable buildx in Docker"; exit 1; }
415415

416416
@# Create buildx builder if it doesn't exist
417417
@docker buildx create --name kube-bind-builder --use 2>/dev/null || docker buildx use kube-bind-builder 2>/dev/null || true
418418
@docker buildx inspect --bootstrap >/dev/null 2>&1
419419

420-
@echo "Building konnector multi-arch image locally..."
420+
@# Check if building for multiple platforms
421+
@if [[ "$(PLATFORMS)" == *","* ]]; then \
422+
echo "Multi-platform build detected. Images will be pushed to registry instead of loaded locally."; \
423+
LOAD_FLAG="--push"; \
424+
else \
425+
echo "Single platform build. Images will be loaded to local Docker daemon."; \
426+
LOAD_FLAG="--load"; \
427+
fi && \
428+
\
429+
echo "Building konnector image..." && \
421430
docker buildx build \
422431
--platform $(PLATFORMS) \
423432
--build-arg LDFLAGS="$(LDFLAGS)" \
424433
-t $(IMAGE_REPO)/konnector:$(REV) \
425434
-f Dockerfile.konnector \
426-
--load .
427-
428-
@echo "Building backend multi-arch image locally..."
435+
$$LOAD_FLAG . && \
436+
\
437+
echo "Building backend image..." && \
429438
docker buildx build \
430439
--platform $(PLATFORMS) \
431440
--build-arg LDFLAGS="$(LDFLAGS)" \
432441
-t $(IMAGE_REPO)/backend:$(REV) \
433442
-f Dockerfile \
434-
--load .
435-
436-
@echo "Successfully built multi-arch local images:"
437-
@echo " $(IMAGE_REPO)/konnector:$(REV) ($(PLATFORMS))"
438-
@echo " $(IMAGE_REPO)/backend:$(REV) ($(PLATFORMS))"
443+
$$LOAD_FLAG . && \
444+
\
445+
echo "Successfully built images:" && \
446+
echo " $(IMAGE_REPO)/konnector:$(REV) ($(PLATFORMS))" && \
447+
echo " $(IMAGE_REPO)/backend:$(REV) ($(PLATFORMS))"
439448

440449
# Kind cluster configuration
441450
KIND_CLUSTER ?= kube-bind

docs/content/contributing/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ that might not be obvious to the contributor.
5353
### Approvers
5454

5555
Approvers are responsible for sign-off on the acceptance of the contribution. In essence, approval indicates that the
56-
change is desired and good for the project, aligns with code, api, and system conventions, and appears to follow all required
56+
change is desired and good for the project, aligns with code, API, and system conventions, and appears to follow all required
5757
process including adequate testing, documentation, follow ups, or notifications to other areas who might be interested
5858
or affected by the change.
5959

docs/content/developers/dev-environments.md

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ All the instructions assume you have already cloned the kube-bind repository and
311311
staticClients:
312312
- id: kube-bind
313313
redirectURIs:
314-
- 'http://${BACKEND_HOST_IP}:8080/callback'
314+
- 'http://${BACKEND_HOST_IP}:8080/api/callback'
315315
name: 'Kube Bind'
316316
secret: ZXhhbXBsZS1hcHAtc2VjcmV0
317317

@@ -386,13 +386,13 @@ All the instructions assume you have already cloned the kube-bind repository and
386386
create deployment mangodb \
387387
--image ghcr.io/kube-bind/backend:main \
388388
--port 8080 \
389-
-- /ko-app/backend \
389+
-- /bin/backend \
390390
--listen-address 0.0.0.0:8080 \
391391
--external-address "${BACKEND_KUBE_API_EXTERNAL_ADDRESS}" \
392392
--oidc-issuer-client-secret=ZXhhbXBsZS1hcHAtc2VjcmV0 \
393393
--oidc-issuer-client-id=kube-bind \
394394
--oidc-issuer-url=http://${BACKEND_HOST_IP}:5556/dex \
395-
--oidc-callback-url=http://${BACKEND_HOST_IP}:8080/callback \
395+
--oidc-callback-url=http://${BACKEND_HOST_IP}:8080/api/callback \
396396
--pretty-name="BigCorp.com" \
397397
--namespace-prefix="kube-bind-" \
398398
--cookie-signing-key=bGMHz7SR9XcI9JdDB68VmjQErrjbrAR9JdVqjAOKHzE= \
@@ -442,7 +442,7 @@ All the instructions assume you have already cloned the kube-bind repository and
442442
kind: Cluster
443443
name: app
444444
networking:
445-
apiServerAddress: ${APP_HOST_IP}
445+
apiServerAddress: ${APP_HOST_IP}
446446
EOF_AppClusterDefinition
447447
```
448448

@@ -498,12 +498,13 @@ All the instructions assume you have already cloned the kube-bind repository and
498498
apiVersion: mangodb.com/v1alpha1
499499
kind: MangoDB
500500
metadata:
501-
name: my-db
501+
name: my-db
502502
spec:
503-
tokenSecret: my-secret
504-
region: eu-west-1
505-
tier: Shared
503+
tokenSecret: my-secret
504+
region: eu-west-1
505+
tier: Shared
506506
EOF_MangoDBDefinition
507+
507508
kubectl describe mangodb my-db
508509
```
509510

docs/content/developers/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Developers
22

3-
Welcome to the kube-bind developer documentation! This section contains information for developers who want to contribute to the kube-bind project, including guides on setting up a development environment, understanding the architecture, and contributing code, and api documentation.
3+
Welcome to the kube-bind developer documentation! This section contains information for developers who want to contribute to the kube-bind project, including guides on setting up a development environment, understanding the architecture, and contributing code, and API documentation.
44

55
## Developer Guide
66

0 commit comments

Comments
 (0)