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.

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

fix(server): make a copy of secret objects when listing from the informers #19913 #20805

Merged
merged 14 commits into from
Nov 21, 2024
Merged

fix(server): make a copy of secret objects when listing from the informers #19913 #20805

merged 14 commits into from
Nov 21, 2024

Conversation

rumstead
Copy link
Member

closes #19913

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).
  • The title of the PR conforms to the Toolchain Guide
  • 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.
  • 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).
  • My new feature complies with the feature status guidelines.
  • I have added a brief description of why this PR is necessary and/or what this PR solves.
  • Optional. My organization is added to USERS.md.
  • Optional. For bug fixes, I've indicated what older releases this fix should be cherry-picked into (this may or may not happen depending on risk/complexity).

@rumstead
fix(server): make a copy of secret objects when listing from the info…
a57367a 
…rmers

Signed-off-by: rumstead <37445536+rumstead@users.noreply.github.com>
@rumstead rumstead requested a review from a team as a code owner November 15, 2024 05:18
@bunnyshell Bunnyshell
Copy link

bunnyshell bot commented Nov 15, 2024 •
edited
Loading

❌ Preview Environment deleted from Bunnyshell

Available commands (reply to this comment):

  • 🚀 /bns:deploy to deploy the environment

@codecov Codecov
Copy link

codecov bot commented Nov 15, 2024 •
edited
Loading

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 55.06%. Comparing base (29ac238) to head (5dfb4a3).
Report is 7 commits behind head on master.

Additional details and impacted files 
@@            Coverage Diff             @@
##           master   #20805      +/-   ##
==========================================
+ Coverage   55.00%   55.06%   +0.06%     
==========================================
  Files         324      324              
  Lines       55398    55406       +8     
==========================================
+ Hits        30469    30508      +39     
+ Misses      22315    22281      -34     
- Partials     2614     2617       +3

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

ishitasequeira
ishitasequeira reviewed Nov 18, 2024
View reviewed changes
util/settings/settings.go Outdated Show resolved Hide resolved
util/db/secrets.go Outdated Show resolved Hide resolved
crenshaw-dev
crenshaw-dev reviewed Nov 18, 2024
View reviewed changes
util/util.go Outdated Show resolved Hide resolved
@rumstead
fix(server): make a copy of secret objects when listing from the info…
22ddeec 
…rmers

Signed-off-by: rumstead <37445536+rumstead@users.noreply.github.com>
@rumstead
fix(server): make a copy of secret objects when listing from the info…
7194384 
…rmers

Signed-off-by: rumstead <37445536+rumstead@users.noreply.github.com>
@rumstead
fix(server): make a copy of secret objects when listing from the info…
4605178 
…rmers

Signed-off-by: rumstead <37445536+rumstead@users.noreply.github.com>
@rumstead
Merge branch 'master' into fix/argocd-server-concurrent-map-panic
8031657
@rumstead
e2e
327c612 
Signed-off-by: rumstead <37445536+rumstead@users.noreply.github.com>
@rumstead
Merge branch 'fix/argocd-server-concurrent-map-panic' of github.com:r…
0808acf 
…umstead/argo-cd into fix/argocd-server-concurrent-map-panic
ishitasequeira
ishitasequeira approved these changes Nov 21, 2024
View reviewed changes
Copy link
Member

@ishitasequeira ishitasequeira left a comment

Choose a reason for hiding this comment

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

LGTM!!

@ishitasequeira ishitasequeira enabled auto-merge (squash) November 21, 2024 04:38
@ishitasequeira ishitasequeira merged commit c8c22d3 into argoproj:master Nov 21, 2024
26 checks passed
revitalbarletz pushed a commit to revitalbarletz/argo-cd that referenced this pull request Nov 21, 2024
@rumstead
fix(server): make a copy of secret objects when listing from the info…
000d396 
…rmers argoproj#19913 (argoproj#20805)

* fix(server): make a copy of secret objects when listing from the informers

Signed-off-by: rumstead <37445536+rumstead@users.noreply.github.com>

* fix(server): make a copy of secret objects when listing from the informers

Signed-off-by: rumstead <37445536+rumstead@users.noreply.github.com>

* fix(server): make a copy of secret objects when listing from the informers

Signed-off-by: rumstead <37445536+rumstead@users.noreply.github.com>

* fix(server): make a copy of secret objects when listing from the informers

Signed-off-by: rumstead <37445536+rumstead@users.noreply.github.com>

* fix(server): make a copy of secret objects when listing from the informers

Signed-off-by: rumstead <37445536+rumstead@users.noreply.github.com>

* fix(server): make a copy of secret objects when listing from the informers

Signed-off-by: rumstead <37445536+rumstead@users.noreply.github.com>

* e2e

Signed-off-by: rumstead <37445536+rumstead@users.noreply.github.com>

---------

Signed-off-by: rumstead <37445536+rumstead@users.noreply.github.com>
@rumstead rumstead deleted the fix/argocd-server-concurrent-map-panic branch November 21, 2024 14:15
adriananeci pushed a commit to adriananeci/argo-cd that referenced this pull request Dec 4, 2024
@rumstead @adriananeci
fix(server): make a copy of secret objects when listing from the info…
94f711e 
…rmers argoproj#19913 (argoproj#20805)

* fix(server): make a copy of secret objects when listing from the informers

Signed-off-by: rumstead <37445536+rumstead@users.noreply.github.com>

* fix(server): make a copy of secret objects when listing from the informers

Signed-off-by: rumstead <37445536+rumstead@users.noreply.github.com>

* fix(server): make a copy of secret objects when listing from the informers

Signed-off-by: rumstead <37445536+rumstead@users.noreply.github.com>

* fix(server): make a copy of secret objects when listing from the informers

Signed-off-by: rumstead <37445536+rumstead@users.noreply.github.com>

* fix(server): make a copy of secret objects when listing from the informers

Signed-off-by: rumstead <37445536+rumstead@users.noreply.github.com>

* fix(server): make a copy of secret objects when listing from the informers

Signed-off-by: rumstead <37445536+rumstead@users.noreply.github.com>

* e2e

Signed-off-by: rumstead <37445536+rumstead@users.noreply.github.com>

---------

Signed-off-by: rumstead <37445536+rumstead@users.noreply.github.com>
Signed-off-by: Adrian Aneci <aneci@adobe.com>
agaudreault pushed a commit to agaudreault/argo-cd that referenced this pull request Dec 17, 2024
@rumstead @agaudreault
fix(server): make a copy of secret objects when listing from the info…
feb9f87 
…rmers argoproj#19913 (argoproj#20805)

* fix(server): make a copy of secret objects when listing from the informers

Signed-off-by: rumstead <37445536+rumstead@users.noreply.github.com>

* fix(server): make a copy of secret objects when listing from the informers

Signed-off-by: rumstead <37445536+rumstead@users.noreply.github.com>

* fix(server): make a copy of secret objects when listing from the informers

Signed-off-by: rumstead <37445536+rumstead@users.noreply.github.com>

* fix(server): make a copy of secret objects when listing from the informers

Signed-off-by: rumstead <37445536+rumstead@users.noreply.github.com>

* fix(server): make a copy of secret objects when listing from the informers

Signed-off-by: rumstead <37445536+rumstead@users.noreply.github.com>

* fix(server): make a copy of secret objects when listing from the informers

Signed-off-by: rumstead <37445536+rumstead@users.noreply.github.com>

* e2e

Signed-off-by: rumstead <37445536+rumstead@users.noreply.github.com>

---------

Signed-off-by: rumstead <37445536+rumstead@users.noreply.github.com>
Signed-off-by: Alexandre Gaudreault <alexandre_gaudreault@intuit.com>
@agaudreault agaudreault mentioned this pull request Dec 18, 2024
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@andrii-korotkov-verkada andrii-korotkov-verkada andrii-korotkov-verkada approved these changes

@ishitasequeira ishitasequeira ishitasequeira approved these changes

@crenshaw-dev crenshaw-dev Awaiting requested review from crenshaw-dev

Assignees
No one assigned
Labels
ready-for-review
Projects
Argo CD Review
Archived in project
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

argocd-server panics with concurrent map read and write
4 participants
@rumstead @crenshaw-dev @ishitasequeira @andrii-korotkov-verkada