Skip to content

Commit

Permalink
Merge pull request #21 from krunaljain/feature/E2E_tests
Browse files Browse the repository at this point in the history
Adding E2E test template
  • Loading branch information
k8s-ci-robot committed Aug 17, 2018
2 parents e3a68c5 + d2fe948 commit 88d0de8
Show file tree
Hide file tree
Showing 115 changed files with 23,320 additions and 16 deletions.
154 changes: 140 additions & 14 deletions Gopkg.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 5 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,13 @@ endif

all: image

image:
image:
docker build --build-arg TAG=$(VERSION) -t $(IMAGE):$(VERSION) .

local:
mkdir -p bin
go build -ldflags "-X main.vendorVersion=${VERSION}" -o bin/gcfs-csi-driver ./cmd/

push:
docker push $(IMAGE):$(VERSION)

Expand Down
2 changes: 1 addition & 1 deletion pkg/cloud_provider/file/util.go
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ func newOauthClient() (*http.Client, error) {
return nil, fmt.Errorf("error accessing GCP service account token %q: %v", gac, err)
}
} else {
return nil, fmt.Errorf("GOOGLE_APPLICATION_CREDENTIALS env var not set")
glog.Warningf("GOOGLE_APPLICATION_CREDENTIALS env var not set")
}

tokenSource, err := google.DefaultTokenSource(oauth2.NoContext, compute.CloudPlatformScope)
Expand Down
2 changes: 2 additions & 0 deletions pkg/csi_driver/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,8 @@ func (s *nonBlockingGRPCServer) serve(endpoint string, ids csi.IdentityServer, c
if err := os.Remove(addr); err != nil && !os.IsNotExist(err) {
glog.Fatalf("Failed to remove %s, error: %s", addr, err.Error())
}
} else if u.Scheme == "tcp" {
addr = u.Host
} else {
glog.Fatalf("%v endpoint scheme not supported", u.Scheme)
}
Expand Down
Loading

0 comments on commit 88d0de8

Please sign in to comment.