fixup! revert: Remove redundant context checks

Author: jimmidyson

pkg/controllers/namespacesync/controller.go

@@ -135,29 +135,23 @@ func (r *Reconciler) Reconcile(
 
 	// TODO Consider running in parallel.
 	for i := range sccs {
-		// Check for context cancellation to prevent goroutine leaks
-		select {
-		case <-ctx.Done():
-			return ctrl.Result{}, ctx.Err()
-		default:
-			scc := &sccs[i]
-
-			err := copyClusterClassAndTemplates(
-				ctx,
-				r.Client,
-				r.UnstructuredCachingClient,
-				scc,
+		scc := &sccs[i]
+
+		err := copyClusterClassAndTemplates(
+			ctx,
+			r.Client,
+			r.UnstructuredCachingClient,
+			scc,
+			namespace,
+		)
+		if err != nil {
+			// TODO Record an Event.
+			return ctrl.Result{}, fmt.Errorf(
+				"failed to copy source ClusterClass %s or its referenced Templates to namespace %s: %w",
+				client.ObjectKeyFromObject(scc),
 				namespace,
+				err,
 			)
-			if err != nil {
-				// TODO Record an Event.
-				return ctrl.Result{}, fmt.Errorf(
-					"failed to copy source ClusterClass %s or its referenced Templates to namespace %s: %w",
-					client.ObjectKeyFromObject(scc),
-					namespace,
-					err,
-				)
-			}
 		}
 	}
 

pkg/controllers/namespacesync/references.go

@@ -79,21 +79,15 @@ func walkReferences(
 	}
 
 	for mdIdx := range cc.Spec.Workers.MachineDeployments {
-		// Check for context cancellation to prevent goroutine leaks
-		select {
-		case <-ctx.Done():
-			return ctx.Err()
-		default:
-			md := &cc.Spec.Workers.MachineDeployments[mdIdx]
-			if md.Template.Infrastructure.Ref != nil {
-				if err := fn(ctx, md.Template.Infrastructure.Ref); err != nil {
-					return err
-				}
+		md := &cc.Spec.Workers.MachineDeployments[mdIdx]
+		if md.Template.Infrastructure.Ref != nil {
+			if err := fn(ctx, md.Template.Infrastructure.Ref); err != nil {
+				return err
 			}
-			if md.Template.Bootstrap.Ref != nil {
-				if err := fn(ctx, md.Template.Bootstrap.Ref); err != nil {
-					return err
-				}
+		}
+		if md.Template.Bootstrap.Ref != nil {
+			if err := fn(ctx, md.Template.Bootstrap.Ref); err != nil {
+				return err
 			}
 		}
 	}