Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Handle conflict with ScheduledScan status updates with retry logic #2910

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 1 commit into from
Feb 18, 2025
Merged

Handle conflict with ScheduledScan status updates with retry logic #2910

merged 1 commit into from
Feb 18, 2025

Conversation

Ilyesbdlala
Copy link
Member

Description

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

secureCodeBox/operator/controllers/execution/scans/scan_controller.go

Lines 127 to 137 in 05124a7

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.

@Ilyesbdlala Ilyesbdlala self-assigned this Feb 18, 2025
@netlify Netlify
Copy link

netlify bot commented Feb 18, 2025 •
edited
Loading

✅ Deploy Preview for docs-securecodebox canceled.

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

@sonarqubecloud SonarQubeCloud
Copy link

Quality Gate Passed Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

@github-actions GitHub Actions
Copy link

🦙 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
Reviewers

@J12934 J12934 J12934 approved these changes

Assignees

@Ilyesbdlala Ilyesbdlala

Labels
maintenance
Projects
secureCodeBox
Archived in project
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Operator Error messages about concurrent modifications
2 participants
@Ilyesbdlala @J12934