adjust targets for run in prow & downgrade go

Author: mjudeikis

.prow.yaml

@@ -21,11 +21,10 @@ presubmits:
       preset-goproxy: "true"
     spec:
       containers:
-        - image: ghcr.io/kcp-dev/infra/build:1.20.13-1
+        - image: ghcr.io/kcp-dev/infra/build:1.21.8-1
           command:
-            - cd examples/kcp
-            - make kcp-server kcp-controller
-            - make test
+            - make
+            - test-kcp-e2e
           resources:
             requests:
               memory: 6Gi

Makefile

@@ -133,3 +133,8 @@ verify-generate: generate ## Verify generated files are up to date
 		git diff; \
 		echo "generated files are out of date, run make generate"; exit 1; \
 	fi
+
+
+.PHONY: test-kcp-e2e
+test-kcp-e2e:
+	cd examples/kcp && make kcp-server kcp-controller test

examples/kcp/Makefile

@@ -1,3 +1,9 @@
+SHELL := /bin/bash
+
+.PHONY: help
+help: ## Display this help.
+	@awk 'BEGIN {FS = ":.*##"; printf "\nUsage:\n  make \033[36m<target>\033[0m\n"} /^[a-zA-Z_0-9-]+:.*?##/ { printf "  \033[36m%-15s\033[0m %s\n", $$1, $$2 } /^##@/ { printf "\n\033[1m%s\033[0m\n", substr($$0, 5) } ' $(MAKEFILE_LIST)
+
 
 GO_INSTALL = ./hack/go-install.sh
 
@@ -60,11 +66,11 @@ kcp-server: $(KCP) $(ARTIFACT_DIR)/kcp ## Run the kcp server.
 	@echo "kcp server is ready and running in the background. To stop run 'make test-cleanup'"
 
 .PHONY: kcp-bootstrap
-kcp-bootstrap:
+kcp-bootstrap: ## Bootstrap the kcp server.
 	@go run ./config/main.go
 
 .PHONY: kcp-controller
-kcp-controller: build kcp-bootstrap
+kcp-controller: build kcp-bootstrap ## Run the kcp-controller.
 	@echo "Starting kcp-controller in the background. To stop run 'make test-cleanup'"
 	@if [[ ! -s $(ARTIFACT_DIR)/controller.log ]]; then ( ./bin/kcp-controller >$(ARTIFACT_DIR)/controller.log 2>&1 & ); fi
 
@@ -78,12 +84,12 @@ test-cleanup: ## Clean up processes and directories from an end-to-end test run.
 $(ARTIFACT_DIR)/kcp: ## Create a directory for the kcp server data.
 	mkdir -p $(ARTIFACT_DIR)/kcp
 
-generate: build
+generate: build # Generate code
 	./hack/update-codegen-crds.sh
 
 run-local: build-controller kcp-bootstrap
 	./bin/kcp-controller
 
-.PHONY: test
+.PHONY: test # Run tests
 test:
 	go test ./... --workspace=root --kubeconfig=$(CURDIR)/$(ARTIFACT_DIR)/kcp.kubeconfig

examples/kcp/go.mod

@@ -1,6 +1,8 @@
 module github.com/kcp-dev/controller-runtime/examples/kcp
 
-go 1.22.2
+go 1.22.0
+
+toolchain go1.22.2
 
 // IMPORTANT: This is only an example replace directive. This is so examples can be run with the latest version of controller-runtime.
 // In your own projects, you should not use replace directives like this. Instead, you should use the latest version of controller-runtime.