A few more updates when testing with kURL

replicatedhq · Dec 11, 2023 · eedb830 · eedb830
1 parent d8f61d9
commit eedb830
Show file tree

Hide file tree

Showing 12 changed files with 30 additions and 42 deletions.
diff --git a/config/crds/troubleshoot.sh_analyzers.yaml b/config/crds/troubleshoot.sh_analyzers.yaml
@@ -609,7 +609,6 @@ spec:
                           type: BoolString
                       required:
                       - collectorName
-                      - outcomes
                       type: object
                     imagePullSecret:
                       properties:

diff --git a/config/crds/troubleshoot.sh_collectors.yaml b/config/crds/troubleshoot.sh_collectors.yaml
@@ -345,8 +345,6 @@ spec:
                               type: string
                             serviceAccountName:
                               type: string
-                          required:
-                          - image
                           type: object
                       type: object
                     helm:

diff --git a/config/crds/troubleshoot.sh_preflights.yaml b/config/crds/troubleshoot.sh_preflights.yaml
@@ -609,7 +609,6 @@ spec:
                           type: BoolString
                       required:
                       - collectorName
-                      - outcomes
                       type: object
                     imagePullSecret:
                       properties:
@@ -1907,8 +1906,6 @@ spec:
                               type: string
                             serviceAccountName:
                               type: string
-                          required:
-                          - image
                           type: object
                       type: object
                     helm:

diff --git a/config/crds/troubleshoot.sh_supportbundles.yaml b/config/crds/troubleshoot.sh_supportbundles.yaml
@@ -640,7 +640,6 @@ spec:
                           type: BoolString
                       required:
                       - collectorName
-                      - outcomes
                       type: object
                     imagePullSecret:
                       properties:
@@ -1938,8 +1937,6 @@ spec:
                               type: string
                             serviceAccountName:
                               type: string
-                          required:
-                          - image
                           type: object
                       type: object
                     helm:

diff --git a/pkg/apis/troubleshoot/v1beta2/analyzer_shared.go b/pkg/apis/troubleshoot/v1beta2/analyzer_shared.go
@@ -227,7 +227,7 @@ type CertificatesAnalyze struct {
 
 type GoldpingerAnalyze struct {
 	AnalyzeMeta   `json:",inline" yaml:",inline"`
-	Outcomes      []*Outcome `json:"outcomes" yaml:"outcomes"`
+	Outcomes      []*Outcome `json:"outcomes,omitempty" yaml:"outcomes,omitempty"`
 	CollectorName string     `json:"collectorName" yaml:"collectorName"`
 	FilePath      string     `json:"filePath,omitempty" yaml:"filePath,omitempty"`
 }

diff --git a/pkg/apis/troubleshoot/v1beta2/collector_shared.go b/pkg/apis/troubleshoot/v1beta2/collector_shared.go
@@ -261,13 +261,13 @@ type Helm struct {
 
 type Goldpinger struct {
 	CollectorMeta    `json:",inline" yaml:",inline"`
-	Namespace        string           `json:"namespace,omitempty" yaml:"namespace,omitempty"`
-	PodLaunchOptions PodLaunchOptions `json:"podLaunchOptions,omitempty" yaml:"podLaunchOptions,omitempty"`
+	Namespace        string            `json:"namespace,omitempty" yaml:"namespace,omitempty"`
+	PodLaunchOptions *PodLaunchOptions `json:"podLaunchOptions,omitempty" yaml:"podLaunchOptions,omitempty"`
 }
 
 type PodLaunchOptions struct {
 	Namespace          string            `json:"namespace,omitempty" yaml:"namespace,omitempty"`
-	Image              string            `json:"image" yaml:"image"`
+	Image              string            `json:"image,omitempty" yaml:"image,omitempty"`
 	ImagePullSecret    *ImagePullSecrets `json:"imagePullSecret,omitempty" yaml:"imagePullSecret,omitempty"`
 	ServiceAccountName string            `json:"serviceAccountName,omitempty" yaml:"serviceAccountName,omitempty"`
 }

diff --git a/pkg/apis/troubleshoot/v1beta2/zz_generated.deepcopy.go b/pkg/apis/troubleshoot/v1beta2/zz_generated.deepcopy.go
diff --git a/pkg/collect/goldpinger.go b/pkg/collect/goldpinger.go
@@ -103,21 +103,26 @@ func (c *CollectGoldpinger) runPodAndCollectGPResults(progressChan chan<- interf
 	rest.InClusterConfig()
 
 	namespace := "default"
-	if c.Collector.PodLaunchOptions.Namespace != "" {
-		namespace = c.Collector.PodLaunchOptions.Namespace
-	}
-
 	serviceAccountName := ""
-	if c.Collector.PodLaunchOptions.ServiceAccountName != "" {
-		serviceAccountName = c.Collector.PodLaunchOptions.ServiceAccountName
-		if err := checkForExistingServiceAccount(c.Context, c.Client, namespace, serviceAccountName); err != nil {
-			return nil, err
+	image := constants.GP_DEFAULT_IMAGE
+	var imagePullSecret *troubleshootv1beta2.ImagePullSecrets
+
+	if c.Collector.PodLaunchOptions != nil {
+		if c.Collector.PodLaunchOptions.Namespace != "" {
+			namespace = c.Collector.PodLaunchOptions.Namespace
 		}
-	}
 
-	image := constants.GP_DEFAULT_IMAGE
-	if c.Collector.PodLaunchOptions.Image != "" {
-		image = c.Collector.PodLaunchOptions.Image
+		if c.Collector.PodLaunchOptions.ServiceAccountName != "" {
+			serviceAccountName = c.Collector.PodLaunchOptions.ServiceAccountName
+			if err := checkForExistingServiceAccount(c.Context, c.Client, namespace, serviceAccountName); err != nil {
+				return nil, err
+			}
+		}
+
+		if c.Collector.PodLaunchOptions.Image != "" {
+			image = c.Collector.PodLaunchOptions.Image
+		}
+		imagePullSecret = c.Collector.PodLaunchOptions.ImagePullSecret
 	}
 
 	runPodCollectorName := "ts-goldpinger-collector"
@@ -129,7 +134,7 @@ func (c *CollectGoldpinger) runPodAndCollectGPResults(progressChan chan<- interf
 		Name:            runPodCollectorName,
 		Namespace:       namespace,
 		Timeout:         time.Minute.String(),
-		ImagePullSecret: c.Collector.PodLaunchOptions.ImagePullSecret,
+		ImagePullSecret: imagePullSecret,
 		PodSpec: corev1.PodSpec{
 			RestartPolicy:      corev1.RestartPolicyNever,
 			ServiceAccountName: serviceAccountName,

diff --git a/schemas/analyzer-troubleshoot-v1beta2.json b/schemas/analyzer-troubleshoot-v1beta2.json
@@ -827,8 +827,7 @@
               "goldpinger": {
                 "type": "object",
                 "required": [
-                  "collectorName",
-                  "outcomes"
+                  "collectorName"
                 ],
                 "properties": {
                   "annotations": {

diff --git a/schemas/collector-troubleshoot-v1beta2.json b/schemas/collector-troubleshoot-v1beta2.json
@@ -449,9 +449,6 @@
                   },
                   "podLaunchOptions": {
                     "type": "object",
-                    "required": [
-                      "image"
-                    ],
                     "properties": {
                       "image": {
                         "type": "string"

diff --git a/schemas/preflight-troubleshoot-v1beta2.json b/schemas/preflight-troubleshoot-v1beta2.json
@@ -827,8 +827,7 @@
               "goldpinger": {
                 "type": "object",
                 "required": [
-                  "collectorName",
-                  "outcomes"
+                  "collectorName"
                 ],
                 "properties": {
                   "annotations": {
@@ -2855,9 +2854,6 @@
                   },
                   "podLaunchOptions": {
                     "type": "object",
-                    "required": [
-                      "image"
-                    ],
                     "properties": {
                       "image": {
                         "type": "string"

diff --git a/schemas/supportbundle-troubleshoot-v1beta2.json b/schemas/supportbundle-troubleshoot-v1beta2.json
@@ -873,8 +873,7 @@
               "goldpinger": {
                 "type": "object",
                 "required": [
-                  "collectorName",
-                  "outcomes"
+                  "collectorName"
                 ],
                 "properties": {
                   "annotations": {
@@ -2901,9 +2900,6 @@
                   },
                   "podLaunchOptions": {
                     "type": "object",
-                    "required": [
-                      "image"
-                    ],
                     "properties": {
                       "image": {
                         "type": "string"