Optimise target building and fix panic in integration tests (#4802)

* Compute cluster groups label map only once

The same label map does not need to be computed three times for the same
cluster groups.

* Fix integration tests

This fixes a panic in integration tests for `doNotDeploy`, and ensures
that the `It` block title is formatted like a sentence, for better
readability.

Author: weyfonk

integrationtests/controller/bundle/bundle_targets_test.go

@@ -398,7 +398,7 @@ var _ = Describe("Bundle targets", Ordered, func() {
 			targets = append(targets, targetsInGitRepo...)
 		})
 
-		It("no BundleDeployments are created", func() {
+		It("does not create any BundleDeployments", func() {
 			waitForBundleToBeReady(bundleName)
 			_ = verifyBundlesDeploymentsAreCreated(expectedNumberOfBundleDeployments, bdLabels, bundleName)
 		})
@@ -592,6 +592,9 @@ var _ = Describe("Bundle targets", Ordered, func() {
 
 func verifyBundlesDeploymentsAreCreated(numBundleDeployments int, bdLabels map[string]string, bundleName string) *v1alpha1.BundleDeploymentList {
 	var bdList *v1alpha1.BundleDeploymentList
+	if bdLabels == nil {
+		bdLabels = map[string]string{}
+	}
 	bdLabels["fleet.cattle.io/bundle-name"] = bundleName
 	Eventually(func() int {
 		bdList = &v1alpha1.BundleDeploymentList{}

internal/cmd/controller/target/builder.go

@@ -79,14 +79,16 @@ func (m *Manager) Targets(ctx context.Context, bundle *fleet.Bundle, manifestID
 				return nil, false, err
 			}
 
-			target := bm.Match(cluster.Name, ClusterGroupsToLabelMap(clusterGroups), cluster.Labels)
+			clusterGroupsAsLabelMap := ClusterGroupsToLabelMap(clusterGroups)
+
+			target := bm.Match(cluster.Name, clusterGroupsAsLabelMap, cluster.Labels)
 			if target == nil {
 				continue
 			}
 			// Check all matching targetCustomizations for doNotDeploy, not just the first match.
 			// This ensures that a doNotDeploy entry is honoured even when a broader-matching
 			// target appears before it in the target list (fixes first-match bypass).
-			doNotDeploy := target.DoNotDeploy || bm.HasDoNotDeployTarget(cluster.Name, ClusterGroupsToLabelMap(clusterGroups), cluster.Labels)
+			doNotDeploy := target.DoNotDeploy || bm.HasDoNotDeployTarget(cluster.Name, clusterGroupsAsLabelMap, cluster.Labels)
 			if doNotDeploy {
 				logger.V(1).Info("Skipping BundleDeployment creation because doNotDeploy is set to true.",
 					"bundle", bundle.Name,
@@ -99,7 +101,7 @@ func (m *Manager) Targets(ctx context.Context, bundle *fleet.Bundle, manifestID
 			}
 			// check if there is any matching targetCustomization that should be applied
 			targetOpts := target.BundleDeploymentOptions
-			targetCustomized := bm.MatchTargetCustomizations(cluster.Name, ClusterGroupsToLabelMap(clusterGroups), cluster.Labels)
+			targetCustomized := bm.MatchTargetCustomizations(cluster.Name, clusterGroupsAsLabelMap, cluster.Labels)
 			if targetCustomized != nil {
 				targetOpts = targetCustomized.BundleDeploymentOptions
 			}