Some more changes noted when writing docs

replicatedhq · Dec 11, 2023 · 2a32b25 · 2a32b25
1 parent b7e539b
commit 2a32b25
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/pkg/apis/troubleshoot/v1beta2/collector_shared.go b/pkg/apis/troubleshoot/v1beta2/collector_shared.go
@@ -268,10 +268,8 @@ type Goldpinger struct {
 type PodLaunchOptions struct {
 	Namespace          string            `json:"namespace,omitempty" yaml:"namespace,omitempty"`
 	Image              string            `json:"image" yaml:"image"`
-	ImagePullPolicy    string            `json:"imagePullPolicy,omitempty" yaml:"imagePullPolicy,omitempty"`
 	ImagePullSecret    *ImagePullSecrets `json:"imagePullSecret,omitempty" yaml:"imagePullSecret,omitempty"`
 	ServiceAccountName string            `json:"serviceAccountName,omitempty" yaml:"serviceAccountName,omitempty"`
-	Timeout            string            `json:"timeout,omitempty" yaml:"timeout,omitempty"`
 }
 
 type Collect struct {

diff --git a/pkg/collect/goldpinger.go b/pkg/collect/goldpinger.go
@@ -128,7 +128,7 @@ func (c *CollectGoldpinger) runPodAndCollectGPResults(progressChan chan<- interf
 		},
 		Name:            runPodCollectorName,
 		Namespace:       namespace,
-		Timeout:         c.Collector.PodLaunchOptions.Timeout,
+		Timeout:         time.Minute.String(),
 		ImagePullSecret: c.Collector.PodLaunchOptions.ImagePullSecret,
 		PodSpec: corev1.PodSpec{
 			RestartPolicy:      corev1.RestartPolicyNever,