Update various dependencies

Signed-off-by: Nicolas Bigler <[email protected]>

Makefile.vars.mk

@@ -10,7 +10,7 @@ DOCKER_CMD   ?= docker
 DOCKER_ARGS  ?= --rm --user "$$(id -u)" --volume "$${PWD}:/src" --workdir /src
 
 KIND_VERSION ?= 0.11.1
-KIND_NODE_VERSION ?= v1.20.0
+KIND_NODE_VERSION ?= v1.28.0
 KIND ?= $(TESTBIN_DIR)/kind
 
 ENABLE_LEADER_ELECTION ?= false

e2e/Makefile

@@ -31,7 +31,7 @@ test: setup kind-e2e-image ## Run the E2E tests
 	@$(bats) . $(bats_args)
 
 kind-e2e-image: kind-setup ## Load the e2e container image onto e2e cluster
-	$(KIND) load docker-image --name $(KIND_CLUSTER) $(E2E_IMG)
+	$(kind_bin) load docker-image --name $(KIND_CLUSTER) $(E2E_IMG)
 
 .PHONY: setup
 setup: export KUBECONFIG = $(KIND_KUBECONFIG)

e2e/kind.mk

@@ -1,6 +1,18 @@
 kind_marker := $(TESTBIN_DIR)/.kind-setup_complete
 
-curl_args ?= --location --fail --silent --show-error
+go_bin ?= $(PWD)/.work/bin
+$(go_bin):
+	@mkdir -p $@
+
+kind_dir ?= $(PWD)/.kind
+kind_bin = $(go_bin)/kind
+
+# Prepare kind binary
+$(kind_bin): export GOOS = $(shell go env GOOS)
+$(kind_bin): export GOARCH = $(shell go env GOARCH)
+$(kind_bin): export GOBIN = $(go_bin)
+$(kind_bin): | $(go_bin)
+	go install sigs.k8s.io/kind@latest
 
 .DEFAULT_TARGET: kind-setup
 
@@ -20,12 +32,10 @@ kind-clean: ## Remove the kind Cluster
 
 $(KIND): export KUBECONFIG = $(KIND_KUBECONFIG)
 $(KIND): $(testbin_created)
-	curl $(curl_args) --output "$(KIND)" "https://kind.sigs.k8s.io/dl/v$(KIND_VERSION)/kind-$$(uname)-amd64"
-	@chmod +x $(KIND)
 
 $(KIND_KUBECONFIG): export KUBECONFIG = $(KIND_KUBECONFIG)
-$(KIND_KUBECONFIG): $(KIND)
-	$(KIND) create cluster --name $(KIND_CLUSTER) --image kindest/node:$(KIND_NODE_VERSION)
+$(KIND_KUBECONFIG): $(kind_bin)
+	$(kind_bin) create cluster --name $(KIND_CLUSTER) --image kindest/node:$(KIND_NODE_VERSION)
 	@kubectl version
 	@kubectl cluster-info
 

go.mod

@@ -4,20 +4,19 @@ go 1.16
 
 require (
 	code.cloudfoundry.org/lager v2.0.0+incompatible
-	github.com/crossplane/crossplane v1.6.1
-	github.com/crossplane/crossplane-runtime v0.15.1-0.20211029211307-c72bcdd922eb
-	github.com/go-logr/zapr v0.4.0
+	github.com/crossplane/crossplane v1.12.2
+	github.com/crossplane/crossplane-runtime v0.20.0-rc.0.0.20230330081344-bc8be4cd89f3
+	github.com/go-logr/zapr v1.2.3
 	github.com/gorilla/mux v1.8.1
 	github.com/hashicorp/go-cleanhttp v0.5.2
 	github.com/pascaldekloe/jwt v1.12.0
 	github.com/pivotal-cf/brokerapi/v8 v8.2.1
-	github.com/prometheus/client_golang v1.12.2
-	github.com/stretchr/testify v1.7.2
-	github.com/ulikunitz/xz v0.5.8 // indirect
-	go.uber.org/zap v1.21.0
-	k8s.io/api v0.21.3
-	k8s.io/apimachinery v0.21.3
-	k8s.io/client-go v0.21.3
-	k8s.io/utils v0.0.0-20210722164352-7f3ee0f31471
-	sigs.k8s.io/controller-runtime v0.9.6
+	github.com/prometheus/client_golang v1.14.0
+	github.com/stretchr/testify v1.8.1
+	go.uber.org/zap v1.24.0
+	k8s.io/api v0.26.3
+	k8s.io/apimachinery v0.26.3
+	k8s.io/client-go v0.26.3
+	k8s.io/utils v0.0.0-20230313181309-38a27ef9d749
+	sigs.k8s.io/controller-runtime v0.14.6
 )