test: upgrade kind, make the image configurable and fix help make target

Signed-off-by: Peter Wilcsinszky <[email protected]>

Author: pepov

Makefile

@@ -23,7 +23,6 @@ VERSION := $(shell git describe --abbrev=0 --tags)
 
 E2E_TEST_TIMEOUT ?= 20m
 
-
 CONTROLLER_GEN = ${BIN}/controller-gen
 CONTROLLER_GEN_VERSION = v0.6.0
 
@@ -35,7 +34,8 @@ GOLANGCI_LINT := ${BIN}/golangci-lint
 GOLANGCI_LINT_VERSION := v1.51.2
 
 KIND := ${BIN}/kind
-KIND_VERSION := v0.11.1
+KIND_VERSION := v0.19.0
+KIND_IMAGE := kindest/node:v1.23.17@sha256:f77f8cf0b30430ca4128cc7cfafece0c274a118cd0cdb251049664ace0dee4ff
 
 KUBEBUILDER := ${BIN}/kubebuilder
 KUBEBUILDER_VERSION = v3.1.0
@@ -99,10 +99,6 @@ generate: ${CONTROLLER_GEN} tidy ## Generate code
 	cd pkg/sdk && $(CONTROLLER_GEN) object:headerFile=./../../hack/boilerplate.go.txt paths=./resourcebuilder/...
 	cd pkg/sdk && go generate ./static
 
-.PHONY: help
-help: ## Show this help message
-	@grep -h -E '^[a-zA-Z0-9%_-]+:.*?## .*$$' $(MAKEFILE_LIST) | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}' | sort
-
 .PHONY: install
 install: manifests ## Install CRDs into the cluster in ~/.kube/config
 	kubectl create -f config/crd/bases || kubectl replace -f config/crd/bases
@@ -153,7 +149,12 @@ test: generate fmt vet manifests ${ENVTEST_BINARY_ASSETS} ${KUBEBUILDER} ## Run
 
 .PHONY: test-e2e
 test-e2e: ${KIND} docker-build generate fmt vet manifests stern ## Run E2E tests
-	cd e2e && LOGGING_OPERATOR_IMAGE="${IMG}" PROJECT_DIR="$(PWD)" go test -v -timeout ${E2E_TEST_TIMEOUT} ./...
+	cd e2e && \
+		LOGGING_OPERATOR_IMAGE="${IMG}" \
+		KIND_PATH="$(KIND)" \
+		KIND_IMAGE="$(KIND_IMAGE)" \
+		PROJECT_DIR="$(PWD)" \
+		go test -v -timeout ${E2E_TEST_TIMEOUT} ./...
 
 .PHONY: tidy
 tidy: ## Tidy Go modules
@@ -239,3 +240,9 @@ find ${BIN} -name '$(notdir ${IMPORT_PATH})_*' -exec rm {} +
 GOBIN=${BIN} go install ${IMPORT_PATH}@${VERSION}
 mv ${BIN}/$(notdir ${IMPORT_PATH}) $@
 endef
+
+# Self-documenting Makefile
+.DEFAULT_GOAL = help
+.PHONY: help
+help: ## Show 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)

e2e/common/cluster.go

@@ -109,9 +109,7 @@ func DeleteTestCluster(clusterName string) error {
 }
 
 func CmdEnv(cmd *exec.Cmd, c Cluster) *exec.Cmd {
-	cmd.Env = []string{
-		fmt.Sprintf("KUBECONFIG=%s", c.KubeConfigFilePath()),
-	}
+	cmd.Env = append(os.Environ(), fmt.Sprintf("KUBECONFIG=%s", c.KubeConfigFilePath()))
 	cmd.Stderr = os.Stderr
 	return cmd
 }

e2e/common/kind/commands.go

@@ -15,16 +15,31 @@
 package kind
 
 import (
+	"fmt"
+	"os"
 	"os/exec"
 	"strings"
 )
 
-const CommandName = "kind"
+var KindPath string
+var KindImage string
+
+func init() {
+	KindPath = os.Getenv("KIND_PATH")
+	if KindPath == "" {
+		fmt.Fprintln(os.Stderr, "KIND_PATH need to be set")
+		os.Exit(1)
+	}
+	KindImage = os.Getenv("KIND_IMAGE")
+}
 
 func CreateCluster(options CreateClusterOptions) error {
 	args := []string{"create", "cluster"}
+	if KindImage != "" && options.Image == "" {
+		options.Image = KindImage
+	}
 	args = options.AppendToArgs(args)
-	_, err := exec.Command(CommandName, args...).Output()
+	_, err := exec.Command(KindPath, args...).Output()
 	return err
 }
 
@@ -64,7 +79,7 @@ func (options CreateClusterOptions) AppendToArgs(args []string) []string {
 func DeleteCluster(options DeleteClusterOptions) error {
 	args := []string{"delete", "cluster"}
 	args = options.AppendToArgs(args)
-	return exec.Command(CommandName, args...).Run()
+	return exec.Command(KindPath, args...).Run()
 }
 
 type DeleteClusterOptions struct {
@@ -87,7 +102,7 @@ func (options DeleteClusterOptions) AppendToArgs(args []string) []string {
 func GetKubeconfig(options GetKubeconfigOptions) ([]byte, error) {
 	args := []string{"get", "kubeconfig"}
 	args = options.AppendToArgs(args)
-	return exec.Command(CommandName, args...).Output()
+	return exec.Command(KindPath, args...).Output()
 }
 
 type GetKubeconfigOptions struct {
@@ -115,7 +130,7 @@ func LoadDockerImage(images []string, options LoadDockerImageOptions) error {
 	args := []string{"load", "docker-image"}
 	args = options.AppendToArgs(args)
 	args = append(args, images...)
-	_, err := exec.Command(CommandName, args...).Output()
+	_, err := exec.Command(KindPath, args...).Output()
 	return err
 }