From f9b9dea1c65327b8a2bc6f52cafae8cca53660ad Mon Sep 17 00:00:00 2001 From: Andrew Lavery Date: Tue, 7 Jan 2020 17:04:41 -0800 Subject: [PATCH] only include version number, not full build info --- cmd/troubleshoot/cli/version.go | 6 +++--- pkg/apis/troubleshoot/v1beta1/version.go | 10 +++------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/cmd/troubleshoot/cli/version.go b/cmd/troubleshoot/cli/version.go index 6ed9eee0..f660d6ed 100644 --- a/cmd/troubleshoot/cli/version.go +++ b/cmd/troubleshoot/cli/version.go @@ -30,9 +30,9 @@ const VersionFilename = "version.yaml" func writeVersionFile(path string) error { version := troubleshootv1beta1.SupportBundleVersion{ - ApiVersion: "troubleshoot.replicated.com/v1beta1", - Kind: "SupportBundle", - VersionInfo: version.GetBuild(), + ApiVersion: "troubleshoot.replicated.com/v1beta1", + Kind: "SupportBundle", + VersionNumber: version.Version(), } b, err := yaml.Marshal(version) if err != nil { diff --git a/pkg/apis/troubleshoot/v1beta1/version.go b/pkg/apis/troubleshoot/v1beta1/version.go index 26a9729d..d7c68171 100644 --- a/pkg/apis/troubleshoot/v1beta1/version.go +++ b/pkg/apis/troubleshoot/v1beta1/version.go @@ -1,11 +1,7 @@ package v1beta1 -import ( - "github.com/replicatedhq/troubleshoot/pkg/version" -) - type SupportBundleVersion struct { - ApiVersion string `json:"apiVersion" yaml:"apiVersion"` - Kind string `json:"kind" yaml:"kind"` - VersionInfo version.Build `json:"versionInfo" yaml:"versionInfo"` + ApiVersion string `json:"apiVersion" yaml:"apiVersion"` + Kind string `json:"kind" yaml:"kind"` + VersionNumber string `json:"versionNumber" yaml:"versionNumber"` }