Restore single label implementation

Author: tardieu

internal/controller/appwrapper_controller.go

@@ -49,12 +49,10 @@ type AppWrapperReconciler struct {
 }
 
 const (
-	namespaceLabel = "mcad.codeflare.dev/namespace" // owner namespace label for wrapped resources
-	nameLabel      = "mcad.codeflare.dev"           // owner name label for wrapped resources
-	uidLabel       = "mcad.codeflare.dev/uid"       // owner UID label for wrapped resources
-	finalizer      = "mcad.codeflare.dev/finalizer" // finalizer name
-	nvidiaGpu      = "nvidia.com/gpu"               // GPU resource name
-	specNodeName   = ".spec.nodeName"               // key to index pods based on node placement
+	nameLabel    = "mcad.codeflare.dev"           // owner name label for wrapped resources
+	finalizer    = "mcad.codeflare.dev/finalizer" // finalizer name
+	nvidiaGpu    = "nvidia.com/gpu"               // GPU resource name
+	specNodeName = ".spec.nodeName"               // key to index pods based on node placement
 )
 
 // PodCounts summarize the status of the pods associated with one AppWrapper
@@ -235,10 +233,9 @@ func (r *AppWrapperReconciler) SetupWithManager(mgr ctrl.Manager) error {
 // Map labelled pods to corresponding AppWrappers
 func (r *AppWrapperReconciler) podMapFunc(ctx context.Context, obj client.Object) []reconcile.Request {
 	pod := obj.(*v1.Pod)
-	if namespace, ok := pod.Labels[namespaceLabel]; ok {
-		if name, ok := pod.Labels[nameLabel]; ok {
-			return []reconcile.Request{{NamespacedName: types.NamespacedName{Namespace: namespace, Name: name}}}
-		}
+	if name, ok := pod.Labels[nameLabel]; ok {
+		// assume the AppWrapper is in the same namespace, if not we rely on polling
+		return []reconcile.Request{{NamespacedName: types.NamespacedName{Namespace: pod.Namespace, Name: name}}}
 	}
 	return nil
 }

internal/controller/resource_manager.go

@@ -43,7 +43,7 @@ func (r *AppWrapperReconciler) parseResource(appWrapper *mcadv1beta1.AppWrapper,
 	if namespaced && obj.GetNamespace() == "" {
 		obj.SetNamespace(appWrapper.Namespace) // use AppWrapper namespace as default
 	}
-	obj.SetLabels(map[string]string{namespaceLabel: appWrapper.Namespace, nameLabel: appWrapper.Name, uidLabel: string(appWrapper.UID)})
+	obj.SetLabels(map[string]string{nameLabel: appWrapper.Name})
 	return obj, nil
 }
 

internal/controller/timings.go

@@ -39,5 +39,5 @@ const (
 	// may be triggered earlier due for instance to pod phase changes. Moreover, the reconciliation
 	// itself may be delayed due to the on-going reconciliation of other events.
 	runDelay      = time.Minute // maximum delay before next reconciliation when running pods
-	dispatchDelay = time.Minute // maximum delay before triggering dispatchNext with queued AppWrappers
+	dispatchDelay = time.Minute // maximum delay before next dispatch attempt with queued AppWrappers
 )