Merge pull request #838 from cybozu-go/issues-837

download assets without setup-envtest

Author: lrf141

Makefile

@@ -10,12 +10,15 @@ NILERR := $(BIN_DIR)/nilerr
 STATICCHECK := $(BIN_DIR)/staticcheck
 SUDO = sudo
 
+# for envtest
+export ENVTEST_KUBERNETES_VERSION=$(shell echo $(KUBERNETES_VERSION) | cut -d "." -f 1-2).0
+export ENVTEST_ASSETS_DIR=$(BIN_DIR)
+
 KUSTOMIZE := kustomize
 HELM := helm
 GORELEASER := goreleaser
 YQ := yq
 CONTROLLER_GEN := controller-gen
-SETUP_ENVTEST := setup-envtest
 CRD_TO_MARKDOWN := crd-to-markdown
 MDBOOK := mdbook
 
@@ -93,17 +96,13 @@ check-generate:
 
 .PHONY: envtest
 envtest: aqua-install
-	source <($(SETUP_ENVTEST) use -p env ${KUBERNETES_VERSION}); \
-		export MOCO_CHECK_INTERVAL=100ms; \
-		export MOCO_CLONE_WAIT_DURATION=100ms; \
-		go test -v -count 1 -race ./clustering -ginkgo.randomize-all -ginkgo.v -ginkgo.fail-fast
-	source <($(SETUP_ENVTEST) use -p env ${KUBERNETES_VERSION}); \
-		export DEBUG_CONTROLLER=1; \
-		go test -v -count 1 -race ./controllers -ginkgo.randomize-all -ginkgo.v -ginkgo.fail-fast
-	source <($(SETUP_ENVTEST) use -p env ${KUBERNETES_VERSION}); \
-		go test -v -count 1 -race ./api/... -ginkgo.randomize-all -ginkgo.v
-	source <($(SETUP_ENVTEST) use -p env ${KUBERNETES_VERSION}); \
-		go test -v -count 1 -race ./backup -ginkgo.randomize-all -ginkgo.v -ginkgo.fail-fast
+	export MOCO_CHECK_INTERVAL=100ms; \
+	export MOCO_CLONE_WAIT_DURATION=100ms; \
+	go test -v -count 1 -race ./clustering -ginkgo.randomize-all -ginkgo.v -ginkgo.fail-fast
+	export DEBUG_CONTROLLER=1; \
+	go test -v -count 1 -race ./controllers -ginkgo.randomize-all -ginkgo.v -ginkgo.fail-fast
+	go test -v -count 1 -race ./api/... -ginkgo.randomize-all -ginkgo.v
+	go test -v -count 1 -race ./backup -ginkgo.randomize-all -ginkgo.v -ginkgo.fail-fast
 
 .PHONY: test-dbop
 test-dbop:

api/v1beta2/webhook_suite_test.go

@@ -5,6 +5,7 @@ import (
 	"crypto/tls"
 	"fmt"
 	"net"
+	"os"
 	"path/filepath"
 	"testing"
 	"time"
@@ -62,7 +63,10 @@ var _ = BeforeSuite(func() {
 		CRDInstallOptions: envtest.CRDInstallOptions{
 			Scheme: scheme,
 		},
-		ErrorIfCRDPathMissing: false,
+		ErrorIfCRDPathMissing:       false,
+		DownloadBinaryAssets:        true,
+		DownloadBinaryAssetsVersion: "v" + os.Getenv("ENVTEST_KUBERNETES_VERSION"),
+		BinaryAssetsDirectory:       os.Getenv("ENVTEST_ASSETS_DIR"),
 		WebhookInstallOptions: envtest.WebhookInstallOptions{
 			Paths: []string{filepath.Join("..", "..", "config", "webhook")},
 		},

aqua.yaml

@@ -20,4 +20,3 @@ packages:
 - name: kubernetes-sigs/controller-tools/controller-gen@v0.18.0
 - name: clamoriniere/crd-to-markdown@v0.0.3
 - name: rust-lang/mdBook@v0.4.52
-- name: kubernetes-sigs/controller-runtime/setup-envtest@v0.22.0

backup/suite_test.go

@@ -2,6 +2,7 @@ package backup
 
 import (
 	"context"
+	"os"
 	"path/filepath"
 	"testing"
 	"time"
@@ -49,7 +50,10 @@ var _ = BeforeSuite(func() {
 		CRDDirectoryPaths: []string{
 			filepath.Join("..", "config", "crd", "bases"),
 		},
-		ErrorIfCRDPathMissing: true,
+		ErrorIfCRDPathMissing:       true,
+		DownloadBinaryAssets:        true,
+		DownloadBinaryAssetsVersion: "v" + os.Getenv("ENVTEST_KUBERNETES_VERSION"),
+		BinaryAssetsDirectory:       os.Getenv("ENVTEST_ASSETS_DIR"),
 	}
 
 	var err error

clustering/suite_test.go

@@ -2,6 +2,7 @@ package clustering
 
 import (
 	"context"
+	"os"
 	"path/filepath"
 	"testing"
 	"time"
@@ -48,8 +49,11 @@ var _ = BeforeSuite(func() {
 
 	By("bootstrapping test environment")
 	testEnv = &envtest.Environment{
-		CRDDirectoryPaths:     []string{filepath.Join("..", "config", "crd", "bases")},
-		ErrorIfCRDPathMissing: true,
+		CRDDirectoryPaths:           []string{filepath.Join("..", "config", "crd", "bases")},
+		ErrorIfCRDPathMissing:       true,
+		DownloadBinaryAssets:        true,
+		DownloadBinaryAssetsVersion: "v" + os.Getenv("ENVTEST_KUBERNETES_VERSION"),
+		BinaryAssetsDirectory:       os.Getenv("ENVTEST_ASSETS_DIR"),
 	}
 
 	var err error

controllers/suite_test.go

@@ -2,6 +2,7 @@ package controllers
 
 import (
 	"context"
+	"os"
 	"path/filepath"
 	"testing"
 	"time"
@@ -49,7 +50,10 @@ var _ = BeforeSuite(func() {
 			filepath.Join("..", "config", "crd", "tests"),
 			filepath.Join("..", "config", "crd", "tests", "third"),
 		},
-		ErrorIfCRDPathMissing: true,
+		ErrorIfCRDPathMissing:       true,
+		DownloadBinaryAssets:        true,
+		DownloadBinaryAssetsVersion: "v" + os.Getenv("ENVTEST_KUBERNETES_VERSION"),
+		BinaryAssetsDirectory:       os.Getenv("ENVTEST_ASSETS_DIR"),
 	}
 
 	var err error