fix: always use available context

enix · Jun 28, 2024 · cbbfa60 · cbbfa60
1 parent 7b6b0c1
commit cbbfa60
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/api/core/v1/pod_webhook.go b/api/core/v1/pod_webhook.go
@@ -175,14 +175,14 @@ func (a *ImageRewriter) isImageRewritable(container *corev1.Container) error {
 func (p *PodInitializer) Start(ctx context.Context) error {
 	setupLog := ctrl.Log.WithName("setup.pods")
 	pods := corev1.PodList{}
-	err := p.Client.List(context.TODO(), &pods)
+	err := p.Client.List(ctx, &pods)
 	if err != nil {
 		return err
 	}
 
 	for _, pod := range pods.Items {
 		setupLog.Info("patching " + pod.Namespace + "/" + pod.Name)
-		err := p.Client.Patch(context.Background(), &pod, client.RawPatch(types.JSONPatchType, []byte("[]")))
+		err := p.Client.Patch(ctx, &pod, client.RawPatch(types.JSONPatchType, []byte("[]")))
 		if err != nil && !apierrors.IsNotFound(err) {
 			return err
 		}

diff --git a/internal/controller/kuik/cachedimage_controller.go b/internal/controller/kuik/cachedimage_controller.go
@@ -116,7 +116,7 @@ func (r *CachedImageReconciler) Reconcile(ctx context.Context, req ctrl.Request)
 
 	// Set owner reference
 	owner := &kuikv1alpha1.Repository{}
-	if err := r.Get(context.Background(), client.ObjectKeyFromObject(&repository), owner); err != nil {
+	if err := r.Get(ctx, client.ObjectKeyFromObject(&repository), owner); err != nil {
 		return ctrl.Result{}, err
 	}
 	if err := controllerutil.SetOwnerReference(owner, &cachedImage, r.Scheme); err != nil {
@@ -202,7 +202,7 @@ func (r *CachedImageReconciler) Reconcile(ctx context.Context, req ctrl.Request)
 	if forceUpdate {
 		delete(cachedImage.Annotations, cachedImageAnnotationForceUpdateName)
 	}
-	err = r.Patch(context.Background(), &cachedImage, patch)
+	err = r.Patch(ctx, &cachedImage, patch)
 	if err != nil {
 		return ctrl.Result{}, err
 	}
@@ -452,7 +452,7 @@ func (r *CachedImageReconciler) updatePodCount(ctx context.Context, cachedImage
 		Count: len(pods),
 	}
 
-	err = r.Status().Update(context.Background(), cachedImage)
+	err = r.Status().Update(ctx, cachedImage)
 	if err != nil {
 		if statusErr, ok := err.(*errors.StatusError); ok && statusErr.Status().Code == http.StatusConflict {
 			requeue = true

diff --git a/internal/controller/kuik/repository_controller.go b/internal/controller/kuik/repository_controller.go
@@ -264,7 +264,7 @@ func (r *RepositoryReconciler) repositoryWithDeletingCachedImages(ctx context.Co
 	cachedImage := obj.(*kuikv1alpha1.CachedImage)
 	var currentCachedImage kuikv1alpha1.CachedImage
 	// wait for the CachedImage to be really deleted
-	if err := r.Get(context.Background(), client.ObjectKeyFromObject(cachedImage), &currentCachedImage); err == nil || !apierrors.IsNotFound(err) {
+	if err := r.Get(ctx, client.ObjectKeyFromObject(cachedImage), &currentCachedImage); err == nil || !apierrors.IsNotFound(err) {
 		return nil
 	}