deep-stack/kompose
7
0
Fork 0
forked from LaconicNetwork/kompose
Code Pull Requests Activity

Move version information to separate file

Browse Source 
Moves the version information to a seperate file. This is mostly due to
import cycle errors occuring when using "import
github.com/kubernetes/kompose/cmd" in order to get the global variable
of VERSION and GITCOMMIT.

Update's the Makefile and other files accordingly.

If the version and commmit is unretriveable due to not being able to
find the kompose binary, the one from pkg/version/version.go will be
used.
This commit is contained in:
Charlie Drage 2017-11-07 15:28:04 -05:00
parent fe62a96465
commit 0f4bfebf08
5 changed files with 26 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -15,7 +15,7 @@
GITCOMMIT := $(shell git rev-parse --short HEAD)
BUILD_FLAGS := -ldflags="-w -X github.com/kubernetes/kompose/cmd.GITCOMMIT=$(GITCOMMIT)"
BUILD_FLAGS := -ldflags="-w -X github.com/kubernetes/kompose/pkg/version.GITCOMMIT=$(GITCOMMIT)"
PKGS = $(shell glide novendor)
TEST_IMAGE := kompose/tests:latest

13
cmd/version.go
View File

@ -19,24 +19,17 @@ package cmd
import (
"fmt"
"github.com/kubernetes/kompose/pkg/version"
"github.com/spf13/cobra"
)
var (
// VERSION is version number that wil be displayed when running ./kompose version
VERSION = "1.4.0"
// GITCOMMIT is hash of the commit that wil be displayed when running ./kompose version
// this will be overwritten when running build like this: go build -ldflags="-X github.com/kubernetes/kompose/cmd.GITCOMMIT=$(GITCOMMIT)"
// HEAD is default indicating that this was not set during build
GITCOMMIT = "HEAD"
)
// versionCmd represents the version command
var versionCmd = &cobra.Command{
Use: "version",
Short: "Print the version of Kompose",
Run: func(cmd *cobra.Command, args []string) {
fmt.Println(VERSION + " (" + GITCOMMIT + ")")
// See pkg/version/version.go for more information as to why we use the git commit / hash value
fmt.Println(version.VERSION + " (" + version.GITCOMMIT + ")")
},
}

12
pkg/transformer/utils.go
View File

@ -31,6 +31,8 @@ import (
"github.com/kubernetes/kompose/pkg/utils/docker"
"github.com/kubernetes/kompose/pkg/version"
"github.com/pkg/errors"
"k8s.io/kubernetes/pkg/api"
)
@ -117,13 +119,19 @@ func ConfigAnnotations(service kobject.ServiceConfig) map[string]string {
annotations[key] = value
}
annotations["kompose.cmd"] = strings.Join(os.Args, " ")
version := exec.Command("kompose", "version")
out, err := version.Output()
versionCmd := exec.Command("kompose", "version")
out, err := versionCmd.Output()
if err != nil {
errors.Wrap(err, "Failed to get kompose version")
}
annotations["kompose.version"] = strings.Trim(string(out), " \n")
// If the version is blank (couldn't retrieve the kompose version for whatever reason)
if annotations["kompose.version"] == "" {
annotations["kompose.version"] = version.VERSION + " (" + version.GITCOMMIT + ")"
}
return annotations
}

10
pkg/version/version.go Normal file
View File

@ -0,0 +1,10 @@
package version
var (
// VERSION is version number that wil be displayed when running ./kompose version
VERSION = "1.4.0"
// GITCOMMIT is hash of the commit that wil be displayed when running ./kompose version
// this will be overwritten when running build like this: go build -ldflags="-X github.com/kubernetes/kompose/pkg/version.GITCOMMIT=$(GITCOMMIT)"
// HEAD is default indicating that this was not set during build
GITCOMMIT = "HEAD"
)

4
script/release.sh
View File

@ -91,8 +91,8 @@ init_sync() {
}
replaceversion() {
echo "Replaced version in version.go"
sed -i "s/$1/$2/g" cmd/version.go
echo "Replaced version in pkg/version/version.go"
sed -i "s/$1/$2/g" pkg/version/version.go
echo "Replaced version in README.md"
sed -i "s/$1/$2/g" README.md