Skip to content

Commit 1ebaedc

Browse files
committed
Fix credentials directory while runnilng in minikube
1 parent 318d853 commit 1ebaedc

File tree

7 files changed

+7
-323
lines changed

7 files changed

+7
-323
lines changed

.github/workflows/go.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ jobs:
6868
REGISTRY_SECRET: regcred
6969
run: |
7070
export KUBECONFIG="$(kind get kubeconfig-path)"
71+
export KUBE_CRED_DIR=".credentials"
7172
env > ${GITHUB_WORKSPACE}/hack/config/.env
7273
make install
7374
echo

Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,6 +265,7 @@ unit-tests: $(BUILD_DIRS)
265265

266266
GINKGO_ARGS ?=
267267
TEST_ARGS ?=
268+
KUBE_CRED_DIR?=.minikube
268269

269270
.PHONY: e2e-tests
270271
e2e-tests: $(BUILD_DIRS)
@@ -276,7 +277,7 @@ e2e-tests: $(BUILD_DIRS)
276277
-w /src \
277278
--net=host \
278279
-v $(HOME)/.kube:/.kube \
279-
-v $(HOME)/.credentials:$(HOME)/.credentials \
280+
-v $(HOME)/$(KUBE_CRED_DIR):$(HOME)/$(KUBE_CRED_DIR) \
280281
-v $$(pwd)/.go/bin/$(OS)_$(ARCH):/go/bin \
281282
-v $$(pwd)/.go/bin/$(OS)_$(ARCH):/go/bin/$(OS)_$(ARCH) \
282283
-v $$(pwd)/.go/cache:/.cache \

test/e2e/e2e_suite_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
package e2e_test
22

33
import (
4+
"github.com/onsi/ginkgo/reporters"
5+
"kmodules.xyz/client-go/logs"
46
"strings"
57
"testing"
68
"time"
79

8-
logs "github.com/appscode/go/log/golog"
910
. "github.com/onsi/ginkgo"
10-
"github.com/onsi/ginkgo/reporters"
1111
. "github.com/onsi/gomega"
1212
"k8s.io/client-go/discovery"
1313
clientsetscheme "k8s.io/client-go/kubernetes/scheme"

test/e2e/framework/functions.go

Lines changed: 0 additions & 151 deletions
This file was deleted.

test/e2e/framework/task.go

Lines changed: 0 additions & 122 deletions
This file was deleted.

test/e2e/options_test.go

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import (
99
logs "github.com/appscode/go/log/golog"
1010
"k8s.io/client-go/util/homedir"
1111
"stash.appscode.dev/stash/pkg/cmds/server"
12-
opt "stash.appscode.dev/stash/test/e2e/framework"
1312
)
1413

1514
type E2EOptions struct {
@@ -33,17 +32,13 @@ var (
3332
)
3433

3534
func init() {
36-
//options.AddGoFlags(flag.CommandLine)
3735
flag.StringVar(&options.DockerRegistry, "docker-registry", "", "Set Docker Registry")
3836
flag.StringVar(&options.StashImageTag, "image-tag", "", "Set Stash Image Tag")
3937
flag.StringVar(&options.KubeConfig, "kubeconfig", options.KubeConfig, "Path to kubeconfig file with authorization information (the master location is set by the master flag).")
4038
flag.StringVar(&options.KubeContext, "kube-context", "", "Name of kube context")
4139
flag.StringVar(&options.StorageClass, "storageclass", "standard", "Storageclass for PVC")
4240
enableLogging()
4341
flag.Parse()
44-
opt.DockerRegistry = options.DockerRegistry
45-
opt.DockerImageTag = options.StashImageTag
46-
4742
}
4843

4944
func enableLogging() {

0 commit comments

Comments
 (0)