Merge pull request #864 from cdrage/update-versions

Move version information to separate file

pkg/transformer/utils.go

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

pkg/version/version.go

@@ -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"
+)