Merge pull request #696 from replicatedhq/el_issue_682_20220831

chris-sanders · web-flow · commit 91c387b0cabf · 2022-09-02T08:13:43.000-05:00
EL 20220901 - Implement new type for #682
diff --git a/config/samples/troubleshoot_v1beta2_collector.yaml b/config/samples/troubleshoot_v1beta2_collector.yaml
@@ -3,6 +3,7 @@ kind: Collector
 metadata:
   name: collector-sample
 spec:
+  uri: https://raw.githubusercontent.com/replicatedhq/troubleshoot-specs/main/in-cluster/default.yaml
   collectors:
     - clusterInfo: {}
     - clusterResources: {}
diff --git a/pkg/apis/troubleshoot/v1beta2/supportbundle_types.go b/pkg/apis/troubleshoot/v1beta2/supportbundle_types.go
@@ -27,6 +27,8 @@ type SupportBundleSpec struct {
 	HostCollectors  []*HostCollect     `json:"hostCollectors,omitempty" yaml:"hostCollectors,omitempty"`
 	Analyzers       []*Analyze         `json:"analyzers,omitempty" yaml:"analyzers,omitempty"`
 	HostAnalyzers   []*HostAnalyze     `json:"hostAnalyzers,omitempty" yaml:"hostAnalyzers,omitempty"`
+	// URI optionally defines a location which is the source of this spec to allow updating of the spec at runtime
+	Uri string `json:"uri,omitempty" yaml:"uri,omitempty"`
 }
 
 // SupportBundleStatus defines the observed state of SupportBundle

Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,8 @@ type SupportBundleSpec struct {`
`27`	`27`	HostCollectors []*HostCollect `json:"hostCollectors,omitempty" yaml:"hostCollectors,omitempty"`
`28`	`28`	Analyzers []*Analyze `json:"analyzers,omitempty" yaml:"analyzers,omitempty"`
`29`	`29`	HostAnalyzers []*HostAnalyze `json:"hostAnalyzers,omitempty" yaml:"hostAnalyzers,omitempty"`
	`30`	`+ // URI optionally defines a location which is the source of this spec to allow updating of the spec at runtime`
	`31`	+ Uri string `json:"uri,omitempty" yaml:"uri,omitempty"`
`30`	`32`	`}`
`31`	`33`
`32`	`34`	`// SupportBundleStatus defines the observed state of SupportBundle`