Skip to content

Commit 5f60baf

Browse files
kerstenkersten
committed
feat(makefile): allow configuring Kind cluster name for e2e tests
Introduce the `KIND_CLUSTER` variable to allow running e2e tests on Kind clusters with custom names. The Makefile now checks for an active cluster using the configured `KIND_CLUSTER` instead of assuming the default 'kind'. This improves flexibility for users running multiple Kind clusters.
1 parent 3f4d5f4 commit 5f60baf

File tree

7 files changed

+21
-14
lines changed

7 files changed

+21
-14
lines changed

‎docs/book/src/cronjob-tutorial/testdata/project/Makefile

+3-2
Original file line numberDiff line numberDiff line change
@@ -69,17 +69,18 @@ test: manifests generate fmt vet setup-envtest ## Run tests.
6969
# The default setup assumes Kind is pre-installed and builds/loads the Manager Docker image locally.
7070
# CertManager is installed by default; skip with:
7171
# - CERT_MANAGER_INSTALL_SKIP=true
72+
KIND_CLUSTER ?= kind
7273
.PHONY: test-e2e
7374
test-e2e: manifests generate fmt vet ## Run the e2e tests. Expected an isolated environment using Kind.
7475
@command -v $(KIND) >/dev/null 2>&1 || { \
7576
echo "Kind is not installed. Please install Kind manually."; \
7677
exit 1; \
7778
}
78-
@$(KIND) get clusters | grep -q 'kind' || { \
79+
@$(KIND) get clusters | grep -q '$(KIND_CLUSTER)' || { \
7980
echo "No Kind cluster is running. Please start a Kind cluster before running the e2e tests."; \
8081
exit 1; \
8182
}
82-
go test ./test/e2e/ -v -ginkgo.v
83+
KIND_CLUSTER=$(KIND_CLUSTER) go test ./test/e2e/ -v -ginkgo.v
8384

8485
.PHONY: lint
8586
lint: golangci-lint ## Run golangci-lint linter

‎docs/book/src/getting-started/testdata/project/Makefile

+3-2
Original file line numberDiff line numberDiff line change
@@ -65,17 +65,18 @@ test: manifests generate fmt vet setup-envtest ## Run tests.
6565
# The default setup assumes Kind is pre-installed and builds/loads the Manager Docker image locally.
6666
# CertManager is installed by default; skip with:
6767
# - CERT_MANAGER_INSTALL_SKIP=true
68+
KIND_CLUSTER ?= kind
6869
.PHONY: test-e2e
6970
test-e2e: manifests generate fmt vet ## Run the e2e tests. Expected an isolated environment using Kind.
7071
@command -v $(KIND) >/dev/null 2>&1 || { \
7172
echo "Kind is not installed. Please install Kind manually."; \
7273
exit 1; \
7374
}
74-
@$(KIND) get clusters | grep -q 'kind' || { \
75+
@$(KIND) get clusters | grep -q '$(KIND_CLUSTER)' || { \
7576
echo "No Kind cluster is running. Please start a Kind cluster before running the e2e tests."; \
7677
exit 1; \
7778
}
78-
go test ./test/e2e/ -v -ginkgo.v
79+
KIND_CLUSTER=$(KIND_CLUSTER) go test ./test/e2e/ -v -ginkgo.v
7980

8081
.PHONY: lint
8182
lint: golangci-lint ## Run golangci-lint linter

‎docs/book/src/multiversion-tutorial/testdata/project/Makefile

+3-2
Original file line numberDiff line numberDiff line change
@@ -69,17 +69,18 @@ test: manifests generate fmt vet setup-envtest ## Run tests.
6969
# The default setup assumes Kind is pre-installed and builds/loads the Manager Docker image locally.
7070
# CertManager is installed by default; skip with:
7171
# - CERT_MANAGER_INSTALL_SKIP=true
72+
KIND_CLUSTER ?= kind
7273
.PHONY: test-e2e
7374
test-e2e: manifests generate fmt vet ## Run the e2e tests. Expected an isolated environment using Kind.
7475
@command -v $(KIND) >/dev/null 2>&1 || { \
7576
echo "Kind is not installed. Please install Kind manually."; \
7677
exit 1; \
7778
}
78-
@$(KIND) get clusters | grep -q 'kind' || { \
79+
@$(KIND) get clusters | grep -q '$(KIND_CLUSTER)' || { \
7980
echo "No Kind cluster is running. Please start a Kind cluster before running the e2e tests."; \
8081
exit 1; \
8182
}
82-
go test ./test/e2e/ -v -ginkgo.v
83+
KIND_CLUSTER=$(KIND_CLUSTER) go test ./test/e2e/ -v -ginkgo.v
8384

8485
.PHONY: lint
8586
lint: golangci-lint ## Run golangci-lint linter

‎pkg/plugins/golang/v4/scaffolds/internal/templates/makefile.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -144,17 +144,18 @@ test: manifests generate fmt vet setup-envtest ## Run tests.
144144
# The default setup assumes Kind is pre-installed and builds/loads the Manager Docker image locally.
145145
# CertManager is installed by default; skip with:
146146
# - CERT_MANAGER_INSTALL_SKIP=true
147+
KIND_CLUSTER ?= kind
147148
.PHONY: test-e2e
148149
test-e2e: manifests generate fmt vet ## Run the e2e tests. Expected an isolated environment using Kind.
149150
@command -v $(KIND) >/dev/null 2>&1 || { \
150151
echo "Kind is not installed. Please install Kind manually."; \
151152
exit 1; \
152153
}
153-
@$(KIND) get clusters | grep -q 'kind' || { \
154+
@$(KIND) get clusters | grep -q '$(KIND_CLUSTER)' || { \
154155
echo "No Kind cluster is running. Please start a Kind cluster before running the e2e tests."; \
155156
exit 1; \
156157
}
157-
go test ./test/e2e/ -v -ginkgo.v
158+
KIND_CLUSTER=$(KIND_CLUSTER) go test ./test/e2e/ -v -ginkgo.v
158159
159160
.PHONY: lint
160161
lint: golangci-lint ## Run golangci-lint linter

‎testdata/project-v4-multigroup/Makefile

+3-2
Original file line numberDiff line numberDiff line change
@@ -65,17 +65,18 @@ test: manifests generate fmt vet setup-envtest ## Run tests.
6565
# The default setup assumes Kind is pre-installed and builds/loads the Manager Docker image locally.
6666
# CertManager is installed by default; skip with:
6767
# - CERT_MANAGER_INSTALL_SKIP=true
68+
KIND_CLUSTER ?= kind
6869
.PHONY: test-e2e
6970
test-e2e: manifests generate fmt vet ## Run the e2e tests. Expected an isolated environment using Kind.
7071
@command -v $(KIND) >/dev/null 2>&1 || { \
7172
echo "Kind is not installed. Please install Kind manually."; \
7273
exit 1; \
7374
}
74-
@$(KIND) get clusters | grep -q 'kind' || { \
75+
@$(KIND) get clusters | grep -q '$(KIND_CLUSTER)' || { \
7576
echo "No Kind cluster is running. Please start a Kind cluster before running the e2e tests."; \
7677
exit 1; \
7778
}
78-
go test ./test/e2e/ -v -ginkgo.v
79+
KIND_CLUSTER=$(KIND_CLUSTER) go test ./test/e2e/ -v -ginkgo.v
7980

8081
.PHONY: lint
8182
lint: golangci-lint ## Run golangci-lint linter

‎testdata/project-v4-with-plugins/Makefile

+3-2
Original file line numberDiff line numberDiff line change
@@ -65,17 +65,18 @@ test: manifests generate fmt vet setup-envtest ## Run tests.
6565
# The default setup assumes Kind is pre-installed and builds/loads the Manager Docker image locally.
6666
# CertManager is installed by default; skip with:
6767
# - CERT_MANAGER_INSTALL_SKIP=true
68+
KIND_CLUSTER ?= kind
6869
.PHONY: test-e2e
6970
test-e2e: manifests generate fmt vet ## Run the e2e tests. Expected an isolated environment using Kind.
7071
@command -v $(KIND) >/dev/null 2>&1 || { \
7172
echo "Kind is not installed. Please install Kind manually."; \
7273
exit 1; \
7374
}
74-
@$(KIND) get clusters | grep -q 'kind' || { \
75+
@$(KIND) get clusters | grep -q '$(KIND_CLUSTER)' || { \
7576
echo "No Kind cluster is running. Please start a Kind cluster before running the e2e tests."; \
7677
exit 1; \
7778
}
78-
go test ./test/e2e/ -v -ginkgo.v
79+
KIND_CLUSTER=$(KIND_CLUSTER) go test ./test/e2e/ -v -ginkgo.v
7980

8081
.PHONY: lint
8182
lint: golangci-lint ## Run golangci-lint linter

‎testdata/project-v4/Makefile

+3-2
Original file line numberDiff line numberDiff line change
@@ -65,17 +65,18 @@ test: manifests generate fmt vet setup-envtest ## Run tests.
6565
# The default setup assumes Kind is pre-installed and builds/loads the Manager Docker image locally.
6666
# CertManager is installed by default; skip with:
6767
# - CERT_MANAGER_INSTALL_SKIP=true
68+
KIND_CLUSTER ?= kind
6869
.PHONY: test-e2e
6970
test-e2e: manifests generate fmt vet ## Run the e2e tests. Expected an isolated environment using Kind.
7071
@command -v $(KIND) >/dev/null 2>&1 || { \
7172
echo "Kind is not installed. Please install Kind manually."; \
7273
exit 1; \
7374
}
74-
@$(KIND) get clusters | grep -q 'kind' || { \
75+
@$(KIND) get clusters | grep -q '$(KIND_CLUSTER)' || { \
7576
echo "No Kind cluster is running. Please start a Kind cluster before running the e2e tests."; \
7677
exit 1; \
7778
}
78-
go test ./test/e2e/ -v -ginkgo.v
79+
KIND_CLUSTER=$(KIND_CLUSTER) go test ./test/e2e/ -v -ginkgo.v
7980

8081
.PHONY: lint
8182
lint: golangci-lint ## Run golangci-lint linter

0 commit comments

Comments
 (0)