diff --git a/Makefile b/Makefile index 84aec214d1c0..6a81686a3184 100755 --- a/Makefile +++ b/Makefile @@ -366,7 +366,7 @@ release-minikube: out/minikube checksum out/docker-machine-driver-kvm2: go build \ -installsuffix "static" \ - -ldflags "-X k8s.io/minikube/pkg/drivers/kvm/version.VERSION=$(VERSION)" \ + -ldflags "-X k8s.io/minikube/pkg/drivers/kvm.version=$(VERSION)" \ -tags libvirt.1.3.1 \ -o $(BUILD_DIR)/docker-machine-driver-kvm2 \ k8s.io/minikube/cmd/drivers/kvm diff --git a/cmd/drivers/kvm/main.go b/cmd/drivers/kvm/main.go index 7b2f2b153038..2d9134bcef72 100644 --- a/cmd/drivers/kvm/main.go +++ b/cmd/drivers/kvm/main.go @@ -19,10 +19,18 @@ limitations under the License. package main import ( + "fmt" + "os" + "github.com/docker/machine/libmachine/drivers/plugin" "k8s.io/minikube/pkg/drivers/kvm" ) func main() { + if len(os.Args) > 1 && os.Args[1] == "--version" { + fmt.Println(kvm.GetVersion()) + return + } + plugin.RegisterDriver(kvm.NewDriver("", "")) } diff --git a/pkg/drivers/kvm/version.go b/pkg/drivers/kvm/version.go new file mode 100644 index 000000000000..7b0a3a85cef2 --- /dev/null +++ b/pkg/drivers/kvm/version.go @@ -0,0 +1,27 @@ +/* +Copyright 2016 The Kubernetes Authors All rights reserved. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package kvm + +// The current version of the docker-machine-driver-kvm2 + +// version is a private field and should be set when compiling with --ldflags="-X k8s.io/minikube/pkg/drivers/kvm.version=vX.Y.Z" +var version = "v0.0.0-unset" + +// GetVersion returns the current docker-machine-driver-kvm2 version +func GetVersion() string { + return version +}