From 0fcf473f85c18eefe9385603603d2e0bf9a18b61 Mon Sep 17 00:00:00 2001
From: Andrew Lavery <laverya@umich.edu>
Date: Tue, 7 Jan 2020 17:21:59 -0800
Subject: [PATCH] include versionNumber as spec.versionNumber to follow k8s
 struct standards

---
 cmd/troubleshoot/cli/version.go                  |  8 +++++---
 pkg/apis/troubleshoot/v1beta1/version.go         | 10 +++++++---
 .../v1beta1/zz_generated.deepcopy.go             | 16 ++++++++++++++++
 3 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/cmd/troubleshoot/cli/version.go b/cmd/troubleshoot/cli/version.go
index f660d6ed..28634e2e 100644
--- a/cmd/troubleshoot/cli/version.go
+++ b/cmd/troubleshoot/cli/version.go
@@ -30,9 +30,11 @@ const VersionFilename = "version.yaml"
 
 func writeVersionFile(path string) error {
 	version := troubleshootv1beta1.SupportBundleVersion{
-		ApiVersion:    "troubleshoot.replicated.com/v1beta1",
-		Kind:          "SupportBundle",
-		VersionNumber: version.Version(),
+		ApiVersion: "troubleshoot.replicated.com/v1beta1",
+		Kind:       "SupportBundle",
+		Spec: troubleshootv1beta1.SupportBundleVersionSpec{
+			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 d7c68171..e048f037 100644
--- a/pkg/apis/troubleshoot/v1beta1/version.go
+++ b/pkg/apis/troubleshoot/v1beta1/version.go
@@ -1,7 +1,11 @@
 package v1beta1
 
-type SupportBundleVersion struct {
-	ApiVersion    string `json:"apiVersion" yaml:"apiVersion"`
-	Kind          string `json:"kind" yaml:"kind"`
+type SupportBundleVersionSpec struct {
 	VersionNumber string `json:"versionNumber" yaml:"versionNumber"`
 }
+
+type SupportBundleVersion struct {
+	ApiVersion string                   `json:"apiVersion" yaml:"apiVersion"`
+	Kind       string                   `json:"kind" yaml:"kind"`
+	Spec       SupportBundleVersionSpec `json:"spec" yaml:"spec"`
+}
diff --git a/pkg/apis/troubleshoot/v1beta1/zz_generated.deepcopy.go b/pkg/apis/troubleshoot/v1beta1/zz_generated.deepcopy.go
index 3cdc33cd..5123659f 100644
--- a/pkg/apis/troubleshoot/v1beta1/zz_generated.deepcopy.go
+++ b/pkg/apis/troubleshoot/v1beta1/zz_generated.deepcopy.go
@@ -1493,6 +1493,7 @@ func (in *StorageClass) DeepCopy() *StorageClass {
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *SupportBundleVersion) DeepCopyInto(out *SupportBundleVersion) {
 	*out = *in
+	out.Spec = in.Spec
 }
 
 // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new SupportBundleVersion.
@@ -1505,6 +1506,21 @@ func (in *SupportBundleVersion) DeepCopy() *SupportBundleVersion {
 	return out
 }
 
+// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
+func (in *SupportBundleVersionSpec) DeepCopyInto(out *SupportBundleVersionSpec) {
+	*out = *in
+}
+
+// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new SupportBundleVersionSpec.
+func (in *SupportBundleVersionSpec) DeepCopy() *SupportBundleVersionSpec {
+	if in == nil {
+		return nil
+	}
+	out := new(SupportBundleVersionSpec)
+	in.DeepCopyInto(out)
+	return out
+}
+
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *TextAnalyze) DeepCopyInto(out *TextAnalyze) {
 	*out = *in