Merge pull request #201 from gianlucam76/selector

Return an error if clusterSelector is not parsable

Author: gianlucam76

Makefile

@@ -12,7 +12,7 @@ GO_INSTALL := ./scripts/go_install.sh
 REGISTRY ?= projectsveltos
 IMAGE_NAME ?= sveltosctl
 export SVELTOSCTL_IMG ?= $(REGISTRY)/$(IMAGE_NAME)
-TAG ?= main
+TAG ?= dev
 ARCH ?= amd64
 
 # Directories.

internal/commands/techsupport_reconciler.go

@@ -371,7 +371,10 @@ func getMatchingClusters(ctx context.Context, techsupport *utilsv1alpha1.Techsup
 
 	matching := make([]corev1.ObjectReference, 0)
 
-	parsedSelector, _ := labels.Parse(string(techsupport.Spec.ClusterSelector))
+	parsedSelector, err := labels.Parse(string(techsupport.Spec.ClusterSelector))
+	if err != nil {
+		return nil, err
+	}
 
 	tmpMatching, err := getMatchingCAPIClusters(ctx, parsedSelector)
 	if err != nil {

internal/commands/techsupport_reconciler_utils.go

@@ -387,7 +387,11 @@ func requeueTechsupportForCluster(
 	// matching the Cluster
 	for k := range techsupports {
 		techsupportSelector := techsupports[k]
-		parsedSelector, _ := labels.Parse(string(techsupportSelector))
+		parsedSelector, err := labels.Parse(string(techsupportSelector))
+		if err != nil {
+			// When clusterSelector is fixed, Techsupport will be reconciled
+			return requests
+		}
 		if parsedSelector.Matches(labels.Set(cluster.GetLabels())) {
 			requests = append(requests, ctrl.Request{
 				NamespacedName: client.ObjectKey{

manifest/manifest.yaml

@@ -46,7 +46,7 @@ spec:
       serviceAccountName: sveltosctl
       containers:
       - name: sveltosctl
-        image: projectsveltos/sveltosctl-amd64:main
+        image: projectsveltos/sveltosctl-amd64:dev
         imagePullPolicy: IfNotPresent
         command:
           - /sveltosctl