fix: Parse v1beta1 troubleshoot specs when using loader API (#1501)

Author: banjoh

pkg/constants/constants.go

@@ -79,6 +79,7 @@ const (
 
 	// Troubleshoot spec constants
 	Troubleshootv1beta2Kind = "troubleshoot.sh/v1beta2"
+	Troubleshootv1beta1Kind = "troubleshoot.replicated.com/v1beta1"
 
 	// TermUI Display Constants
 	MESSAGE_TEXT_PADDING                = 4

pkg/loader/loader.go

@@ -196,7 +196,7 @@ func (l *specLoader) loadFromStrings(rawSpecs ...string) (*TroubleshootKinds, er
 			default:
 				return nil, types.NewExitCodeError(constants.EXIT_CODE_SPEC_ISSUES, errors.Errorf("%T type is not a Secret or ConfigMap", v))
 			}
-		} else if parsed.APIVersion == constants.Troubleshootv1beta2Kind {
+		} else if parsed.APIVersion == constants.Troubleshootv1beta2Kind || parsed.APIVersion == constants.Troubleshootv1beta1Kind {
 			// If it's not a configmap or secret, just append it to the splitdocs
 			splitdocs = append(splitdocs, rawDoc)
 		} else {

pkg/loader/loader_test.go

@@ -371,6 +371,38 @@ func TestLoadingMultidocsWithTroubleshootSpecs(t *testing.T) {
 	}, kinds.SupportBundlesV1Beta2)
 }
 
+func TestLoadingV1Beta1CollectorSpec(t *testing.T) {
+	kinds, err := LoadSpecs(context.Background(), LoadOptions{RawSpec: `kind: Collector
+apiVersion: troubleshoot.replicated.com/v1beta1
+metadata:
+  name: collector-sample
+spec:
+  collectors:
+    - clusterInfo: {}
+`})
+	require.NoError(t, err)
+	require.NotNil(t, kinds)
+
+	assert.Equal(t, []troubleshootv1beta2.Collector{
+		{
+			TypeMeta: metav1.TypeMeta{
+				Kind:       "Collector",
+				APIVersion: "troubleshoot.sh/v1beta2",
+			},
+			ObjectMeta: metav1.ObjectMeta{
+				Name: "collector-sample",
+			},
+			Spec: troubleshootv1beta2.CollectorSpec{
+				Collectors: []*troubleshootv1beta2.Collect{
+					{
+						ClusterInfo: &troubleshootv1beta2.ClusterInfo{},
+					},
+				},
+			},
+		},
+	}, kinds.CollectorsV1Beta2)
+}
+
 func TestLoadingConfigMapWithMultipleSpecs_PreflightSupportBundleAndRedactorDataKeys(t *testing.T) {
 	s := testutils.GetTestFixture(t, "yamldocs/multidoc-spec-2.yaml")
 	l := specLoader{}