Skip to content
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.

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

fix: retry token creation/deletion upon project conflict errors #11199

Merged
merged 1 commit into from Nov 8, 2022

Conversation

jessesuen
Copy link
Member

@jessesuen jessesuen commented Nov 4, 2022

A user which is making heavy use of the token endpoint, will intermittently get kubernetes conflict errors. This change wraps the token create/delete endpoint with retry.RetryOnConflict to avoid the issue.

Signed-off-by: Jesse Suen jesse@akuity.io

Note on DCO:

If the DCO action in the integration test fails, one or more of your commits are not signed off. Please click on the Details link next to the DCO action for instructions on how to resolve this.

Checklist:

  • Either (a) I've created an enhancement proposal and discussed it with the community, (b) this is a bug fix, or (c) this does not need to be in the release notes.
  • The title of the PR states what changed and the related issues number (used for the release note).
  • I've included "Closes [ISSUE #]" or "Fixes [ISSUE #]" in the description to automatically close the associated issue.
  • I've updated both the CLI and UI to expose my feature, or I plan to submit a second PR with them.
  • Does this PR require documentation updates?
  • I've updated documentation as required by this PR.
  • Optional. My organization is added to USERS.md.
  • I have signed off all my commits as required by DCO
  • I have written unit and/or e2e tests for my change. PRs without these are unlikely to be merged.
  • My build is green (troubleshooting builds).

Signed-off-by: Jesse Suen <jesse@akuity.io>
@codecov
Copy link

codecov bot commented Nov 4, 2022

Codecov Report

Base: 45.60% // Head: 45.63% // Increases project coverage by +0.02% 🎉

Coverage data is based on head (0fc3269) compared to base (e21a82f).
Patch coverage: 100.00% of modified lines in pull request are covered.

Additional details and impacted files
@@            Coverage Diff             @@
##           master   #11199      +/-   ##
==========================================
+ Coverage   45.60%   45.63%   +0.02%     
==========================================
  Files         239      239              
  Lines       28973    28987      +14     
==========================================
+ Hits        13214    13228      +14     
  Misses      13940    13940              
  Partials     1819     1819              
Impacted Files Coverage Δ
server/project/project.go 54.09% <100.00%> (+2.40%) ⬆️
util/settings/settings.go 51.25% <0.00%> (ø)

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report at Codecov.
📢 Do you have feedback about the report comment? Let us know in this issue.

@iam-veeramalla
Copy link
Member

LGTM, Thanks @jessesuen

Copy link
Collaborator

@alexmt alexmt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@jessesuen jessesuen merged commit 1f0d4cf into argoproj:master Nov 8, 2022
@jessesuen jessesuen deleted the fix/retry-token-update branch November 8, 2022 21:52
jessesuen added a commit that referenced this pull request Nov 10, 2022
ashutosh16 pushed a commit to ashutosh16/argo-cd that referenced this pull request Nov 23, 2022
emirot pushed a commit to emirot/argo-cd that referenced this pull request Jan 27, 2023
…proj#11199)

Signed-off-by: Jesse Suen <jesse@akuity.io>
Signed-off-by: emirot <emirot.nolan@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants