Update context propagation for go 1.19

Signed-off-by: Francesco Ilario <[email protected]>
codeready-toolchain · Nov 7, 2023 · ae26f91 · ae26f91
1 parent dabc093
commit ae26f91
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/controllers/idler/idler_controller.go b/controllers/idler/idler_controller.go
@@ -141,9 +141,12 @@ func (r *Reconciler) ensureIdling(ctx context.Context, idler *toolchainv1alpha1.
 				}
 
 				// Check if it belongs to a controller (Deployment, DeploymentConfig, etc) and scale it down to zero.
-				lctx := context.WithoutCancel(ctx)
-				log.IntoContext(lctx, podLogger)
-				appType, appName, deletedByController, err := r.scaleControllerToZero(lctx, pod.ObjectMeta)
+				appType, appName, deletedByController, err := func() (string, string, bool, error) {
+					lctx, lcancel := context.WithCancel(ctx)
+					defer lcancel()
+					log.IntoContext(lctx, podLogger)
+					return r.scaleControllerToZero(lctx, pod.ObjectMeta)
+				}()
 				if err != nil {
 					return err
 				}