make sure we're using the latest kind node image

Signed-off-by: Per Goncalves da Silva <[email protected]>

Makefile

@@ -102,7 +102,7 @@ KUBEBUILDER_ASSETS ?= $(shell $(SETUP_ENVTEST) use -p path $(KUBE_MINOR).x)
 
 # Kind node image tags are in the format x.y.z we pin to version x.y.0 because patch releases and node images
 # are not guaranteed to be available when a new version of the kube apis is released
-KIND_CLUSTER_IMAGE := kindest/node:v$(KUBE_MINOR).0
+export KIND_CLUSTER_IMAGE := kindest/node:v$(KUBE_MINOR).0
 export KIND_CLUSTER_NAME ?= kind-olmv0
 
 # Targets #

scripts/kind_with_registry.sh

@@ -2,6 +2,10 @@
 set -o errexit
 set -x
 
+BINGO_ENV_PATH=$(cd "$(dirname "${BASH_SOURCE[0]}")/../.bingo" && pwd)
+
+. "${BINGO_ENV_PATH}/variables.env"
+
 # Original source: https://kind.sigs.k8s.io/docs/user/local-registry/
 KIND_CLUSTER_NAME=${KIND_CLUSTER_NAME:-kind-olmv0}
 KIND=${KIND:-kind}
@@ -25,7 +29,10 @@ fi
 # https://github.com/kubernetes-sigs/kind/issues/2875
 # https://github.com/containerd/containerd/blob/main/docs/cri/config.md#registry-configuration
 # See: https://github.com/containerd/containerd/blob/main/docs/hosts.md
-cat <<EOF | ${KIND} create cluster --name="${KIND_CLUSTER_NAME}" ${KIND_CREATE_OPTS} --config=-
+if [ -n "${KIND_CLUSTER_IMAGE}" ]; then
+  KIND_IMAGE="--image=${KIND_CLUSTER_IMAGE}"
+fi
+cat <<EOF | ${KIND} create cluster --name="${KIND_CLUSTER_NAME}" "${KIND_IMAGE}" ${KIND_CREATE_OPTS} --config=-
 kind: Cluster
 apiVersion: kind.x-k8s.io/v1alpha4
 containerdConfigPatches: