Merge pull request #111 from laverya/include-precise-version-in-troub…

…leshoot-version.yaml

include binary version info in 'version.yaml' troubleshoot file

cmd/troubleshoot/cli/version.go

@@ -18,7 +18,7 @@ func VersionCmd() *cobra.Command {
 		Short: "Print the current version and exit",
 		Long:  `Print the current version and exit`,
 		RunE: func(cmd *cobra.Command, args []string) error {
-			fmt.Printf("Replicated Preflight %s\n", version.Version())
+			fmt.Printf("Replicated Troubleshoot %s\n", version.Version())
 
 			return nil
 		},
@@ -32,6 +32,9 @@ func writeVersionFile(path string) error {
 	version := troubleshootv1beta1.SupportBundleVersion{
 		ApiVersion: "troubleshoot.replicated.com/v1beta1",
 		Kind:       "SupportBundle",
+		Spec: troubleshootv1beta1.SupportBundleVersionSpec{
+			VersionNumber: version.Version(),
+		},
 	}
 	b, err := yaml.Marshal(version)
 	if err != nil {

go.sum

@@ -202,6 +202,7 @@ github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OI
 github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY=
 github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/googleapis/gax-go v2.0.0+incompatible h1:j0GKcs05QVmm7yesiZq2+9cxHkNK9YM6zKx4D2qucQU=
 github.com/googleapis/gax-go v2.0.0+incompatible/go.mod h1:SFVmujtThgffbyetf+mdk2eWhX2bMyUtNHzFKcPA9HY=
 github.com/googleapis/gax-go/v2 v2.0.3/go.mod h1:LLvjysVCY1JZeum8Z6l8qUty8fiNwE08qbEPm1M08qg=
 github.com/googleapis/gax-go/v2 v2.0.4 h1:hU4mGcQI4DaAYW+IbTun+2qEZVFxK0ySjQLTbS0VQKc=

pkg/apis/troubleshoot/v1beta1/version.go

@@ -1,6 +1,11 @@
 package v1beta1
 
+type SupportBundleVersionSpec struct {
+	VersionNumber string `json:"versionNumber" yaml:"versionNumber"`
+}
+
 type SupportBundleVersion struct {
-	ApiVersion string `json:"apiVersion" yaml:"apiVersion"`
-	Kind       string `json:"kind" yaml:"kind"`
+	ApiVersion string                   `json:"apiVersion" yaml:"apiVersion"`
+	Kind       string                   `json:"kind" yaml:"kind"`
+	Spec       SupportBundleVersionSpec `json:"spec" yaml:"spec"`
 }