Run recent testing tools rather than install them

This makes it slightly easier to clone the project and immediately run tests.
One may continue to use pre-installed tools by calling Make targets with
the ENVTEST and KUTTL variables.

Author: cbandy

.github/workflows/test.yaml

@@ -18,11 +18,12 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with: { go-version: stable }
-      - run: make check
-      - run: make check-generate
 
       - name: Ensure go.mod is tidy
         run: go mod tidy && git diff --exit-code -- go.mod
+      - name: Ensure generated files are committed
+        run: make check-generate
+      - run: make check
 
   kubernetes-api:
     runs-on: ubuntu-24.04
@@ -35,6 +36,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with: { go-version: stable }
+
       - run: go mod download
       - run: ENVTEST_K8S_VERSION="${KUBERNETES#default}" make check-envtest
         env:
@@ -163,7 +165,8 @@ jobs:
           echo '::group::PGO logs'; docker logs 'postgres-operator'; echo '::endgroup::'
           exit $failed
         env:
-          KUTTL_TEST: kubectl-kuttl test
+          KUTTL: kubectl-kuttl
+
       - name: Stop PGO
         run: docker stop 'postgres-operator' || true
 

Makefile

@@ -20,9 +20,12 @@ GO_TEST ?= $(GO) test
 # by managing them together in the main module.
 CONTROLLER ?= $(GO) tool sigs.k8s.io/controller-tools/cmd/controller-gen
 
-KUTTL ?= kubectl-kuttl
+# Run tests using the latest tools.
+ENVTEST ?= $(GO) run sigs.k8s.io/controller-runtime/tools/setup-envtest@latest
+KUTTL ?= $(GO) run github.com/kudobuilder/kuttl/pkg/kuttlctl/cmd/kubectl-kuttl@latest
 KUTTL_TEST ?= $(KUTTL) test
 
+
 ##@ General
 
 # The help target prints out all targets with their descriptions organized
@@ -67,7 +70,6 @@ clean: clean-deprecated
 	rm -f bin/postgres-operator
 	rm -rf licenses/*/
 	[ ! -d testing/kuttl/e2e-generated ] || rm -r testing/kuttl/e2e-generated
-	[ ! -f hack/tools/setup-envtest ] || rm hack/tools/setup-envtest
 	[ ! -d hack/tools/envtest ] || { chmod -R u+w hack/tools/envtest && rm -r hack/tools/envtest; }
 	[ ! -d hack/tools/pgmonitor ] || rm -rf hack/tools/pgmonitor
 	[ ! -d hack/tools/external-snapshotter ] || rm -rf hack/tools/external-snapshotter
@@ -97,6 +99,7 @@ clean-deprecated: ## Clean deprecated resources
 	[ ! -d testing/kuttl/e2e-generated-other ] || rm -r testing/kuttl/e2e-generated-other
 	@# Tools used to be downloaded directly
 	[ ! -f hack/tools/controller-gen ] || rm hack/tools/controller-gen
+	[ ! -f hack/tools/setup-envtest ] || rm hack/tools/setup-envtest
 
 
 ##@ Deployment
@@ -206,7 +209,7 @@ check: get-pgmonitor
 check-envtest: ## Run check using envtest and a mock kube api
 check-envtest: ENVTEST_USE = $(ENVTEST) --bin-dir=$(CURDIR)/hack/tools/envtest use $(ENVTEST_K8S_VERSION)
 check-envtest: SHELL = bash
-check-envtest: get-pgmonitor tools/setup-envtest
+check-envtest: get-pgmonitor
 	@$(ENVTEST_USE) --print=overview && echo
 	source <($(ENVTEST_USE) --print=env) && PGO_NAMESPACE="postgres-operator" QUERIES_CONFIG_DIR="$(CURDIR)/${QUERIES_CONFIG_DIR}" \
 		$(GO_TEST) -count=1 -cover ./...
@@ -299,20 +302,6 @@ generate-rbac: ## Generate RBAC
 		paths='./cmd/...' paths='./internal/...' \
 		output:dir='config/rbac' # {directory}/role.yaml
 
-##@ Tools
-
-.PHONY: tools
-tools: ## Download tools like controller-gen and kustomize if necessary.
-
-# go-get-tool will 'go install' any package $2 and install it to $1.
-define go-get-tool
-@[ -f '$(1)' ] || { echo Downloading '$(2)'; GOBIN='$(abspath $(dir $(1)))' $(GO) install '$(2)'; }
-endef
-
-ENVTEST ?= hack/tools/setup-envtest
-tools: tools/setup-envtest
-tools/setup-envtest:
-	$(call go-get-tool,$(ENVTEST),sigs.k8s.io/controller-runtime/tools/setup-envtest@latest)
 
 ##@ Release