feat(e2e): allow custom kind binary in e2e tests

kersten · kersten · commit 675981caeaa0 · 2025-03-19T07:54:51.000+01:00
add support for using a custom kind binary by reading from the
KIND environment variable. This allows flexibility in testing
environments where a different kind binary might be needed.

The default behavior remains unchanged, using "kind" if no
environment variable is set.
diff --git a/docs/book/src/cronjob-tutorial/testdata/project/Makefile b/docs/book/src/cronjob-tutorial/testdata/project/Makefile
@@ -79,7 +79,7 @@ test-e2e: manifests generate fmt vet ## Run the e2e tests. Expected an isolated
 		echo "No Kind cluster is running. Please start a Kind cluster before running the e2e tests."; \
 		exit 1; \
 	}
-	go test ./test/e2e/ -v -ginkgo.v
+	KIND=$(KIND) go test ./test/e2e/ -v -ginkgo.v
 
 .PHONY: lint
 lint: golangci-lint ## Run golangci-lint linter
diff --git a/docs/book/src/cronjob-tutorial/testdata/project/test/utils/utils.go b/docs/book/src/cronjob-tutorial/testdata/project/test/utils/utils.go
@@ -172,7 +172,11 @@ func LoadImageToKindClusterWithName(name string) error {
 		cluster = v
 	}
 	kindOptions := []string{"load", "docker-image", name, "--name", cluster}
-	cmd := exec.Command("kind", kindOptions...)
+	kind := "kind"
+	if v, ok := os.LookupEnv("KIND"); ok {
+		kind = v
+	}
+	cmd := exec.Command(kind, kindOptions...)
 	_, err := Run(cmd)
 	return err
 }
diff --git a/docs/book/src/getting-started/testdata/project/Makefile b/docs/book/src/getting-started/testdata/project/Makefile
@@ -75,7 +75,7 @@ test-e2e: manifests generate fmt vet ## Run the e2e tests. Expected an isolated
 		echo "No Kind cluster is running. Please start a Kind cluster before running the e2e tests."; \
 		exit 1; \
 	}
-	go test ./test/e2e/ -v -ginkgo.v
+	KIND=$(KIND) go test ./test/e2e/ -v -ginkgo.v
 
 .PHONY: lint
 lint: golangci-lint ## Run golangci-lint linter
diff --git a/docs/book/src/getting-started/testdata/project/test/utils/utils.go b/docs/book/src/getting-started/testdata/project/test/utils/utils.go
@@ -172,7 +172,11 @@ func LoadImageToKindClusterWithName(name string) error {
 		cluster = v
 	}
 	kindOptions := []string{"load", "docker-image", name, "--name", cluster}
-	cmd := exec.Command("kind", kindOptions...)
+	kind := "kind"
+	if v, ok := os.LookupEnv("KIND"); ok {
+		kind = v
+	}
+	cmd := exec.Command(kind, kindOptions...)
 	_, err := Run(cmd)
 	return err
 }
diff --git a/docs/book/src/multiversion-tutorial/testdata/project/Makefile b/docs/book/src/multiversion-tutorial/testdata/project/Makefile
@@ -79,7 +79,7 @@ test-e2e: manifests generate fmt vet ## Run the e2e tests. Expected an isolated
 		echo "No Kind cluster is running. Please start a Kind cluster before running the e2e tests."; \
 		exit 1; \
 	}
-	go test ./test/e2e/ -v -ginkgo.v
+	KIND=$(KIND) go test ./test/e2e/ -v -ginkgo.v
 
 .PHONY: lint
 lint: golangci-lint ## Run golangci-lint linter
diff --git a/docs/book/src/multiversion-tutorial/testdata/project/test/utils/utils.go b/docs/book/src/multiversion-tutorial/testdata/project/test/utils/utils.go
@@ -172,7 +172,11 @@ func LoadImageToKindClusterWithName(name string) error {
 		cluster = v
 	}
 	kindOptions := []string{"load", "docker-image", name, "--name", cluster}
-	cmd := exec.Command("kind", kindOptions...)
+	kind := "kind"
+	if v, ok := os.LookupEnv("KIND"); ok {
+		kind = v
+	}
+	cmd := exec.Command(kind, kindOptions...)
 	_, err := Run(cmd)
 	return err
 }
diff --git a/docs/book/src/reference/envtest.md b/docs/book/src/reference/envtest.md
@@ -319,9 +319,12 @@ func LoadImageToKindClusterWithName(name string) error {
 	if v, ok := os.LookupEnv("KIND_CLUSTER"); ok {
 		cluster = v
 	}
-
 	kindOptions := []string{"load", "docker-image", name, "--name", cluster}
-	cmd := exec.Command("kind", kindOptions...)
+	kind := "kind"
+	if v, ok := os.LookupEnv("KIND"); ok {
+		kind = v
+	}
+	cmd := exec.Command(kind, kindOptions...)
 	_, err := Run(cmd)
 	return err
 }
diff --git a/pkg/plugins/golang/v4/scaffolds/internal/templates/makefile.go b/pkg/plugins/golang/v4/scaffolds/internal/templates/makefile.go
@@ -154,7 +154,7 @@ test-e2e: manifests generate fmt vet ## Run the e2e tests. Expected an isolated
 		echo "No Kind cluster is running. Please start a Kind cluster before running the e2e tests."; \
 		exit 1; \
 	}
-	go test ./test/e2e/ -v -ginkgo.v
+	KIND=$(KIND) go test ./test/e2e/ -v -ginkgo.v
 
 .PHONY: lint
 lint: golangci-lint ## Run golangci-lint linter
diff --git a/pkg/plugins/golang/v4/scaffolds/internal/templates/test/utils/utils.go b/pkg/plugins/golang/v4/scaffolds/internal/templates/test/utils/utils.go
@@ -199,7 +199,11 @@ func LoadImageToKindClusterWithName(name string) error {
 		cluster = v
 	}
 	kindOptions := []string{"load", "docker-image", name, "--name", cluster}
-	cmd := exec.Command("kind", kindOptions...)
+	kind := "kind"
+	if v, ok := os.LookupEnv("KIND"); ok {
+		kind = v
+	}
+	cmd := exec.Command(kind, kindOptions...)
 	_, err := Run(cmd)
 	return err
 }
diff --git a/test/e2e/utils/test_context.go b/test/e2e/utils/test_context.go
@@ -274,7 +274,11 @@ func (t *TestContext) LoadImageToKindCluster() error {
 		cluster = v
 	}
 	kindOptions := []string{"load", "docker-image", t.ImageName, "--name", cluster}
-	cmd := exec.Command("kind", kindOptions...)
+	kind := "kind"
+	if v, ok := os.LookupEnv("KIND"); ok {
+		kind = v
+	}
+	cmd := exec.Command(kind, kindOptions...)
 	_, err := t.Run(cmd)
 	return err
 }
diff --git a/testdata/project-v4-multigroup/Makefile b/testdata/project-v4-multigroup/Makefile
@@ -75,7 +75,7 @@ test-e2e: manifests generate fmt vet ## Run the e2e tests. Expected an isolated
 		echo "No Kind cluster is running. Please start a Kind cluster before running the e2e tests."; \
 		exit 1; \
 	}
-	go test ./test/e2e/ -v -ginkgo.v
+	KIND=$(KIND) go test ./test/e2e/ -v -ginkgo.v
 
 .PHONY: lint
 lint: golangci-lint ## Run golangci-lint linter
diff --git a/testdata/project-v4-multigroup/test/utils/utils.go b/testdata/project-v4-multigroup/test/utils/utils.go
@@ -172,7 +172,11 @@ func LoadImageToKindClusterWithName(name string) error {
 		cluster = v
 	}
 	kindOptions := []string{"load", "docker-image", name, "--name", cluster}
-	cmd := exec.Command("kind", kindOptions...)
+	kind := "kind"
+	if v, ok := os.LookupEnv("KIND"); ok {
+		kind = v
+	}
+	cmd := exec.Command(kind, kindOptions...)
 	_, err := Run(cmd)
 	return err
 }
diff --git a/testdata/project-v4-with-plugins/Makefile b/testdata/project-v4-with-plugins/Makefile
@@ -75,7 +75,7 @@ test-e2e: manifests generate fmt vet ## Run the e2e tests. Expected an isolated
 		echo "No Kind cluster is running. Please start a Kind cluster before running the e2e tests."; \
 		exit 1; \
 	}
-	go test ./test/e2e/ -v -ginkgo.v
+	KIND=$(KIND) go test ./test/e2e/ -v -ginkgo.v
 
 .PHONY: lint
 lint: golangci-lint ## Run golangci-lint linter
diff --git a/testdata/project-v4-with-plugins/test/utils/utils.go b/testdata/project-v4-with-plugins/test/utils/utils.go
@@ -172,7 +172,11 @@ func LoadImageToKindClusterWithName(name string) error {
 		cluster = v
 	}
 	kindOptions := []string{"load", "docker-image", name, "--name", cluster}
-	cmd := exec.Command("kind", kindOptions...)
+	kind := "kind"
+	if v, ok := os.LookupEnv("KIND"); ok {
+		kind = v
+	}
+	cmd := exec.Command(kind, kindOptions...)
 	_, err := Run(cmd)
 	return err
 }
diff --git a/testdata/project-v4/Makefile b/testdata/project-v4/Makefile
@@ -75,7 +75,7 @@ test-e2e: manifests generate fmt vet ## Run the e2e tests. Expected an isolated
 		echo "No Kind cluster is running. Please start a Kind cluster before running the e2e tests."; \
 		exit 1; \
 	}
-	go test ./test/e2e/ -v -ginkgo.v
+	KIND=$(KIND) go test ./test/e2e/ -v -ginkgo.v
 
 .PHONY: lint
 lint: golangci-lint ## Run golangci-lint linter
diff --git a/testdata/project-v4/test/utils/utils.go b/testdata/project-v4/test/utils/utils.go
@@ -172,7 +172,11 @@ func LoadImageToKindClusterWithName(name string) error {
 		cluster = v
 	}
 	kindOptions := []string{"load", "docker-image", name, "--name", cluster}
-	cmd := exec.Command("kind", kindOptions...)
+	kind := "kind"
+	if v, ok := os.LookupEnv("KIND"); ok {
+		kind = v
+	}
+	cmd := exec.Command(kind, kindOptions...)
 	_, err := Run(cmd)
 	return err
 }

Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ test-e2e: manifests generate fmt vet ## Run the e2e tests. Expected an isolated`
`79`	`79`	`echo "No Kind cluster is running. Please start a Kind cluster before running the e2e tests."; \`
`80`	`80`	`exit 1; \`
`81`	`81`	`}`
`82`		`- go test ./test/e2e/ -v -ginkgo.v`
	`82`	`+ KIND=$(KIND) go test ./test/e2e/ -v -ginkgo.v`
`83`	`83`
`84`	`84`	`.PHONY: lint`
`85`	`85`	`lint: golangci-lint ## Run golangci-lint linter`
Original file line number	Diff line number	Diff line change
`@@ -172,7 +172,11 @@ func LoadImageToKindClusterWithName(name string) error {`
`172`	`172`	`cluster = v`
`173`	`173`	`}`
`174`	`174`	`kindOptions := []string{"load", "docker-image", name, "--name", cluster}`
`175`		`- cmd := exec.Command("kind", kindOptions...)`
	`175`	`+ kind := "kind"`
	`176`	`+ if v, ok := os.LookupEnv("KIND"); ok {`
	`177`	`+ kind = v`
	`178`	`+ }`
	`179`	`+ cmd := exec.Command(kind, kindOptions...)`
`176`	`180`	`_, err := Run(cmd)`
`177`	`181`	`return err`
`178`	`182`	`}`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ test-e2e: manifests generate fmt vet ## Run the e2e tests. Expected an isolated`
`75`	`75`	`echo "No Kind cluster is running. Please start a Kind cluster before running the e2e tests."; \`
`76`	`76`	`exit 1; \`
`77`	`77`	`}`
`78`		`- go test ./test/e2e/ -v -ginkgo.v`
	`78`	`+ KIND=$(KIND) go test ./test/e2e/ -v -ginkgo.v`
`79`	`79`
`80`	`80`	`.PHONY: lint`
`81`	`81`	`lint: golangci-lint ## Run golangci-lint linter`
Original file line number	Diff line number	Diff line change
`@@ -154,7 +154,7 @@ test-e2e: manifests generate fmt vet ## Run the e2e tests. Expected an isolated`
`154`	`154`	`echo "No Kind cluster is running. Please start a Kind cluster before running the e2e tests."; \`
`155`	`155`	`exit 1; \`
`156`	`156`	`}`
`157`		`- go test ./test/e2e/ -v -ginkgo.v`
	`157`	`+ KIND=$(KIND) go test ./test/e2e/ -v -ginkgo.v`
`158`	`158`
`159`	`159`	`.PHONY: lint`
`160`	`160`	`lint: golangci-lint ## Run golangci-lint linter`
Original file line number	Diff line number	Diff line change
`@@ -199,7 +199,11 @@ func LoadImageToKindClusterWithName(name string) error {`
`199`	`199`	`cluster = v`
`200`	`200`	`}`
`201`	`201`	`kindOptions := []string{"load", "docker-image", name, "--name", cluster}`
`202`		`- cmd := exec.Command("kind", kindOptions...)`
	`202`	`+ kind := "kind"`
	`203`	`+ if v, ok := os.LookupEnv("KIND"); ok {`
	`204`	`+ kind = v`
	`205`	`+ }`
	`206`	`+ cmd := exec.Command(kind, kindOptions...)`
`203`	`207`	`_, err := Run(cmd)`
`204`	`208`	`return err`
`205`	`209`	`}`
Original file line number	Diff line number	Diff line change
`@@ -274,7 +274,11 @@ func (t *TestContext) LoadImageToKindCluster() error {`
`274`	`274`	`cluster = v`
`275`	`275`	`}`
`276`	`276`	`kindOptions := []string{"load", "docker-image", t.ImageName, "--name", cluster}`
`277`		`- cmd := exec.Command("kind", kindOptions...)`
	`277`	`+ kind := "kind"`
	`278`	`+ if v, ok := os.LookupEnv("KIND"); ok {`
	`279`	`+ kind = v`
	`280`	`+ }`
	`281`	`+ cmd := exec.Command(kind, kindOptions...)`
`278`	`282`	`_, err := t.Run(cmd)`
`279`	`283`	`return err`
`280`	`284`	`}`