fix: Remove job deletion for jobs with TTLSecondsAfterFinished set #2375
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
tom1299
changed the title
simar7
reviewed
Jan 17, 2025
| @@ -357,6 +357,10 @@ func (r *ScanJobController) completedContainers(ctx context.Context, scanJob *ba | |||
| } | |||
|
|
|||
| func (r *ScanJobController) deleteJob(ctx context.Context, job *batchv1.Job) error { | |||
| if job.Spec.TTLSecondsAfterFinished != nil && *job.Spec.TTLSecondsAfterFinished != 0 { | |||
There was a problem hiding this comment.
I read through the docs but it wasn't clear to me why we should check for both !=nil and !=0. Could you explain that?
There was a problem hiding this comment.
Actually now that you mentioned it, it seems to me that the !=0 is superfluous / not really necessary. I would remove this from the if statement.
There was a problem hiding this comment.
@simar7 I'm sorry but somehow I totally forgot to do the update. I made the change and squashed the commits so that the commit history looks better.
tom1299
force-pushed
the
vulnerability-scanjob-is-immediately-deleted
branch
from
4a7e50a to
92f70f0
Compare
|
@afdesk can you take another look? |
|
@simar7 will merge it, right? |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Currently jobs are directly deleted after they are completed by the trivy-operator without honouring the jobs
ttlSecondsAfterFinishedand thus also the helm configuration parameteroperator.scanJobTTL.The change introduced in this PR will only delete the job if it has no
ttlSecondsAfterFinished.Related issues
Checklist