🐛 preserve active jobs when cleaning up completed scan jobs

pkg/utils/k8s/cron_job.go

@@ -3,7 +3,16 @@
 
 package k8s
 
-import batchv1 "k8s.io/api/batch/v1"
+import (
+	"context"
+
+	"github.com/go-logr/logr"
+	batchv1 "k8s.io/api/batch/v1"
+	apierrors "k8s.io/apimachinery/pkg/api/errors"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/labels"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+)
 
 // AreCronJobsSuccessful returns true if the latest runs of all of the provided CronJobs has been
 // successful.
@@ -17,3 +26,39 @@ func AreCronJobsSuccessful(cs []batchv1.CronJob) bool {
 	}
 	return true
 }
+
+// DeleteCompletedJobs deletes only completed or failed jobs matching the given labels.
+// Active/running jobs are preserved to avoid killing in-progress scans.
+func DeleteCompletedJobs(ctx context.Context, kubeClient client.Client, namespace string, jobLabels map[string]string, log logr.Logger) error {
+	jobList := &batchv1.JobList{}
+	listOpts := &client.ListOptions{
+		Namespace:     namespace,
+		LabelSelector: labels.SelectorFromSet(jobLabels),
+	}
+
+	if err := kubeClient.List(ctx, jobList, listOpts); err != nil {
+		log.Error(err, "Failed to list Jobs", "namespace", namespace)
+		return err
+	}
+
+	for _, job := range jobList.Items {
+		// Skip active jobs - only delete completed or failed ones
+		if job.Status.Active > 0 {
+			log.V(1).Info("Skipping deletion of active job", "namespace", job.Namespace, "name", job.Name)
+			continue
+		}
+
+		// Delete the job with foreground propagation to also delete its pods
+		if err := kubeClient.Delete(ctx, &job, client.PropagationPolicy(metav1.DeletePropagationForeground)); err != nil {
+			// Ignore NotFound errors - job may have been deleted by TTL controller or another reconcile
+			if apierrors.IsNotFound(err) {
+				continue
+			}
+			log.Error(err, "Failed to delete completed job", "namespace", job.Namespace, "name", job.Name)
+			return err
+		}
+		log.V(1).Info("Deleted completed job", "namespace", job.Namespace, "name", job.Name)
+	}
+
+	return nil
+}

pkg/utils/k8s/cron_job_test.go

@@ -0,0 +1,240 @@
+// Copyright Mondoo, Inc. 2026
+// SPDX-License-Identifier: BUSL-1.1
+
+package k8s
+
+import (
+	"context"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
+	batchv1 "k8s.io/api/batch/v1"
+	corev1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	clientgoscheme "k8s.io/client-go/kubernetes/scheme"
+	ctrl "sigs.k8s.io/controller-runtime"
+	"sigs.k8s.io/controller-runtime/pkg/client/fake"
+)
+
+func TestAreCronJobsSuccessful(t *testing.T) {
+	tests := []struct {
+		name     string
+		cronJobs []batchv1.CronJob
+		expected bool
+	}{
+		{
+			name:     "empty list is successful",
+			cronJobs: []batchv1.CronJob{},
+			expected: true,
+		},
+		{
+			name: "active job is successful",
+			cronJobs: []batchv1.CronJob{
+				{
+					Status: batchv1.CronJobStatus{
+						Active: []corev1.ObjectReference{{Name: "job-1"}},
+					},
+				},
+			},
+			expected: true,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			result := AreCronJobsSuccessful(tt.cronJobs)
+			assert.Equal(t, tt.expected, result)
+		})
+	}
+}
+
+func TestDeleteCompletedJobs(t *testing.T) {
+	scheme := runtime.NewScheme()
+	require.NoError(t, clientgoscheme.AddToScheme(scheme))
+
+	labels := map[string]string{"app": "test-scan", "mondoo_cr": "test"}
+	namespace := "test-ns"
+
+	tests := []struct {
+		name              string
+		existingJobs      []batchv1.Job
+		expectedRemaining int
+	}{
+		{
+			name:              "no jobs to delete",
+			existingJobs:      []batchv1.Job{},
+			expectedRemaining: 0,
+		},
+		{
+			name: "delete completed job",
+			existingJobs: []batchv1.Job{
+				{
+					ObjectMeta: metav1.ObjectMeta{
+						Name:      "completed-job",
+						Namespace: namespace,
+						Labels:    labels,
+					},
+					Status: batchv1.JobStatus{
+						Active:    0,
+						Succeeded: 1,
+					},
+				},
+			},
+			expectedRemaining: 0,
+		},
+		{
+			name: "delete failed job",
+			existingJobs: []batchv1.Job{
+				{
+					ObjectMeta: metav1.ObjectMeta{
+						Name:      "failed-job",
+						Namespace: namespace,
+						Labels:    labels,
+					},
+					Status: batchv1.JobStatus{
+						Active: 0,
+						Failed: 1,
+					},
+				},
+			},
+			expectedRemaining: 0,
+		},
+		{
+			name: "preserve active job",
+			existingJobs: []batchv1.Job{
+				{
+					ObjectMeta: metav1.ObjectMeta{
+						Name:      "active-job",
+						Namespace: namespace,
+						Labels:    labels,
+					},
+					Status: batchv1.JobStatus{
+						Active: 1,
+					},
+				},
+			},
+			expectedRemaining: 1,
+		},
+		{
+			name: "mixed jobs - delete completed, preserve active",
+			existingJobs: []batchv1.Job{
+				{
+					ObjectMeta: metav1.ObjectMeta{
+						Name:      "active-job",
+						Namespace: namespace,
+						Labels:    labels,
+					},
+					Status: batchv1.JobStatus{
+						Active: 1,
+					},
+				},
+				{
+					ObjectMeta: metav1.ObjectMeta{
+						Name:      "completed-job",
+						Namespace: namespace,
+						Labels:    labels,
+					},
+					Status: batchv1.JobStatus{
+						Active:    0,
+						Succeeded: 1,
+					},
+				},
+				{
+					ObjectMeta: metav1.ObjectMeta{
+						Name:      "failed-job",
+						Namespace: namespace,
+						Labels:    labels,
+					},
+					Status: batchv1.JobStatus{
+						Active: 0,
+						Failed: 1,
+					},
+				},
+			},
+			expectedRemaining: 1,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			// Build fake client with existing jobs
+			objs := make([]runtime.Object, len(tt.existingJobs))
+			for i := range tt.existingJobs {
+				objs[i] = &tt.existingJobs[i]
+			}
+			fakeClient := fake.NewClientBuilder().WithScheme(scheme).WithRuntimeObjects(objs...).Build()
+
+			log := ctrl.Log.WithName("test")
+
+			// Call DeleteCompletedJobs
+			err := DeleteCompletedJobs(context.Background(), fakeClient, namespace, labels, log)
+			require.NoError(t, err)
+
+			// Verify remaining jobs
+			jobList := &batchv1.JobList{}
+			err = fakeClient.List(context.Background(), jobList)
+			require.NoError(t, err)
+
+			assert.Equal(t, tt.expectedRemaining, len(jobList.Items), "unexpected number of remaining jobs")
+
+			// Verify that remaining jobs are all active
+			for _, job := range jobList.Items {
+				assert.Greater(t, job.Status.Active, int32(0), "remaining job should be active: %s", job.Name)
+			}
+		})
+	}
+}
+
+func TestDeleteCompletedJobs_PreservesJobsWithDifferentLabels(t *testing.T) {
+	scheme := runtime.NewScheme()
+	require.NoError(t, clientgoscheme.AddToScheme(scheme))
+
+	targetLabels := map[string]string{"app": "test-scan", "mondoo_cr": "test"}
+	otherLabels := map[string]string{"app": "other-scan", "mondoo_cr": "other"}
+	namespace := "test-ns"
+
+	// Create jobs: one matching labels (completed), one with different labels (completed)
+	matchingJob := batchv1.Job{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "matching-completed-job",
+			Namespace: namespace,
+			Labels:    targetLabels,
+		},
+		Status: batchv1.JobStatus{
+			Active:    0,
+			Succeeded: 1,
+		},
+	}
+	nonMatchingJob := batchv1.Job{
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "other-completed-job",
+			Namespace: namespace,
+			Labels:    otherLabels,
+		},
+		Status: batchv1.JobStatus{
+			Active:    0,
+			Succeeded: 1,
+		},
+	}
+
+	fakeClient := fake.NewClientBuilder().
+		WithScheme(scheme).
+		WithRuntimeObjects(&matchingJob, &nonMatchingJob).
+		Build()
+
+	log := ctrl.Log.WithName("test")
+
+	// Delete jobs with targetLabels
+	err := DeleteCompletedJobs(context.Background(), fakeClient, namespace, targetLabels, log)
+	require.NoError(t, err)
+
+	// Verify only matching job was deleted
+	jobList := &batchv1.JobList{}
+	err = fakeClient.List(context.Background(), jobList)
+	require.NoError(t, err)
+
+	require.Len(t, jobList.Items, 1, "should have exactly one job remaining")
+	assert.Equal(t, "other-completed-job", jobList.Items[0].Name, "non-matching job should be preserved")
+}