Skip to content

Handle conflict with ScheduledScan status updates with retry logic#2910

Merged
J12934 merged 1 commit intomainfrom
bugfix/operator-conflict-fix
Feb 18, 2025
Merged

Handle conflict with ScheduledScan status updates with retry logic#2910
J12934 merged 1 commit intomainfrom
bugfix/operator-conflict-fix

Conversation

@Ilyesbdlala
Copy link
Copy Markdown
Member

Description

Went through Status updates and added conflict error handling.
#2901 does not require adding a retry, since it is already done in

if scan.Spec.TTLSecondsAfterFinished != nil && (scan.Status.State == executionv1.ScanStateDone || scan.Status.State == executionv1.ScanStateErrored) {
return ctrl.Result{
Requeue: true,
RequeueAfter: time.Duration(*scan.Spec.TTLSecondsAfterFinished) * time.Second,
}, err
}
if err != nil {
return ctrl.Result{}, err
}
return ctrl.Result{}, nil

closes #825

Checklist

  • Test your changes as thoroughly as possible before you commit them. Preferably, automate your test by unit/integration tests.
  • Make sure that all your commits are signed-off and that you are added to the Contributors file.
  • Make sure that all CI finish successfully.
  • Optional (but appreciated): Make sure that all commits are Verified.

@netlify
Copy link
Copy Markdown

netlify bot commented Feb 18, 2025

Deploy Preview for docs-securecodebox canceled.

Name Link
🔨 Latest commit c91ad31
🔍 Latest deploy log https://app.netlify.com/sites/docs-securecodebox/deploys/67b46e78499e8600088931aa

@sonarqubecloud
Copy link
Copy Markdown

@github-actions
Copy link
Copy Markdown

🦙 MegaLinter status: ⚠️ WARNING

Descriptor Linter Files Fixed Errors Elapsed time
⚠️ GO golangci-lint yes 1 0.43s

See detailed report in MegaLinter reports
Set VALIDATE_ALL_CODEBASE: true in mega-linter.yml to validate all sources, not only the diff

MegaLinter is graciously provided by OX Security

@J12934 J12934 merged commit e20ec9f into main Feb 18, 2025
56 checks passed
@J12934 J12934 deleted the bugfix/operator-conflict-fix branch February 18, 2025 12:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

Archived in project

Development

Successfully merging this pull request may close these issues.

Operator Error messages about concurrent modifications

2 participants