From 4e999d6bfbbaa68cf4ca2c4c282e9aa2dd77f70f Mon Sep 17 00:00:00 2001 From: Gerard Nguyen Date: Mon, 15 Jul 2024 13:07:04 +1000 Subject: [PATCH] fix: [sc-106256] Add missing uri field to troubleshoot.sh types (#1574) add uri field for top level type --- config/crds/troubleshoot.sh_analyzers.yaml | 2 ++ config/crds/troubleshoot.sh_collectors.yaml | 2 ++ config/crds/troubleshoot.sh_hostcollectors.yaml | 2 ++ config/crds/troubleshoot.sh_hostpreflights.yaml | 2 ++ config/crds/troubleshoot.sh_preflights.yaml | 2 ++ config/crds/troubleshoot.sh_redactors.yaml | 2 ++ config/crds/troubleshoot.sh_remotecollectors.yaml | 2 ++ pkg/apis/troubleshoot/v1beta2/analyzer_types.go | 1 + pkg/apis/troubleshoot/v1beta2/collector_types.go | 1 + pkg/apis/troubleshoot/v1beta2/host_collector_types.go | 1 + pkg/apis/troubleshoot/v1beta2/hostpreflight_types.go | 1 + pkg/apis/troubleshoot/v1beta2/preflight_types.go | 1 + pkg/apis/troubleshoot/v1beta2/redact_types.go | 1 + pkg/apis/troubleshoot/v1beta2/remote_collector_types.go | 1 + schemas/analyzer-troubleshoot-v1beta2.json | 3 +++ schemas/collector-troubleshoot-v1beta2.json | 3 +++ schemas/preflight-troubleshoot-v1beta2.json | 3 +++ schemas/redactor-troubleshoot-v1beta2.json | 3 +++ 18 files changed, 33 insertions(+) diff --git a/config/crds/troubleshoot.sh_analyzers.yaml b/config/crds/troubleshoot.sh_analyzers.yaml index 96f71386b..9e1ad390d 100644 --- 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 index ccbcad1da..30bd49fc5 100644 --- 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 index f37f5ba04..a0d0ab58a 100644 --- 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 index 1ee5b40a0..c8a6ff6bd 100644 --- 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 index fc6f271a7..d63045e97 100644 --- 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 index e5f5a3c15..ac720c105 100644 --- 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 index 019658ef0..cc2e575d0 100644 --- 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 index 77b6535d5..94f51c766 100644 --- 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 index 9a284458b..e95f51ce2 100644 --- 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 index 67ef62007..aff6f9b0a 100644 --- 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 index 614c8098c..a2983e066 100644 --- 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 index c8c9a1477..1b651673d 100644 --- 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 index 68fc0089e..d4374b87f 100644 --- 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 index dc7a10ab4..b13a4e924 100644 --- 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 index 852b8c3be..a225d389a 100644 --- 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 index 60187f604..6e865a88b 100644 --- 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 index cd0c711c7..bc5424cf8 100644 --- 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 index 6a51d076d..6ef8393f3 100644 --- a/schemas/redactor-troubleshoot-v1beta2.json +++ b/schemas/redactor-troubleshoot-v1beta2.json @@ -72,6 +72,9 @@ } } } + }, + "uri": { + "type": "string" } } },