Use contextcheck

Author: dmage

.golangci.yaml

@@ -1,5 +1,6 @@
 linters:
   enable:
+  - contextcheck
   - errcheck
   - exhaustive
   - gofumpt

Makefile

@@ -4,7 +4,7 @@ PROG  := cluster-image-registry-operator
 
 GOLANGCI_LINT = _output/tools/golangci-lint
 GOLANGCI_LINT_CACHE = $(PWD)/_output/golangci-lint-cache
-GOLANGCI_LINT_VERSION = v1.50.0
+GOLANGCI_LINT_VERSION = v1.50.1
 
 GO_REQUIRED_MIN_VERSION = 1.16
 

pkg/client/operatorclient.go

@@ -77,7 +77,7 @@ func (c *ConfigOperatorClient) UpdateOperatorStatus(ctx context.Context, oldReso
 
 	config.Status.OperatorStatus = *in
 
-	updatedConfig, err := c.client.UpdateStatus(context.TODO(), config, metav1.UpdateOptions{})
+	updatedConfig, err := c.client.UpdateStatus(ctx, config, metav1.UpdateOptions{})
 	if err != nil {
 		return nil, err
 	}

pkg/operator/starter.go

@@ -62,7 +62,7 @@ func RunOperator(ctx context.Context, kubeconfig *restclient.Config) error {
 
 	// library-go just logs a warning and continues
 	// https://github.com/openshift/library-go/blob/4362aa519714a4b62b00ab8318197ba2bba51cb7/pkg/controller/controllercmd/builder.go#L230
-	controllerRef, err := events.GetControllerReferenceForCurrentPod(context.TODO(), kubeClient, defaults.ImageRegistryOperatorNamespace, nil)
+	controllerRef, err := events.GetControllerReferenceForCurrentPod(ctx, kubeClient, defaults.ImageRegistryOperatorNamespace, nil)
 	if err != nil {
 		klog.Warningf("unable to get owner reference (falling back to namespace): %v", err)
 	}

test/e2e/removed_test.go

@@ -143,7 +143,7 @@ func dumpBuildInfo(ctx context.Context, te framework.TestEnv, nsName string, bui
 	}
 	te.Log("attempting to dump build information")
 	buildPodName := fmt.Sprintf("%s-build", buildName)
-	buildLogs, err := framework.GetLogsForPod(te.Client(), nsName, buildPodName)
+	buildLogs, err := framework.GetLogsForPod(ctx, te.Client(), nsName, buildPodName)
 	if err != nil {
 		te.Logf("failed to get build logs: %v", err)
 	} else {

test/framework/logs.go

@@ -46,13 +46,15 @@ func (psl PodSetLogs) Contains(re *regexp.Regexp) bool {
 }
 
 func GetLogsByLabelSelector(client *Clientset, namespace string, labelSelector *metav1.LabelSelector, previous bool) (PodSetLogs, error) {
+	ctx := context.Background()
+
 	selector, err := metav1.LabelSelectorAsSelector(labelSelector)
 	if err != nil {
 		return nil, err
 	}
 
 	podList, err := client.Pods(namespace).List(
-		context.Background(), metav1.ListOptions{
+		ctx, metav1.ListOptions{
 			LabelSelector: selector.String(),
 		},
 	)
@@ -62,7 +64,7 @@ func GetLogsByLabelSelector(client *Clientset, namespace string, labelSelector *
 
 	podLogs := make(PodSetLogs)
 	for _, pod := range podList.Items {
-		podLog, err := readPodLogs(client, &pod, previous)
+		podLog, err := readPodLogs(ctx, client, &pod, previous)
 		if err != nil {
 			return nil, err
 		}
@@ -71,13 +73,12 @@ func GetLogsByLabelSelector(client *Clientset, namespace string, labelSelector *
 	return podLogs, nil
 }
 
-func GetLogsForPod(client *Clientset, namespace string, podName string) (PodSetLogs, error) {
-	ctx := context.Background()
+func GetLogsForPod(ctx context.Context, client *Clientset, namespace string, podName string) (PodSetLogs, error) {
 	pod, err := client.Pods(namespace).Get(ctx, podName, metav1.GetOptions{})
 	if err != nil {
 		return nil, err
 	}
-	podLogs, err := readPodLogs(client, pod, false)
+	podLogs, err := readPodLogs(ctx, client, pod, false)
 	if err != nil {
 		return nil, err
 	}
@@ -86,14 +87,14 @@ func GetLogsForPod(client *Clientset, namespace string, podName string) (PodSetL
 	return podSetLogs, nil
 }
 
-func readPodLogs(client *Clientset, pod *corev1.Pod, previous bool) (PodLog, error) {
+func readPodLogs(ctx context.Context, client *Clientset, pod *corev1.Pod, previous bool) (PodLog, error) {
 	podLog := make(PodLog)
 	for _, container := range pod.Spec.Containers {
 		var containerLog ContainerLog
 		log, err := client.Pods(pod.Namespace).GetLogs(pod.Name, &corev1.PodLogOptions{
 			Container: container.Name,
 			Previous:  previous,
-		}).Stream(context.Background())
+		}).Stream(ctx)
 		if err != nil {
 			return nil, fmt.Errorf("failed to get logs for pod %s: %s", pod.Name, err)
 		}