Stop using docker for CNI tests (istio#29055)

* Stop using docker * fix lint
u248 · Nov 19, 2020 · 7300fb7 · 7300fb7
1 parent d1a6633
commit 7300fb7
Show file tree

Hide file tree

Showing 27 changed files with 85 additions and 363 deletions.
diff --git a/Makefile.core.mk b/Makefile.core.mk
@@ -451,9 +451,6 @@ benchtest: $(JUNIT_REPORT) ## Runs all benchmarks
 report-benchtest:
 	prow/benchtest.sh report
 
-cni.install-test: docker.install-cni
-	HUB=${HUB} TAG=${TAG} go test ${GOBUILDFLAGS} -count=1 ${T} -tags=integ ./cni/test/...
-
 #-----------------------------------------------------------------------------
 # Target: clean
 #-----------------------------------------------------------------------------

diff --git a/cni/deployments/kubernetes/install/test/README.md b/cni/deployments/kubernetes/install/test/README.md
diff --git a/cni/pkg/install-cni/pkg/constants/constants.go b/cni/pkg/install-cni/pkg/constants/constants.go
@@ -32,7 +32,7 @@ const (
 )
 
 // Internal constants
-const (
+var (
 	CNIBinDir             = "/opt/cni/bin"
 	HostCNIBinDir         = "/host/opt/cni/bin"
 	SecondaryBinDir       = "/host/secondary-bin-dir"

diff --git a/cni/pkg/install-cni/pkg/install/server.go b/cni/pkg/install-cni/pkg/install/server.go
@@ -19,7 +19,6 @@ import (
 	"sync/atomic"
 
 	"istio.io/istio/cni/pkg/install-cni/pkg/constants"
-	"istio.io/pkg/log"
 )
 
 // StartServer initializes and starts a web server that exposes liveness and readiness endpoints at port 8000.
@@ -28,7 +27,7 @@ func StartServer() *atomic.Value {
 	isReady := initRouter(router)
 
 	go func() {
-		log.Fatala(http.ListenAndServe(":"+constants.Port, router))
+		_ = http.ListenAndServe(":"+constants.Port, router)
 	}()
 
 	return isReady

diff --git a/cni/test/README.md b/cni/test/README.md
diff --git a/cni/test/e2e.sh b/cni/test/e2e.sh
diff --git a/cni/test/images/istio_cni_circleci_e2e_test.svg b/cni/test/images/istio_cni_circleci_e2e_test.svg