Merge pull request #3436 from gman0/fix-cachedresource-labelselector-nilptr

CachedResources reconciler should check for missing label selector

Author: kcp-ci-bot

pkg/reconciler/cache/cachedresources/cachedresources_reconcile.go

@@ -121,9 +121,12 @@ func (c *Controller) listSelectedLocalResources(ctx context.Context, cluster log
 		Resource: cachedResource.Spec.Resource,
 	}
 
-	resources, err := c.dynamicClient.Cluster(cluster.Path()).Resource(gvr).List(ctx, metav1.ListOptions{
-		LabelSelector: labels.SelectorFromSet(cachedResource.Spec.LabelSelector.MatchLabels).String(),
-	})
+	listOpts := metav1.ListOptions{}
+	if cachedResource.Spec.LabelSelector != nil {
+		listOpts.LabelSelector = labels.SelectorFromSet(cachedResource.Spec.LabelSelector.MatchLabels).String()
+	}
+
+	resources, err := c.dynamicClient.Cluster(cluster.Path()).Resource(gvr).List(ctx, listOpts)
 	if err != nil {
 		return nil, err
 	}
@@ -140,7 +143,7 @@ func (c *Controller) deleteSelectedCacheResources(ctx context.Context, cluster l
 	selector := labels.SelectorFromSet(labels.Set{
 		replicationcontroller.LabelKeyObjectSchema: gvr.Version + "." + gvr.Resource + "." + gvr.Group,
 	})
-	if len(cachedResource.Spec.LabelSelector.MatchLabels) > 0 {
+	if cachedResource.Spec.LabelSelector != nil && len(cachedResource.Spec.LabelSelector.MatchLabels) > 0 {
 		l := labels.SelectorFromSet(cachedResource.Spec.LabelSelector.MatchLabels)
 		r, _ := selector.Requirements()
 		selector = l.Add(r...)
@@ -162,7 +165,7 @@ func (c *Controller) listSelectedCacheResources(ctx context.Context, cluster log
 	selector := labels.SelectorFromSet(labels.Set{
 		replicationcontroller.LabelKeyObjectSchema: gvr.Version + "." + gvr.Resource + "." + gvr.Group,
 	})
-	if len(cachedResource.Spec.LabelSelector.MatchLabels) > 0 {
+	if cachedResource.Spec.LabelSelector != nil && len(cachedResource.Spec.LabelSelector.MatchLabels) > 0 {
 		l := labels.SelectorFromSet(cachedResource.Spec.LabelSelector.MatchLabels)
 		r, _ := selector.Requirements()
 		selector = l.Add(r...)

pkg/reconciler/cache/cachedresources/cachedresources_reconcile_replication.go

@@ -60,6 +60,11 @@ func (r *replication) reconcile(ctx context.Context, cachedResource *cachev1alph
 	}
 	cluster := logicalcluster.From(cachedResource)
 
+	var resourceLabelSelector labels.Selector
+	if cachedResource.Spec.LabelSelector != nil {
+		resourceLabelSelector = labels.SelectorFromSet(cachedResource.Spec.LabelSelector.MatchLabels)
+	}
+
 	clusterName := logicalcluster.From(cachedResource)
 	controllerName := fmt.Sprintf("%s.%s.%s.%s.%s", clusterName, gvr.Version, gvr.Resource, gvr.Group, cachedResource.Name)
 	// TODO: Add locking here when multiple workers are supported.
@@ -98,7 +103,7 @@ func (r *replication) reconcile(ctx context.Context, cachedResource *cachev1alph
 			gvr,
 			replicated,
 			callback,
-			labels.SelectorFromSet(cachedResource.Spec.LabelSelector.MatchLabels),
+			resourceLabelSelector,
 		)
 		if err != nil {
 			cancel()
@@ -124,7 +129,7 @@ func (r *replication) reconcile(ctx context.Context, cachedResource *cachev1alph
 		}
 		return reconcileStatusStopAndRequeue, nil // Once controller is started, we requeue to check if we need to delete it.
 	}
-	controller.SetLabelSelector(labels.SelectorFromSet(cachedResource.Spec.LabelSelector.MatchLabels))
+	controller.SetLabelSelector(resourceLabelSelector)
 
 	// Check if we need to wait for cleaning. This can be few cases:
 	// 1. We are in deleting phase, but nothing to delete - we are good.