fix: [sc-106256] Add missing uri field to troubleshoot.sh types (#1574)

add uri field for top level type
replicatedhq · Jul 15, 2024 · 4e999d6 · 4e999d6
1 parent 403b1ce
commit 4e999d6
Show file tree

Hide file tree

Showing 18 changed files with 33 additions and 0 deletions.
diff --git a/config/crds/troubleshoot.sh_analyzers.yaml b/config/crds/troubleshoot.sh_analyzers.yaml
@@ -2906,6 +2906,8 @@ spec:
                       type: object
                   type: object
                 type: array
+              uri:
+                type: string
             type: object
           status:
             description: AnalyzerStatus defines the observed state of Analyzer

diff --git a/config/crds/troubleshoot.sh_collectors.yaml b/config/crds/troubleshoot.sh_collectors.yaml
@@ -16878,6 +16878,8 @@ spec:
                       type: object
                   type: object
                 type: array
+              uri:
+                type: string
             type: object
           status:
             description: CollectorStatus defines the observed state of Collector

diff --git a/config/crds/troubleshoot.sh_hostcollectors.yaml b/config/crds/troubleshoot.sh_hostcollectors.yaml
@@ -1623,6 +1623,8 @@ spec:
                       type: object
                   type: object
                 type: array
+              uri:
+                type: string
             type: object
           status:
             description: HostCollectorStatus defines the observed state of HostCollector

diff --git a/config/crds/troubleshoot.sh_hostpreflights.yaml b/config/crds/troubleshoot.sh_hostpreflights.yaml
@@ -1937,6 +1937,8 @@ spec:
                       type: object
                   type: object
                 type: array
+              uri:
+                type: string
             type: object
           status:
             description: HostPreflightStatus defines the observed state of HostPreflight

diff --git a/config/crds/troubleshoot.sh_preflights.yaml b/config/crds/troubleshoot.sh_preflights.yaml
@@ -18923,6 +18923,8 @@ spec:
                 type: array
               uploadResultsTo:
                 type: string
+              uri:
+                type: string
             type: object
           status:
             description: PreflightStatus defines the observed state of Preflight

diff --git a/config/crds/troubleshoot.sh_redactors.yaml b/config/crds/troubleshoot.sh_redactors.yaml
@@ -75,6 +75,8 @@ spec:
                       type: object
                   type: object
                 type: array
+              uri:
+                type: string
             type: object
           status:
             description: RedactorStatus defines the observed state of Redactor

diff --git a/config/crds/troubleshoot.sh_remotecollectors.yaml b/config/crds/troubleshoot.sh_remotecollectors.yaml
@@ -388,6 +388,8 @@ spec:
                 additionalProperties:
                   type: string
                 type: object
+              uri:
+                type: string
             type: object
           status:
             description: CollectorStatus defines the observed state of Collector

diff --git a/pkg/apis/troubleshoot/v1beta2/analyzer_types.go b/pkg/apis/troubleshoot/v1beta2/analyzer_types.go
@@ -24,6 +24,7 @@ import (
 type AnalyzerSpec struct {
 	Analyzers     []*Analyze     `json:"analyzers,omitempty"`
 	HostAnalyzers []*HostAnalyze `json:"hostAnalyzers,omitempty" yaml:"hostAnalyzers,omitempty"`
+	Uri           string         `json:"uri,omitempty" yaml:"uri,omitempty"`
 }
 
 // AnalyzerStatus defines the observed state of Analyzer

diff --git a/pkg/apis/troubleshoot/v1beta2/collector_types.go b/pkg/apis/troubleshoot/v1beta2/collector_types.go
@@ -35,6 +35,7 @@ type AfterCollection struct {
 type CollectorSpec struct {
 	Collectors      []*Collect         `json:"collectors,omitempty" yaml:"collectors,omitempty"`
 	AfterCollection []*AfterCollection `json:"afterCollection,omitempty" yaml:"afterCollection,omitempty"`
+	Uri             string             `json:"uri,omitempty" yaml:"uri,omitempty"`
 }
 
 // CollectorStatus defines the observed state of Collector

diff --git a/pkg/apis/troubleshoot/v1beta2/host_collector_types.go b/pkg/apis/troubleshoot/v1beta2/host_collector_types.go
@@ -24,6 +24,7 @@ import (
 type HostCollectorSpec struct {
 	Collectors []*HostCollect `json:"collectors,omitempty" yaml:"collectors,omitempty"`
 	Analyzers  []*HostAnalyze `json:"analyzers,omitempty" yaml:"analyzers,omitempty"`
+	Uri        string         `json:"uri,omitempty" yaml:"uri,omitempty"`
 }
 
 // HostCollectorStatus defines the observed state of HostCollector

diff --git a/pkg/apis/troubleshoot/v1beta2/hostpreflight_types.go b/pkg/apis/troubleshoot/v1beta2/hostpreflight_types.go
@@ -25,6 +25,7 @@ type HostPreflightSpec struct {
 	Collectors       []*HostCollect   `json:"collectors,omitempty" yaml:"collectors,omitempty"`
 	RemoteCollectors []*RemoteCollect `json:"remoteCollectors,omitempty" yaml:"remoteCollectors,omitempty"`
 	Analyzers        []*HostAnalyze   `json:"analyzers,omitempty" yaml:"analyzers,omitempty"`
+	Uri              string           `json:"uri,omitempty" yaml:"uri,omitempty"`
 }
 
 // HostPreflightStatus defines the observed state of HostPreflight

diff --git a/pkg/apis/troubleshoot/v1beta2/preflight_types.go b/pkg/apis/troubleshoot/v1beta2/preflight_types.go
@@ -26,6 +26,7 @@ type PreflightSpec struct {
 	Collectors       []*Collect       `json:"collectors,omitempty" yaml:"collectors,omitempty"`
 	RemoteCollectors []*RemoteCollect `json:"remoteCollectors,omitempty" yaml:"remoteCollectors,omitempty"`
 	Analyzers        []*Analyze       `json:"analyzers,omitempty" yaml:"analyzers,omitempty"`
+	Uri              string           `json:"uri,omitempty" yaml:"uri,omitempty"`
 }
 
 // PreflightStatus defines the observed state of Preflight

diff --git a/pkg/apis/troubleshoot/v1beta2/redact_types.go b/pkg/apis/troubleshoot/v1beta2/redact_types.go
@@ -23,6 +23,7 @@ import (
 // RedactorSpec defines the desired state of Redactor
 type RedactorSpec struct {
 	Redactors []*Redact `json:"redactors,omitempty"`
+	Uri       string    `json:"uri,omitempty" yaml:"uri,omitempty"`
 }
 
 // RedactorStatus defines the observed state of Redactor

diff --git a/pkg/apis/troubleshoot/v1beta2/remote_collector_types.go b/pkg/apis/troubleshoot/v1beta2/remote_collector_types.go
@@ -25,6 +25,7 @@ type RemoteCollectorSpec struct {
 	Collectors      []*RemoteCollect   `json:"collectors,omitempty" yaml:"collectors,omitempty"`
 	AfterCollection []*AfterCollection `json:"afterCollection,omitempty" yaml:"afterCollection,omitempty"`
 	NodeSelector    map[string]string  `json:"nodeSelector,omitempty" yaml:"nodeSelector,omitempty"`
+	Uri             string             `json:"uri,omitempty" yaml:"uri,omitempty"`
 }
 
 // +genclient

diff --git a/schemas/analyzer-troubleshoot-v1beta2.json b/schemas/analyzer-troubleshoot-v1beta2.json
@@ -4440,6 +4440,9 @@
               }
             }
           }
+        },
+        "uri": {
+          "type": "string"
         }
       }
     },

diff --git a/schemas/collector-troubleshoot-v1beta2.json b/schemas/collector-troubleshoot-v1beta2.json
@@ -14246,6 +14246,9 @@
               }
             }
           }
+        },
+        "uri": {
+          "type": "string"
         }
       }
     },

diff --git a/schemas/preflight-troubleshoot-v1beta2.json b/schemas/preflight-troubleshoot-v1beta2.json
@@ -17338,6 +17338,9 @@
         },
         "uploadResultsTo": {
           "type": "string"
+        },
+        "uri": {
+          "type": "string"
         }
       }
     },

diff --git a/schemas/redactor-troubleshoot-v1beta2.json b/schemas/redactor-troubleshoot-v1beta2.json
@@ -72,6 +72,9 @@
               }
             }
           }
+        },
+        "uri": {
+          "type": "string"
         }
       }
     },
-Original file line number
+Diff line change
@@ Expand Up / @@ -4440,6 +4440,9 @@ @@
                   }
                 }
               }
+            },
+            "uri": {
+              "type": "string"
             }
           }
         },
@@ Expand Down @@