Merge pull request #4398 from josedonizetti/add-kvm-version-flag

Add kvm2 --version
pull/4535/head
Thomas Strömberg 2019-06-20 07:41:18 +08:00 committed by GitHub
commit 4610663674
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 36 additions and 1 deletions

View File

@ -367,7 +367,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

View File

@ -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("", ""))
}

View File

@ -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
}