fix: vuln scan success criteria met (#2292)

* fix: k8s 1.31 Jobs can have SuccessCriteriaMet condition * fix: k8s 1.31 jobs can have SuccessCriteriaMet condition - nodeCollector * also handle failure condition * orthogonal but please can we use the latest alpine?
aquasecurity · Nov 19, 2024 · 48d87f4 · 48d87f4
1 parent 6f3499c
commit 48d87f4
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/build/trivy-operator/Dockerfile b/build/trivy-operator/Dockerfile
@@ -1,4 +1,4 @@
-FROM alpine:3.19.1
+FROM alpine:3.19.4
 
 RUN apk update
 

diff --git a/pkg/configauditreport/controller/nodecollector.go b/pkg/configauditreport/controller/nodecollector.go
@@ -72,9 +72,9 @@ func (r *NodeCollectorJobController) reconcileJobs() reconcile.Func {
 		}
 
 		switch jobCondition := job.Status.Conditions[0].Type; jobCondition {
-		case batchv1.JobComplete:
+		case batchv1.JobComplete, batchv1.JobSuccessCriteriaMet:
 			err = r.processCompleteScanJob(ctx, job)
-		case batchv1.JobFailed:
+		case batchv1.JobFailed, batchv1.JobFailureTarget:
 			err = r.processFailedScanJob(ctx, job)
 		default:
 			err = fmt.Errorf("unrecognized scan job condition: %v", jobCondition)

diff --git a/pkg/vulnerabilityreport/controller/scanjob.go b/pkg/vulnerabilityreport/controller/scanjob.go
@@ -76,7 +76,7 @@ func (r *ScanJobController) reconcileJobs() reconcile.Func {
 		}
 
 		switch jobCondition := job.Status.Conditions[0].Type; jobCondition {
-		case batchv1.JobComplete, batchv1.JobFailed:
+		case batchv1.JobComplete, batchv1.JobSuccessCriteriaMet, batchv1.JobFailed, batchv1.JobFailureTarget:
 			completedContainers, err := r.completedContainers(ctx, job)
 			if err != nil {
 				return ctrl.Result{}, r.deleteJob(ctx, job)