Skip to content

Commit 054c612

Browse files
committed
release tools
This synchronizes the build rules with other repos and (as part of that) bumps the Go version to 1.11.1. The recommended formatting changed slightly in that Go version.
1 parent ef4420b commit 054c612

File tree

3 files changed

+5
-45
lines changed

3 files changed

+5
-45
lines changed

.travis.yml

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

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
release-tools/travis.yml

Makefile

Lines changed: 3 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -14,34 +14,6 @@
1414

1515
.PHONY: all csi-snapshotter clean test
1616

17-
REGISTRY_NAME=quay.io/k8scsi
18-
IMAGE_NAME=csi-snapshotter
19-
IMAGE_VERSION=canary
20-
IMAGE_TAG=$(REGISTRY_NAME)/$(IMAGE_NAME):$(IMAGE_VERSION)
21-
22-
REV=$(shell git describe --long --tags --match='v*' --dirty)
23-
24-
ifdef V
25-
TESTARGS = -v -args -alsologtostderr -v 5
26-
else
27-
TESTARGS =
28-
endif
29-
30-
all: csi-snapshotter
31-
32-
csi-snapshotter:
33-
mkdir -p bin
34-
CGO_ENABLED=0 GOOS=linux go build -a -ldflags '-X main.version=$(REV) -extldflags "-static"' -o ./bin/csi-snapshotter ./cmd/csi-snapshotter
35-
36-
clean:
37-
-rm -rf bin
38-
39-
container: csi-snapshotter
40-
docker build -t $(IMAGE_TAG) .
41-
42-
push: container
43-
docker push $(IMAGE_TAG)
44-
45-
test:
46-
go test `go list ./... | grep -v 'vendor'` $(TESTARGS)
47-
go vet `go list ./... | grep -v vendor`
17+
CMDS=csi-snapshotter
18+
all: build
19+
include release-tools/build.make

pkg/controller/util.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ const (
6868
)
6969

7070
var snapshotterSecretParams = deprecatedSecretParamsMap{
71-
name: "Snapshotter",
71+
name: "Snapshotter",
7272
deprecatedSecretNameKey: snapshotterSecretNameKey,
7373
deprecatedSecretNamespaceKey: snapshotterSecretNamespaceKey,
7474
secretNameKey: prefixedSnapshotterSecretNameKey,

0 commit comments

Comments
 (0)