alexlebens/external-snapshotter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #34 from xing-yang/update_version

Browse Source 
Update version in the Makefile
This commit is contained in:
k8s-ci-robot
2018-09-26 20:05:08 -07:00
committed by GitHub
parent 4fd714a9be 69118cdbff
commit a2f8b41c08
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@@ -19,18 +19,19 @@ IMAGE_NAME=csi-snapshotter
IMAGE_VERSION=canary IMAGE_VERSION=canary
IMAGE_TAG=$(REGISTRY_NAME)/$(IMAGE_NAME):$(IMAGE_VERSION) IMAGE_TAG=$(REGISTRY_NAME)/$(IMAGE_NAME):$(IMAGE_VERSION)
REV=$(shell git describe --long --tags --match='v*' --dirty)
ifdef V ifdef V
TESTARGS = -v -args -alsologtostderr -v 5 TESTARGS = -v -args -alsologtostderr -v 5
else else
TESTARGS = TESTARGS =
endif endif
all: csi-snapshotter all: csi-snapshotter
csi-snapshotter: csi-snapshotter:
mkdir -p bin mkdir -p bin
CGO_ENABLED=0 GOOS=linux go build -a -ldflags '-extldflags "-static"' -o ./bin/csi-snapshotter ./cmd/csi-snapshotter CGO_ENABLED=0 GOOS=linux go build -a -ldflags '-X main.version=$(REV) -extldflags "-static"' -o ./bin/csi-snapshotter ./cmd/csi-snapshotter
clean: clean:
-rm -rf bin -rm -rf bin

11
cmd/csi-snapshotter/main.go
View File

@@ -58,12 +58,23 @@ var (
resyncPeriod = flag.Duration("resync-period", 60*time.Second, "Resync interval of the controller.") resyncPeriod = flag.Duration("resync-period", 60*time.Second, "Resync interval of the controller.")
snapshotNamePrefix = flag.String("snapshot-name-prefix", "snapshot", "Prefix to apply to the name of a created snapshot") snapshotNamePrefix = flag.String("snapshot-name-prefix", "snapshot", "Prefix to apply to the name of a created snapshot")
snapshotNameUUIDLength = flag.Int("snapshot-name-uuid-length", -1, "Length in characters for the generated uuid of a created snapshot. Defaults behavior is to NOT truncate.") snapshotNameUUIDLength = flag.Int("snapshot-name-uuid-length", -1, "Length in characters for the generated uuid of a created snapshot. Defaults behavior is to NOT truncate.")
showVersion = flag.Bool("version", false, "Show version.")
)
var (
version = "unknown"
) )
func main() { func main() {
flag.Set("logtostderr", "true") flag.Set("logtostderr", "true")
flag.Parse() flag.Parse()
if *showVersion {
fmt.Println(os.Args[0], version)
os.Exit(0)
}
glog.Infof("Version: %s", version)
// Create the client config. Use kubeconfig if given, otherwise assume in-cluster. // Create the client config. Use kubeconfig if given, otherwise assume in-cluster.
config, err := buildConfig(*kubeconfig) config, err := buildConfig(*kubeconfig)
if err != nil { if err != nil {