ROX-26625: Make Certmonitor Ignore Probe Instances (#2083)

* ignoring probe instances * empty string label
stackrox · Nov 7, 2024 · aaf828f · aaf828f
1 parent c12b5f3
commit aaf828f
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/fleetshard/main.go b/fleetshard/main.go
@@ -76,6 +76,10 @@ func main() {
 					Key:      reconciler.TenantIDLabelKey,
 					Operator: metav1.LabelSelectorOpExists,
 				},
+				{
+					Key:      reconciler.ProbeLabelKey,
+					Operator: metav1.LabelSelectorOpDoesNotExist,
+				},
 			},
 		},
 	}

diff --git a/fleetshard/pkg/central/reconciler/reconciler.go b/fleetshard/pkg/central/reconciler/reconciler.go
@@ -74,7 +74,10 @@ const (
 	managedByLabelKey             = "app.kubernetes.io/managed-by"
 	orgIDLabelKey                 = "rhacs.redhat.com/org-id"
 	TenantIDLabelKey              = "rhacs.redhat.com/tenant"
-	centralExpiredAtKey           = "rhacs.redhat.com/expired-at"
+
+	ProbeLabelKey = "rhacs.redhat.com/probe"
+
+	centralExpiredAtKey = "rhacs.redhat.com/expired-at"
 
 	auditLogNotifierKey  = "com.redhat.rhacs.auditLogNotifier"
 	auditLogNotifierName = "Platform Audit Logs"
@@ -1857,13 +1860,17 @@ func (r *CentralReconciler) ensureRouteDeleted(ctx context.Context, routeSupplie
 }
 
 func getTenantLabels(c private.ManagedCentral) map[string]string {
-	return map[string]string{
+	labels := map[string]string{
 		managedByLabelKey:    labelManagedByFleetshardValue,
 		instanceLabelKey:     c.Metadata.Name,
 		orgIDLabelKey:        c.Spec.Auth.OwnerOrgId,
 		TenantIDLabelKey:     c.Id,
 		instanceTypeLabelKey: c.Spec.InstanceType,
 	}
+	if c.Metadata.Internal {
+		labels[ProbeLabelKey] = ""
+	}
+	return labels
 }
 
 func getTenantAnnotations(c private.ManagedCentral) map[string]string {