Fix --kubeconfig flag for Kind

Author: tamalsaha

.github/workflows/go.yml

@@ -68,5 +68,7 @@ jobs:
         REGISTRY_SECRET: regcred
       run: |
         export KUBECONFIG="$(kind get kubeconfig-path)"
+        env > ${GITHUB_WORKSPACE}/hack/config/.env
         make install
+        echo
         make e2e-tests

Makefile

@@ -255,18 +255,28 @@ unit-tests: $(BUILD_DIRS)
 	        ./hack/test.sh $(SRC_PKGS)                          \
 	    "
 
-STORAGE_CLASS ?= standard
+# - e2e-tests can hold both ginkgo args (as GINKGO_ARGS) and program/test args (as TEST_ARGS).
+#       make e2e-tests TEST_ARGS="--selfhosted-operator=false --storageclass=standard" GINKGO_ARGS="--flakeAttempts=2"
+#
+# - Minimalist:
+#       make e2e-tests
+#
+# NB: -t is used to catch ctrl-c interrupt from keyboard and -t will be problematic for CI.
+
+GINKGO_ARGS ?=
+TEST_ARGS   ?=
 
 .PHONY: e2e-tests
 e2e-tests: $(BUILD_DIRS)
-	@docker run                                                 \
+	docker run                                                  \
 	    -i                                                      \
 	    --rm                                                    \
 	    -u $$(id -u):$$(id -g)                                  \
 	    -v $$(pwd):/src                                         \
 	    -w /src                                                 \
 	    --net=host                                              \
-	    -v $(HOME)/.kube:/.kube                                \
+	    -v $(HOME)/.kube:/.kube                                 \
+	    -v $(HOME)/.credentials:$(HOME)/.credentials            \
 	    -v $$(pwd)/.go/bin/$(OS)_$(ARCH):/go/bin                \
 	    -v $$(pwd)/.go/bin/$(OS)_$(ARCH):/go/bin/$(OS)_$(ARCH)  \
 	    -v $$(pwd)/.go/cache:/.cache                            \
@@ -280,10 +290,16 @@ e2e-tests: $(BUILD_DIRS)
 	        VERSION=$(VERSION)                                  \
 	        DOCKER_REGISTRY=$(REGISTRY)                         \
 	        TAG=$(TAG)                                          \
-	        STORAGE_CLASS=$(STORAGE_CLASS)                      \
+	        KUBECONFIG=$${KUBECONFIG#$(HOME)}                   \
+	        GINKGO_ARGS='$(GINKGO_ARGS)'                        \
+	        TEST_ARGS='$(TEST_ARGS) --image-tag=$(TAG)'         \
 	        ./hack/e2e.sh                                       \
 	    "
 
+.PHONY: e2e-parallel
+e2e-parallel:
+	@$(MAKE) e2e-tests GINKGO_ARGS="-p -stream" --no-print-directory
+
 ADDTL_LINTERS   := goconst,gofmt,goimports,unparam
 
 .PHONY: lint

hack/e2e.sh

@@ -20,9 +20,10 @@ export CGO_ENABLED=0
 export GO111MODULE=on
 export GOFLAGS="-mod=vendor"
 
+GINKGO_ARGS=${GINKGO_ARGS:-}
+TEST_ARGS=${TEST_ARGS:-}
+DOCKER_REGISTRY=${DOCKER_REGISTRY:-}
+
 echo "Running e2e tests:"
-ginkgo -r --v --progress --trace test -- \
-    --docker-registry=${DOCKER_REGISTRY} \
-    --image-tag=${TAG}                   \
-    --storageclass=${STORAGE_CLASS}
-echo
+cmd="ginkgo -r --v --progress --trace ${GINKGO_ARGS} test -- --v=5 --docker-registry=${DOCKER_REGISTRY} ${TEST_ARGS}"
+echo $cmd; $cmd

test/e2e/e2e_suite_test.go

@@ -1,7 +1,6 @@
 package e2e_test
 
 import (
-	"path/filepath"
 	"strings"
 	"testing"
 	"time"
@@ -12,7 +11,6 @@ import (
 	. "github.com/onsi/gomega"
 	"k8s.io/client-go/discovery"
 	clientsetscheme "k8s.io/client-go/kubernetes/scheme"
-	"k8s.io/client-go/util/homedir"
 	ka "k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset"
 	"k8s.io/kubernetes/pkg/api/legacyscheme"
 	discovery_util "kmodules.xyz/client-go/discovery"
@@ -62,20 +60,14 @@ var _ = BeforeSuite(func() {
 	Expect(err).NotTo(HaveOccurred())
 
 	kaClient := ka.NewForConfigOrDie(clientConfig)
-	framework.StashProjectRoot = filepath.Join(homedir.HomeDir(), "go", "src", "github.com", "appscode", "stash")
 
 	root = framework.New(ctrlConfig.KubeClient, ctrlConfig.StashClient, kaClient, clientConfig, options.StorageClass)
 	err = root.CreateTestNamespace()
 	Expect(err).NotTo(HaveOccurred())
 	By("Using test namespace " + root.Namespace())
-
-	By("Starting the Stash Operator")
-	root.InstallStashOperator(options.KubeConfig, options.ExtraOptions)
 })
 
 var _ = AfterSuite(func() {
-	By("Deleting Stash Operator")
-	root.UninstallStashOperator()
 	By("Deleting namespace: " + root.Namespace())
 	err := root.DeleteNamespace(root.Namespace())
 	Expect(err).NotTo(HaveOccurred())

test/e2e/framework/operator.go

@@ -2,6 +2,7 @@ package e2e_test
 
 import (
 	"flag"
+	"os"
 	"path/filepath"
 
 	"github.com/appscode/go/flags"
@@ -21,7 +22,13 @@ type E2EOptions struct {
 var (
 	options = &E2EOptions{
 		ExtraOptions: server.NewExtraOptions(),
-		KubeConfig:   filepath.Join(homedir.HomeDir(), ".kube", "config"),
+		KubeConfig: func() string {
+			kubecfg := os.Getenv("KUBECONFIG")
+			if kubecfg != "" {
+				return kubecfg
+			}
+			return filepath.Join(homedir.HomeDir(), ".kube", "config")
+		}(),
 	}
 )