✨ Refactor: Remove legacy CronJob name functions and update label selectors for consistency

Author: slntopp

controllers/container_image/resources.go

@@ -233,11 +233,6 @@ func CronJobName(prefix string) string {
 	return k8s.CronJobName("container-scan", prefix)
 }
 
-// LegacyCronJobName returns the pre-v14 name format: {prefix}-containers-scan
-func LegacyCronJobName(prefix string) string {
-	return fmt.Sprintf("%s%s", prefix, CronJobNameSuffix)
-}
-
 func ConfigMap(integrationMRN, clusterUID string, m v1alpha2.MondooAuditConfig, cfg v1alpha2.MondooOperatorConfig) (*corev1.ConfigMap, error) {
 	inv, err := Inventory(integrationMRN, clusterUID, m, cfg)
 	if err != nil {

controllers/k8s_scan/deployment_handler.go

@@ -404,10 +404,7 @@ func (n *DeploymentHandler) cleanupOrphanedExternalClusterResources(ctx context.
 	cronJobs := &batchv1.CronJobList{}
 	listOpts := &client.ListOptions{
 		Namespace: n.Mondoo.Namespace,
-		LabelSelector: labels.SelectorFromSet(map[string]string{
-			"app":       "mondoo-k8s-scan",
-			"mondoo_cr": n.Mondoo.Name,
-		}),
+		LabelSelector: labels.SelectorFromSet(CronJobLabels(*n.Mondoo)),
 	}
 	if err := n.KubeClient.List(ctx, cronJobs, listOpts); err != nil {
 		return err
@@ -573,10 +570,7 @@ func (n *DeploymentHandler) garbageCollectIfNeeded(ctx context.Context, clusterU
 	cronJobs := &batchv1.CronJobList{}
 	listOpts := &client.ListOptions{
 		Namespace: n.Mondoo.Namespace,
-		LabelSelector: labels.SelectorFromSet(map[string]string{
-			"app":       "mondoo-k8s-scan",
-			"mondoo_cr": n.Mondoo.Name,
-		}),
+		LabelSelector: labels.SelectorFromSet(CronJobLabels(*n.Mondoo)),
 	}
 	if err := n.KubeClient.List(ctx, cronJobs, listOpts); err != nil {
 		logger.Error(err, "Failed to list CronJobs for garbage collection")
@@ -731,10 +725,7 @@ func (n *DeploymentHandler) cleanupStaleCronJobs(ctx context.Context) error {
 	cronJobs := &batchv1.CronJobList{}
 	listOpts := &client.ListOptions{
 		Namespace: n.Mondoo.Namespace,
-		LabelSelector: labels.SelectorFromSet(map[string]string{
-			"app":       "mondoo-k8s-scan",
-			"mondoo_cr": n.Mondoo.Name,
-		}),
+		LabelSelector: labels.SelectorFromSet(CronJobLabels(*n.Mondoo)),
 	}
 	if err := n.KubeClient.List(ctx, cronJobs, listOpts); err != nil {
 		return err

controllers/k8s_scan/resources.go

@@ -594,16 +594,6 @@ func ExternalClusterCronJobName(prefix, clusterName string) string {
 	return k8s.CronJobNameWithCluster("k8s-scan", prefix, clusterName)
 }
 
-// LegacyCronJobName returns the pre-v14 name format: {prefix}-k8s-scan
-func LegacyCronJobName(prefix string) string {
-	return fmt.Sprintf("%s%s", prefix, CronJobNameSuffix)
-}
-
-// LegacyExternalClusterCronJobName returns the pre-v14 name format: {prefix}-k8s-scan-{clusterName}
-func LegacyExternalClusterCronJobName(prefix, clusterName string) string {
-	return fmt.Sprintf("%s%s-%s", prefix, CronJobNameSuffix, clusterName)
-}
-
 func ConfigMapName(prefix string) string {
 	return fmt.Sprintf("%s%s", prefix, InventoryConfigMapBase)
 }

pkg/utils/k8s/naming.go

@@ -109,8 +109,8 @@ func integrationID(auditConfigName string) string {
 	if auditConfigName == "mondoo-client" {
 		return ""
 	}
-	if strings.HasPrefix(auditConfigName, "mondoo-client-") {
-		return strings.TrimPrefix(auditConfigName, "mondoo-client-")
+	if id, ok := strings.CutPrefix(auditConfigName, "mondoo-client-"); ok && id != "" {
+		return id
 	}
 	return auditConfigName
 }