From 86e2dba9e87acc639f2311e4dd687407265e717f Mon Sep 17 00:00:00 2001 From: "Nelo-T. Wallus" Date: Thu, 18 Sep 2025 14:15:21 +0200 Subject: [PATCH 1/9] Bump KCP to v0.28.1 Signed-off-by: Nelo-T. Wallus Signed-off-by: Nelo-T. Wallus --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index e6cbc227f..6d25cd60c 100644 --- a/Makefile +++ b/Makefile @@ -77,7 +77,7 @@ CODE_GENERATOR_BIN := code-generator CODE_GENERATOR := $(TOOLS_GOBIN_DIR)/$(CODE_GENERATOR_BIN)-$(CODE_GENERATOR_VER) export CODE_GENERATOR # so hack scripts can use it -KCP_VER := v0.28.0 +KCP_VER := v0.28.1 KCP_BIN := kcp KCP := $(TOOLS_GOBIN_DIR)/$(KCP_BIN)-$(KCP_VER) From 2227cad79a69bbedded7cfd6bbc824ab3cbfb282 Mon Sep 17 00:00:00 2001 From: "Nelo-T. Wallus" Date: Wed, 17 Sep 2025 09:45:43 +0200 Subject: [PATCH 2/9] Start KCP on localhost only Signed-off-by: Nelo-T. Wallus Signed-off-by: Nelo-T. Wallus --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 6d25cd60c..9cc5e4cff 100644 --- a/Makefile +++ b/Makefile @@ -273,7 +273,7 @@ test-e2e: WHAT ?= ./test/e2e... test-e2e: $(KCP) $(DEX) build ## Run e2e tests mkdir .kcp $(DEX) serve hack/dex-config-dev.yaml 2>&1 & DEX_PID=$$!; \ - $(KCP) start &>.kcp/kcp.log & KCP_PID=$$!; \ + $(KCP) start --bind-address=127.0.0.1 &>.kcp/kcp.log & KCP_PID=$$!; \ trap 'kill -TERM $$DEX_PID $$KCP_PID; rm -rf .kcp' TERM INT EXIT && \ echo "Waiting for kcp to be ready (check .kcp/kcp.log)." && while ! KUBECONFIG=.kcp/admin.kubeconfig kubectl get --raw /readyz &>/dev/null; do sleep 1; echo -n "."; done && echo && \ KUBECONFIG=$$PWD/.kcp/admin.kubeconfig GOOS=$(OS) GOARCH=$(ARCH) $(GO_TEST) -race -count $(COUNT) -p $(E2E_PARALLELISM) -parallel $(E2E_PARALLELISM) $(WHAT) $(TEST_ARGS) From 01fef7ce2d6e7590cefac13f08e60b50465f5028 Mon Sep 17 00:00:00 2001 From: "Nelo-T. Wallus" Date: Wed, 17 Sep 2025 09:50:41 +0200 Subject: [PATCH 3/9] Fix dex install in workdirs Signed-off-by: Nelo-T. Wallus Signed-off-by: Nelo-T. Wallus --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 9cc5e4cff..a037517eb 100644 --- a/Makefile +++ b/Makefile @@ -250,8 +250,8 @@ dex/bin/dex: dex $(DEX): mkdir -p $(TOOLS_DIR) - git clone --branch $(DEX_VER) --depth 1 https://github.com/dexidp/dex $(TOOLS_DIR)/dex-clone-$(DEX_VER) - cd $(TOOLS_DIR)/dex-clone-$(DEX_VER) && make build + git clone --branch $(DEX_VER) --depth 1 https://github.com/dexidp/dex $(TOOLS_DIR)/dex-clone-$(DEX_VER) || true + cd $(TOOLS_DIR)/dex-clone-$(DEX_VER) && GOWORK=off make build cp -a $(TOOLS_DIR)/dex-clone-$(DEX_VER)/bin/dex $(DEX) $(KCP): From 416d805e57d6232b571ec23784119719bbac8a9b Mon Sep 17 00:00:00 2001 From: "Nelo-T. Wallus" Date: Wed, 17 Sep 2025 10:31:10 +0200 Subject: [PATCH 4/9] Formatting Signed-off-by: Nelo-T. Wallus Signed-off-by: Nelo-T. Wallus --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index a037517eb..3b0c07580 100644 --- a/Makefile +++ b/Makefile @@ -128,9 +128,9 @@ build: require-jq require-go require-git verify-go-versions ## Build the project mkdir -p $(GOBIN_DIR) set -x; for W in $(WHAT); do \ pushd . && cd $${W%..}; \ - GOOS=$(OS) GOARCH=$(ARCH) CGO_ENABLED=0 go build $(BUILDFLAGS) -ldflags="$(LDFLAGS)" -o $(GOBIN_DIR) ./...; \ + GOOS=$(OS) GOARCH=$(ARCH) CGO_ENABLED=0 go build $(BUILDFLAGS) -ldflags="$(LDFLAGS)" -o $(GOBIN_DIR) ./...; \ popd; \ - done + done .PHONY: build install: WHAT ?= ./cmd/... ./cli/cmd/... From 70c87078d7242ec745d60e7e004e18cd2e0bca2b Mon Sep 17 00:00:00 2001 From: "Nelo-T. Wallus" Date: Wed, 17 Sep 2025 10:31:21 +0200 Subject: [PATCH 5/9] Add KCP_CMD Signed-off-by: Nelo-T. Wallus Signed-off-by: Nelo-T. Wallus --- Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 3b0c07580..a5b2b7073 100644 --- a/Makefile +++ b/Makefile @@ -80,6 +80,7 @@ export CODE_GENERATOR # so hack scripts can use it KCP_VER := v0.28.1 KCP_BIN := kcp KCP := $(TOOLS_GOBIN_DIR)/$(KCP_BIN)-$(KCP_VER) +KCP_CMD ?= $(KCP) DEX_VER := v2.43.1 DEX_BIN := dex @@ -261,7 +262,7 @@ $(KCP): mv $(TOOLS_DIR)/kcp $(KCP) run-kcp: $(KCP) - $(KCP) start + $(KCP_CMD) start --bind-address=127.0.0.1 .PHONY: test-e2e ifdef USE_GOTESTSUM @@ -273,7 +274,7 @@ test-e2e: WHAT ?= ./test/e2e... test-e2e: $(KCP) $(DEX) build ## Run e2e tests mkdir .kcp $(DEX) serve hack/dex-config-dev.yaml 2>&1 & DEX_PID=$$!; \ - $(KCP) start --bind-address=127.0.0.1 &>.kcp/kcp.log & KCP_PID=$$!; \ + $(MAKE) run-kcp &>.kcp/kcp.log & KCP_PID=$$!; \ trap 'kill -TERM $$DEX_PID $$KCP_PID; rm -rf .kcp' TERM INT EXIT && \ echo "Waiting for kcp to be ready (check .kcp/kcp.log)." && while ! KUBECONFIG=.kcp/admin.kubeconfig kubectl get --raw /readyz &>/dev/null; do sleep 1; echo -n "."; done && echo && \ KUBECONFIG=$$PWD/.kcp/admin.kubeconfig GOOS=$(OS) GOARCH=$(ARCH) $(GO_TEST) -race -count $(COUNT) -p $(E2E_PARALLELISM) -parallel $(E2E_PARALLELISM) $(WHAT) $(TEST_ARGS) From b500b439490d0eaddb3d62cfaccbd2bf18d053b0 Mon Sep 17 00:00:00 2001 From: "Nelo-T. Wallus" Date: Wed, 17 Sep 2025 15:00:51 +0200 Subject: [PATCH 6/9] Default E2E_PARALLELISM based on nproc Signed-off-by: Nelo-T. Wallus Signed-off-by: Nelo-T. Wallus --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index a5b2b7073..df121f310 100644 --- a/Makefile +++ b/Makefile @@ -242,7 +242,8 @@ GO_TEST = $(GOTESTSUM) $(GOTESTSUM_ARGS) -- endif COUNT ?= 1 -E2E_PARALLELISM ?= 1 +NPROC ?= $$(( $(shell nproc) / 2 )) +E2E_PARALLELISM ?= $$(( $(NPROC) > 1 ? $(NPROC) : 1)) dex: git clone https://github.com/dexidp/dex.git From 781ebb2445a494f417acb97d91d58ef93da1b874 Mon Sep 17 00:00:00 2001 From: "Nelo-T. Wallus" Date: Fri, 19 Sep 2025 10:52:04 +0200 Subject: [PATCH 7/9] Symlink dex and kcp in hack/tools Signed-off-by: Nelo-T. Wallus Signed-off-by: Nelo-T. Wallus --- Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile b/Makefile index df121f310..3188ce99a 100644 --- a/Makefile +++ b/Makefile @@ -255,12 +255,14 @@ $(DEX): git clone --branch $(DEX_VER) --depth 1 https://github.com/dexidp/dex $(TOOLS_DIR)/dex-clone-$(DEX_VER) || true cd $(TOOLS_DIR)/dex-clone-$(DEX_VER) && GOWORK=off make build cp -a $(TOOLS_DIR)/dex-clone-$(DEX_VER)/bin/dex $(DEX) + ln -sf $(DEX) $(TOOLS_GOBIN_DIR)/dex $(KCP): mkdir -p $(TOOLS_DIR) curl --fail --retry 3 -L "https://github.com/kcp-dev/kcp/releases/download/$(KCP_VER)/kcp_$(KCP_VER:v%=%)_$(OS)_$(ARCH).tar.gz" | \ tar xz -C "$(TOOLS_DIR)" --strip-components="1" bin/kcp mv $(TOOLS_DIR)/kcp $(KCP) + ln -sf $(KCP) $(TOOLS_GOBIN_DIR)/kcp run-kcp: $(KCP) $(KCP_CMD) start --bind-address=127.0.0.1 From 5a1e6b978d286d61f010f0f8a1a6fbbc4e2cc241 Mon Sep 17 00:00:00 2001 From: "Nelo-T. Wallus" Date: Fri, 19 Sep 2025 10:52:31 +0200 Subject: [PATCH 8/9] Add run-dex Signed-off-by: Nelo-T. Wallus Signed-off-by: Nelo-T. Wallus --- Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 3188ce99a..fce8a5833 100644 --- a/Makefile +++ b/Makefile @@ -257,6 +257,9 @@ $(DEX): cp -a $(TOOLS_DIR)/dex-clone-$(DEX_VER)/bin/dex $(DEX) ln -sf $(DEX) $(TOOLS_GOBIN_DIR)/dex +run-dex: $(DEX) + $(DEX) serve hack/dex-config-dev.yaml + $(KCP): mkdir -p $(TOOLS_DIR) curl --fail --retry 3 -L "https://github.com/kcp-dev/kcp/releases/download/$(KCP_VER)/kcp_$(KCP_VER:v%=%)_$(OS)_$(ARCH).tar.gz" | \ @@ -276,7 +279,7 @@ test-e2e: WORK_DIR ?= . test-e2e: WHAT ?= ./test/e2e... test-e2e: $(KCP) $(DEX) build ## Run e2e tests mkdir .kcp - $(DEX) serve hack/dex-config-dev.yaml 2>&1 & DEX_PID=$$!; \ + $(MAKE) run-dex 2>&1 & DEX_PID=$$!; \ $(MAKE) run-kcp &>.kcp/kcp.log & KCP_PID=$$!; \ trap 'kill -TERM $$DEX_PID $$KCP_PID; rm -rf .kcp' TERM INT EXIT && \ echo "Waiting for kcp to be ready (check .kcp/kcp.log)." && while ! KUBECONFIG=.kcp/admin.kubeconfig kubectl get --raw /readyz &>/dev/null; do sleep 1; echo -n "."; done && echo && \ From 2ced3315ab3d9988d4cf537cbfa0b10ceeee8d99 Mon Sep 17 00:00:00 2001 From: "Nelo-T. Wallus" Date: Fri, 19 Sep 2025 11:03:09 +0200 Subject: [PATCH 9/9] Drop cloning dex Signed-off-by: Nelo-T. Wallus Signed-off-by: Nelo-T. Wallus --- Makefile | 5 ----- 1 file changed, 5 deletions(-) diff --git a/Makefile b/Makefile index fce8a5833..eac72934f 100644 --- a/Makefile +++ b/Makefile @@ -245,11 +245,6 @@ COUNT ?= 1 NPROC ?= $$(( $(shell nproc) / 2 )) E2E_PARALLELISM ?= $$(( $(NPROC) > 1 ? $(NPROC) : 1)) -dex: - git clone https://github.com/dexidp/dex.git -dex/bin/dex: dex - (cd dex; make) - $(DEX): mkdir -p $(TOOLS_DIR) git clone --branch $(DEX_VER) --depth 1 https://github.com/dexidp/dex $(TOOLS_DIR)/dex-clone-$(DEX_VER) || true