export context field from collector structs (#771)

diamonwiggins · web-flow · commit 48beb303becc · 2022-10-11T14:54:54.000-04:00
diff --git a/pkg/collect/ceph.go b/pkg/collect/ceph.go
@@ -112,7 +112,7 @@ type CollectCeph struct {
 	Namespace    string
 	ClientConfig *rest.Config
 	Client       kubernetes.Interface
-	ctx          context.Context
+	Context      context.Context
 	RBACErrors
 }
 
@@ -164,7 +164,7 @@ func cephCommandExec(ctx context.Context, progressChan chan<- interface{}, c *Co
 	}
 
 	rbacErrors := c.GetRBACErrors()
-	execCollector := &CollectExec{execSpec, c.BundlePath, c.Namespace, c.ClientConfig, c.Client, c.ctx, rbacErrors}
+	execCollector := &CollectExec{execSpec, c.BundlePath, c.Namespace, c.ClientConfig, c.Client, c.Context, rbacErrors}
 
 	results, err := execCollector.Collect(progressChan)
 	if err != nil {
diff --git a/pkg/collect/collectd.go b/pkg/collect/collectd.go
@@ -14,7 +14,7 @@ type CollectCollectd struct {
 	Namespace    string
 	ClientConfig *rest.Config
 	Client       kubernetes.Interface
-	ctx          context.Context
+	Context      context.Context
 	RBACErrors
 }
 
@@ -39,7 +39,7 @@ func (c *CollectCollectd) Collect(progressChan chan<- interface{}) (CollectorRes
 	}
 
 	rbacErrors := c.GetRBACErrors()
-	copyFromHostCollector := &CollectCopyFromHost{copyFromHost, c.BundlePath, c.Namespace, c.ClientConfig, c.Client, c.ctx, rbacErrors}
+	copyFromHostCollector := &CollectCopyFromHost{copyFromHost, c.BundlePath, c.Namespace, c.ClientConfig, c.Client, c.Context, rbacErrors}
 
 	return copyFromHostCollector.Collect(progressChan)
 }
diff --git a/pkg/collect/configmap.go b/pkg/collect/configmap.go
@@ -33,7 +33,7 @@ type CollectConfigMap struct {
 	Namespace    string
 	ClientConfig *rest.Config
 	Client       kubernetes.Interface
-	ctx          context.Context
+	Context      context.Context
 	RBACErrors
 }
 
@@ -50,7 +50,7 @@ func (c *CollectConfigMap) Collect(progressChan chan<- interface{}) (CollectorRe
 
 	configMaps := []corev1.ConfigMap{}
 	if c.Collector.Name != "" {
-		configMap, err := c.Client.CoreV1().ConfigMaps(c.Collector.Namespace).Get(c.ctx, c.Collector.Name, metav1.GetOptions{})
+		configMap, err := c.Client.CoreV1().ConfigMaps(c.Collector.Namespace).Get(c.Context, c.Collector.Name, metav1.GetOptions{})
 		if err != nil {
 			if kuberneteserrors.IsNotFound(err) {
 				filePath, encoded, err := configMapToOutput(c.Collector, nil, c.Collector.Name)
@@ -64,7 +64,7 @@ func (c *CollectConfigMap) Collect(progressChan chan<- interface{}) (CollectorRe
 		}
 		configMaps = append(configMaps, *configMap)
 	} else if len(c.Collector.Selector) > 0 {
-		cms, err := listConfigMapsForSelector(c.ctx, c.Client, c.Collector.Namespace, c.Collector.Selector)
+		cms, err := listConfigMapsForSelector(c.Context, c.Client, c.Collector.Namespace, c.Collector.Selector)
 		if err != nil {
 			output.SaveResult(c.BundlePath, GetConfigMapErrorsFileName(c.Collector), marshalErrors([]string{err.Error()}))
 			return output, nil
diff --git a/pkg/collect/copy.go b/pkg/collect/copy.go
@@ -26,7 +26,7 @@ type CollectCopy struct {
 	Namespace    string
 	ClientConfig *rest.Config
 	Client       kubernetes.Interface
-	ctx          context.Context
+	Context      context.Context
 	RBACErrors
 }
 
diff --git a/pkg/collect/copy_from_host.go b/pkg/collect/copy_from_host.go
@@ -32,7 +32,7 @@ type CollectCopyFromHost struct {
 	Namespace    string
 	ClientConfig *rest.Config
 	Client       kubernetes.Interface
-	ctx          context.Context
+	Context      context.Context
 	RBACErrors
 }
 
@@ -69,13 +69,13 @@ func (c *CollectCopyFromHost) Collect(progressChan chan<- interface{}) (Collecto
 		namespace, _, _ = kubeconfig.Namespace()
 	}
 
-	_, cleanup, err := copyFromHostCreateDaemonSet(c.ctx, c.Client, c.Collector, hostDir, namespace, "troubleshoot-copyfromhost-", labels)
+	_, cleanup, err := copyFromHostCreateDaemonSet(c.Context, c.Client, c.Collector, hostDir, namespace, "troubleshoot-copyfromhost-", labels)
 	defer cleanup()
 	if err != nil {
 		return nil, errors.Wrap(err, "create daemonset")
 	}
 
-	childCtx, cancel := context.WithCancel(c.ctx)
+	childCtx, cancel := context.WithCancel(c.Context)
 	defer cancel()
 
 	timeoutCtx := context.Background()
diff --git a/pkg/collect/data.go b/pkg/collect/data.go
@@ -16,7 +16,7 @@ type CollectData struct {
 	Namespace    string
 	ClientConfig *rest.Config
 	Client       kubernetes.Interface
-	ctx          context.Context
+	Context      context.Context
 	RBACErrors
 }
 
diff --git a/pkg/collect/exec.go b/pkg/collect/exec.go
@@ -22,7 +22,7 @@ type CollectExec struct {
 	Namespace    string
 	ClientConfig *rest.Config
 	Client       kubernetes.Interface
-	ctx          context.Context
+	Context      context.Context
 	RBACErrors
 }
 
diff --git a/pkg/collect/logs.go b/pkg/collect/logs.go
@@ -22,7 +22,7 @@ type CollectLogs struct {
 	Namespace    string
 	ClientConfig *rest.Config
 	Client       kubernetes.Interface
-	ctx          context.Context
+	Context      context.Context
 	SinceTime    *time.Time
 	RBACErrors
 }
diff --git a/pkg/collect/longhorn.go b/pkg/collect/longhorn.go
@@ -35,7 +35,7 @@ type CollectLonghorn struct {
 	Namespace    string
 	ClientConfig *rest.Config
 	Client       kubernetes.Interface
-	ctx          context.Context
+	Context      context.Context
 	RBACErrors
 }
 
@@ -221,7 +221,7 @@ func (c *CollectLonghorn) Collect(progressChan chan<- interface{}) (CollectorRes
 	}
 
 	rbacErrors := c.GetRBACErrors()
-	logsCollector := &CollectLogs{logsCollectorSpec, c.BundlePath, c.Namespace, c.ClientConfig, c.Client, c.ctx, nil, rbacErrors}
+	logsCollector := &CollectLogs{logsCollectorSpec, c.BundlePath, c.Namespace, c.ClientConfig, c.Client, c.Context, nil, rbacErrors}
 
 	logs, err := logsCollector.Collect(progressChan)
 	if err != nil {
diff --git a/pkg/collect/mysql.go b/pkg/collect/mysql.go
@@ -20,7 +20,7 @@ type CollectMysql struct {
 	Namespace    string
 	ClientConfig *rest.Config
 	Client       kubernetes.Interface
-	ctx          context.Context
+	Context      context.Context
 	RBACErrors
 }
 
diff --git a/pkg/collect/postgres.go b/pkg/collect/postgres.go
@@ -21,7 +21,7 @@ type CollectPostgres struct {
 	Namespace    string
 	ClientConfig *rest.Config
 	Client       kubernetes.Interface
-	ctx          context.Context
+	Context      context.Context
 	RBACErrors
 }
 
diff --git a/pkg/collect/redis.go b/pkg/collect/redis.go
@@ -20,7 +20,7 @@ type CollectRedis struct {
 	Namespace    string
 	ClientConfig *rest.Config
 	Client       kubernetes.Interface
-	ctx          context.Context
+	Context      context.Context
 	RBACErrors
 }
 
diff --git a/pkg/collect/registry.go b/pkg/collect/registry.go
@@ -43,7 +43,7 @@ type CollectRegistry struct {
 	Namespace    string
 	ClientConfig *rest.Config
 	Client       kubernetes.Interface
-	ctx          context.Context
+	Context      context.Context
 	RBACErrors
 }
 
diff --git a/pkg/collect/run.go b/pkg/collect/run.go
@@ -15,7 +15,7 @@ type CollectRun struct {
 	Namespace    string
 	ClientConfig *rest.Config
 	Client       kubernetes.Interface
-	ctx          context.Context
+	Context      context.Context
 	RBACErrors
 }
 
@@ -67,7 +67,7 @@ func (c *CollectRun) Collect(progressChan chan<- interface{}) (CollectorResult,
 	}
 
 	rbacErrors := c.GetRBACErrors()
-	runPodCollector := &CollectRunPod{runPodSpec, c.BundlePath, c.Namespace, c.ClientConfig, c.Client, c.ctx, rbacErrors}
+	runPodCollector := &CollectRunPod{runPodSpec, c.BundlePath, c.Namespace, c.ClientConfig, c.Client, c.Context, rbacErrors}
 
 	return runPodCollector.Collect(progressChan)
 }
diff --git a/pkg/collect/run_pod.go b/pkg/collect/run_pod.go
@@ -28,7 +28,7 @@ type CollectRunPod struct {
 	Namespace    string
 	ClientConfig *rest.Config
 	Client       kubernetes.Interface
-	ctx          context.Context
+	Context      context.Context
 	RBACErrors
 }
 
diff --git a/pkg/collect/secret.go b/pkg/collect/secret.go
@@ -32,7 +32,7 @@ type CollectSecret struct {
 	Namespace    string
 	ClientConfig *rest.Config
 	Client       kubernetes.Interface
-	ctx          context.Context
+	Context      context.Context
 	RBACErrors
 }
 
@@ -49,7 +49,7 @@ func (c *CollectSecret) Collect(progressChan chan<- interface{}) (CollectorResul
 
 	secrets := []corev1.Secret{}
 	if c.Collector.Name != "" {
-		secret, err := c.Client.CoreV1().Secrets(c.Collector.Namespace).Get(c.ctx, c.Collector.Name, metav1.GetOptions{})
+		secret, err := c.Client.CoreV1().Secrets(c.Collector.Namespace).Get(c.Context, c.Collector.Name, metav1.GetOptions{})
 		if err != nil {
 			if kuberneteserrors.IsNotFound(err) {
 				filePath, encoded, err := secretToOutput(c.Collector, nil, c.Collector.Name)
@@ -63,7 +63,7 @@ func (c *CollectSecret) Collect(progressChan chan<- interface{}) (CollectorResul
 		}
 		secrets = append(secrets, *secret)
 	} else if len(c.Collector.Selector) > 0 {
-		ss, err := listSecretsForSelector(c.ctx, c.Client, c.Collector.Namespace, c.Collector.Selector)
+		ss, err := listSecretsForSelector(c.Context, c.Client, c.Collector.Namespace, c.Collector.Selector)
 		if err != nil {
 			output.SaveResult(c.BundlePath, GetSecretErrorsFileName(c.Collector), marshalErrors([]string{err.Error()}))
 			return output, nil
diff --git a/pkg/collect/sysctl.go b/pkg/collect/sysctl.go
@@ -22,7 +22,7 @@ type CollectSysctl struct {
 	Namespace    string
 	ClientConfig *rest.Config
 	Client       kubernetes.Interface
-	ctx          context.Context
+	Context      context.Context
 	RBACErrors
 }
 
@@ -43,9 +43,9 @@ func (c *CollectSysctl) Collect(progressChan chan<- interface{}) (CollectorResul
 		if timeout == 0 {
 			timeout = time.Minute
 		}
-		childCtx, cancel := context.WithTimeout(c.ctx, timeout)
+		childCtx, cancel := context.WithTimeout(c.Context, timeout)
 		defer cancel()
-		c.ctx = childCtx
+		c.Context = childCtx
 	}
 
 	if c.Collector.Namespace == "" {
@@ -74,7 +74,7 @@ find /proc/sys/net/bridge -type f | while read f; do v=$(cat $f 2>/dev/null); ec
 		runPodOptions.ImagePullSecretName = c.Collector.ImagePullSecret.Name
 
 		if c.Collector.ImagePullSecret.Data != nil {
-			secretName, err := createSecret(c.ctx, c.Client, c.Collector.Namespace, c.Collector.ImagePullSecret)
+			secretName, err := createSecret(c.Context, c.Client, c.Collector.Namespace, c.Collector.ImagePullSecret)
 			if err != nil {
 				return nil, errors.Wrap(err, "create image pull secret")
 			}
@@ -89,7 +89,7 @@ find /proc/sys/net/bridge -type f | while read f; do v=$(cat $f 2>/dev/null); ec
 		}
 	}
 
-	results, err := RunPodsReadyNodes(c.ctx, c.Client.CoreV1(), runPodOptions)
+	results, err := RunPodsReadyNodes(c.Context, c.Client.CoreV1(), runPodOptions)
 	if err != nil {
 		return nil, err
 	}

Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ type CollectCeph struct {`
`112`	`112`	`Namespace string`
`113`	`113`	`ClientConfig *rest.Config`
`114`	`114`	`Client kubernetes.Interface`
`115`		`- ctx context.Context`
	`115`	`+ Context context.Context`
`116`	`116`	`RBACErrors`
`117`	`117`	`}`
`118`	`118`
`@@ -164,7 +164,7 @@ func cephCommandExec(ctx context.Context, progressChan chan<- interface{}, c *Co`
`164`	`164`	`}`
`165`	`165`
`166`	`166`	`rbacErrors := c.GetRBACErrors()`
`167`		`- execCollector := &CollectExec{execSpec, c.BundlePath, c.Namespace, c.ClientConfig, c.Client, c.ctx, rbacErrors}`
	`167`	`+ execCollector := &CollectExec{execSpec, c.BundlePath, c.Namespace, c.ClientConfig, c.Client, c.Context, rbacErrors}`
`168`	`168`
`169`	`169`	`results, err := execCollector.Collect(progressChan)`
`170`	`170`	`if err != nil {`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ type CollectCollectd struct {`
`14`	`14`	`Namespace string`
`15`	`15`	`ClientConfig *rest.Config`
`16`	`16`	`Client kubernetes.Interface`
`17`		`- ctx context.Context`
	`17`	`+ Context context.Context`
`18`	`18`	`RBACErrors`
`19`	`19`	`}`
`20`	`20`
`@@ -39,7 +39,7 @@ func (c *CollectCollectd) Collect(progressChan chan<- interface{}) (CollectorRes`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`rbacErrors := c.GetRBACErrors()`
`42`		`- copyFromHostCollector := &CollectCopyFromHost{copyFromHost, c.BundlePath, c.Namespace, c.ClientConfig, c.Client, c.ctx, rbacErrors}`
	`42`	`+ copyFromHostCollector := &CollectCopyFromHost{copyFromHost, c.BundlePath, c.Namespace, c.ClientConfig, c.Client, c.Context, rbacErrors}`
`43`	`43`
`44`	`44`	`return copyFromHostCollector.Collect(progressChan)`
`45`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ type CollectCopy struct {`
`26`	`26`	`Namespace string`
`27`	`27`	`ClientConfig *rest.Config`
`28`	`28`	`Client kubernetes.Interface`
`29`		`- ctx context.Context`
	`29`	`+ Context context.Context`
`30`	`30`	`RBACErrors`
`31`	`31`	`}`
`32`	`32`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ type CollectData struct {`
`16`	`16`	`Namespace string`
`17`	`17`	`ClientConfig *rest.Config`
`18`	`18`	`Client kubernetes.Interface`
`19`		`- ctx context.Context`
	`19`	`+ Context context.Context`
`20`	`20`	`RBACErrors`
`21`	`21`	`}`
`22`	`22`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ type CollectExec struct {`
`22`	`22`	`Namespace string`
`23`	`23`	`ClientConfig *rest.Config`
`24`	`24`	`Client kubernetes.Interface`
`25`		`- ctx context.Context`
	`25`	`+ Context context.Context`
`26`	`26`	`RBACErrors`
`27`	`27`	`}`
`28`	`28`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ type CollectLogs struct {`
`22`	`22`	`Namespace string`
`23`	`23`	`ClientConfig *rest.Config`
`24`	`24`	`Client kubernetes.Interface`
`25`		`- ctx context.Context`
	`25`	`+ Context context.Context`
`26`	`26`	`SinceTime *time.Time`
`27`	`27`	`RBACErrors`
`28`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ type CollectLonghorn struct {`
`35`	`35`	`Namespace string`
`36`	`36`	`ClientConfig *rest.Config`
`37`	`37`	`Client kubernetes.Interface`
`38`		`- ctx context.Context`
	`38`	`+ Context context.Context`
`39`	`39`	`RBACErrors`
`40`	`40`	`}`
`41`	`41`
`@@ -221,7 +221,7 @@ func (c *CollectLonghorn) Collect(progressChan chan<- interface{}) (CollectorRes`
`221`	`221`	`}`
`222`	`222`
`223`	`223`	`rbacErrors := c.GetRBACErrors()`
`224`		`- logsCollector := &CollectLogs{logsCollectorSpec, c.BundlePath, c.Namespace, c.ClientConfig, c.Client, c.ctx, nil, rbacErrors}`
	`224`	`+ logsCollector := &CollectLogs{logsCollectorSpec, c.BundlePath, c.Namespace, c.ClientConfig, c.Client, c.Context, nil, rbacErrors}`
`225`	`225`
`226`	`226`	`logs, err := logsCollector.Collect(progressChan)`
`227`	`227`	`if err != nil {`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ type CollectMysql struct {`
`20`	`20`	`Namespace string`
`21`	`21`	`ClientConfig *rest.Config`
`22`	`22`	`Client kubernetes.Interface`
`23`		`- ctx context.Context`
	`23`	`+ Context context.Context`
`24`	`24`	`RBACErrors`
`25`	`25`	`}`
`26`	`26`