Skip to content

fix: Race condition in nativeGitClient.LsFiles (issue #21754) #22878

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 3 commits into from
May 8, 2025
Merged

fix: Race condition in nativeGitClient.LsFiles (issue #21754) #22878

merged 3 commits into from
May 8, 2025

Conversation

magat
Copy link
Contributor

@magat magat commented May 6, 2025 •
edited
Loading

Changing the current working directory is not safe for concurrent use. To avoid this, I am adding the repository root as a prefix to the pattern.

To make sure the results are relevant I also needed to evaluate symlinks in the repository root path, in case part of it is a symlink (which is the case in for temporary directories on Mac OS).

Fixes #21754. Thanks to @crenshaw-dev for providing a unit test for the race condition.

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).

@magat
fix: Race condition in nativeGitClient.LsFiles
04e36fd 
Changing the current working directory is not safe for concurrent use.
To avoid this, I am adding the repository root as a prefix to the
pattern.

To make sure the results are relevant I also needed to evaluate symlinks
in the repository root path, in case part of it is a symlink (which is
the case in for temporary directories on Mac OS).

Fixes #21754

Signed-off-by: Mathieu Agar <magar@mirakl.com>
@magat magat requested a review from a team as a code owner May 6, 2025 08:03
@bunnyshell Bunnyshell
Copy link

bunnyshell bot commented May 6, 2025 •
edited
Loading

❌ Preview Environment deleted from Bunnyshell

Available commands (reply to this comment):

  • 🚀 /bns:deploy to deploy the environment

@magat
fix: Use prefix for octal integer literal
0a52d43 
gofumpt requires a 0o prefix instead of the standard 0 for octal
literals

Signed-off-by: Mathieu Agar <magar@mirakl.com>
@codecov Codecov
Copy link

codecov bot commented May 6, 2025 •
edited
Loading

Codecov Report

❌ Patch coverage is 75.00000% with 3 lines in your changes missing coverage. Please review.
✅ Project coverage is 59.84%. Comparing base (0dfdb0a) to head (f6e5028).
⚠️ Report is 493 commits behind head on master.

Files with missing lines Patch % Lines
util/git/client.go 75.00% 2 Missing and 1 partial ⚠️
Additional details and impacted files 
@@            Coverage Diff             @@
##           master   #22878      +/-   ##
==========================================
- Coverage   59.93%   59.84%   -0.09%     
==========================================
  Files         344      344              
  Lines       57715    57722       +7     
==========================================
- Hits        34590    34546      -44     
- Misses      20369    20404      +35     
- Partials     2756     2772      +16

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

rumstead
rumstead reviewed May 6, 2025
View reviewed changes
@rumstead
Copy link
Member

rumstead commented May 6, 2025

Overall, the code LGTM.

I didn't do any due diligence when I suggested to prepend the git root, I think there shouldn't be any adverse side effects.

nitishfy
nitishfy reviewed May 7, 2025
View reviewed changes
util/git/client.go
@@ -422,11 +422,14 @@ func (m *nativeGitClient) Fetch(revision string) error {
func (m *nativeGitClient) LsFiles(path string, enableNewGitFileGlobbing bool) ([]string, error) {
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
func (m *nativeGitClient) LsFiles(path string, enableNewGitFileGlobbing bool) ([]string, error) {
func (m *nativeGitClient) LsFiles(pattern string, enableNewGitFileGlobbing bool) ([]string, error) {

Shouldn't this be pattern instead?

Copy link
Member

Choose a reason for hiding this comment

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

it can be either. it depends on what is put inside the applicationset, but the globs are still representing a path.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Both names are fine by me. I can change it to pattern if you think it's better, lmk

Copy link
Member

Choose a reason for hiding this comment

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

If you look at the applicationset code, especially this, it is a little confusing whether it's pattern or path.

Copy link
Member

@rumstead rumstead May 7, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

it's based on what the user provides in their applicationset, it can be either a path or a path glob. we use the term path in the git generator. i would suggest it stays the same.

nitishfy
nitishfy reviewed May 7, 2025
View reviewed changes
Copy link
Member

@nitishfy nitishfy left a comment

Choose a reason for hiding this comment

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

Left a minor comment, PTAL.

@magat @rumstead
change wording of warning
f6e5028 
Using ignore instead of remove makes it more explicit

Co-authored-by: rumstead <37445536+rumstead@users.noreply.github.com>
Signed-off-by: Mathieu Agar <magar@mirakl.com>
blakepettersson
blakepettersson approved these changes May 8, 2025
View reviewed changes
Copy link
Member

@blakepettersson blakepettersson left a comment

Choose a reason for hiding this comment

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

LGTM

@github-project-automation github-project-automation bot moved this to Ready for final review in Argo CD Review May 8, 2025
@rumstead rumstead merged commit 992ee25 into argoproj:master May 8, 2025
32 checks passed
@github-project-automation github-project-automation bot moved this from Ready for final review to Done in Argo CD Review May 8, 2025
@rumstead
Copy link
Member

rumstead commented May 8, 2025

/cherry-pick release-3.0

gcp-cherry-pick-bot bot pushed a commit that referenced this pull request May 8, 2025
@magat @rumstead
fix: Race condition in nativeGitClient.LsFiles (issue #21754) (#22878)
4a80375 
Signed-off-by: Mathieu Agar <magar@mirakl.com>
Co-authored-by: rumstead <37445536+rumstead@users.noreply.github.com>
@gcp-cherry-pick-bot gcp-cherry-pick-bot bot mentioned this pull request May 8, 2025
Merged
@nitishfy
Copy link
Member

nitishfy commented May 8, 2025

/cherry-pick release-2.14

@gcp-cherry-pick-bot GCP Cherry-Pick Bot
Copy link

Cherry-pick failed with Merge error 992ee25bd359f058f7b280649d84235513f442ad into temp-cherry-pick-4154fe-release-2.14

rumstead added a commit that referenced this pull request May 8, 2025
@gcp-cherry-pick-bot @magat @rumstead
fix: Race condition in nativeGitClient.LsFiles (issue #21754) (cher…
2913d5f 
…ry-pick #22878) (#22906)

Signed-off-by: Mathieu Agar <magar@mirakl.com>
Co-authored-by: Mathieu Agar <magar@mirakl.com>
Co-authored-by: rumstead <37445536+rumstead@users.noreply.github.com>
LyhengTep pushed a commit to LyhengTep/argo-cd that referenced this pull request May 10, 2025
@magat @rumstead @LyhengTep
fix: Race condition in nativeGitClient.LsFiles (issue argoproj#21754)…
2061ca5 
… (argoproj#22878)

Signed-off-by: Mathieu Agar <magar@mirakl.com>
Co-authored-by: rumstead <37445536+rumstead@users.noreply.github.com>
ranakan19 pushed a commit to ranakan19/argo-cd that referenced this pull request May 20, 2025
@magat @rumstead @ranakan19
fix: Race condition in nativeGitClient.LsFiles (issue argoproj#21754)…
1765e14 
… (argoproj#22878)

Signed-off-by: Mathieu Agar <magar@mirakl.com>
Co-authored-by: rumstead <37445536+rumstead@users.noreply.github.com>
Signed-off-by: Kanika Rana <krana@redhat.com>
olivergondza pushed a commit to olivergondza/argo-cd that referenced this pull request May 20, 2025
@magat @rumstead @olivergondza
fix: Race condition in nativeGitClient.LsFiles (issue argoproj#21754)…
da1a29a 
… (argoproj#22878)

Signed-off-by: Mathieu Agar <magar@mirakl.com>
Co-authored-by: rumstead <37445536+rumstead@users.noreply.github.com>
Signed-off-by: Oliver Gondža <ogondza@gmail.com>
tylerrosnett pushed a commit to StateFarmIns/argo-cd that referenced this pull request May 27, 2025
@magat @rumstead @tylerrosnett
fix: Race condition in nativeGitClient.LsFiles (issue argoproj#21754)…
a29af89 
… (argoproj#22878)

Signed-off-by: Mathieu Agar <magar@mirakl.com>
Co-authored-by: rumstead <37445536+rumstead@users.noreply.github.com>
agaudreault added a commit to agaudreault/argo-cd that referenced this pull request Jun 2, 2025
@agaudreault
Squashed commit of the following:
4dea36b 
commit 1d23403
Author: Alexandre Gaudreault <alexandre_gaudreault@intuit.com>
Date:   Mon Jun 2 11:58:22 2025 -0400

    ordered checks

    Signed-off-by: Alexandre Gaudreault <alexandre_gaudreault@intuit.com>

commit 544abb0
Author: Alexandre Gaudreault <alexandre_gaudreault@intuit.com>
Date:   Mon Jun 2 10:44:57 2025 -0400

    unit tests

    Signed-off-by: Alexandre Gaudreault <alexandre_gaudreault@intuit.com>

commit 0d70bcc
Author: Alexandre Gaudreault <alexandre_gaudreault@intuit.com>
Date:   Mon Jun 2 09:52:47 2025 -0400

    e2e

    Signed-off-by: Alexandre Gaudreault <alexandre_gaudreault@intuit.com>

commit b9d10b0
Author: Alexandre Gaudreault <alexandre_gaudreault@intuit.com>
Date:   Fri May 30 12:42:07 2025 -0400

    health

    Signed-off-by: Alexandre Gaudreault <alexandre_gaudreault@intuit.com>

commit e5182cc
Author: Alexandre Gaudreault <alexandre_gaudreault@intuit.com>
Date:   Fri May 30 11:55:20 2025 -0400

    better logs

    Signed-off-by: Alexandre Gaudreault <alexandre_gaudreault@intuit.com>

commit 5c78cfc
Author: Alexandre Gaudreault <alexandre_gaudreault@intuit.com>
Date:   Fri May 30 11:50:09 2025 -0400

    better logs

    Signed-off-by: Alexandre Gaudreault <alexandre_gaudreault@intuit.com>

commit 5fa7c32
Author: Alexandre Gaudreault <alexandre_gaudreault@intuit.com>
Date:   Fri May 30 11:43:23 2025 -0400

    info logs since transition are not frequent

    Signed-off-by: Alexandre Gaudreault <alexandre_gaudreault@intuit.com>

commit 31e425a
Merge: 6a9eea4 5c24b6b
Author: Alexandre Gaudreault <alexandre_gaudreault@intuit.com>
Date:   Fri May 30 11:30:37 2025 -0400

    Merge remote-tracking branch 'upstream/release-3.0' into appset-prod-logs-3

    Signed-off-by: Alexandre Gaudreault <alexandre_gaudreault@intuit.com>

commit 6a9eea4
Author: Alexandre Gaudreault <alexandre_gaudreault@intuit.com>
Date:   Fri May 30 11:24:11 2025 -0400

    fix appset conditions wiped-out with progressive sync

    Signed-off-by: Alexandre Gaudreault <alexandre_gaudreault@intuit.com>

commit 5c24b6b
Author: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
Date:   Thu May 29 15:08:23 2025 -0600

    fix(server): avoid unecessary claims restrictions (argoproj#22973) (3.0) (argoproj#23207)

    Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>

commit 59c14a0
Author: Alexandre Gaudreault <alexandre_gaudreault@intuit.com>
Date:   Thu May 29 16:38:23 2025 -0400

    add app context to validation error

    Signed-off-by: Alexandre Gaudreault <alexandre_gaudreault@intuit.com>

commit af9ebac
Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Date:   Thu May 29 11:25:11 2025 -0600

    Bump version to 3.0.5 on release-3.0 branch (argoproj#23204)

    Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
    Co-authored-by: crenshaw-dev <350466+crenshaw-dev@users.noreply.github.com>

commit fe5869d
Author: gcp-cherry-pick-bot[bot] <98988430+gcp-cherry-pick-bot[bot]@users.noreply.github.com>
Date:   Wed May 28 16:57:04 2025 -0600

    fix(hydrator): increase max msg size (cherry-pick argoproj#23190) (argoproj#23191)

    Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
    Co-authored-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>

commit 0e20cb6
Author: Soumya Ghosh Dastidar <44349253+gdsoumya@users.noreply.github.com>
Date:   Thu May 29 02:10:53 2025 +0530

    fix: add cooldown to prevent resetting autoheal exp backoff preemptively (cherry-pick argoproj#23057) (argoproj#23189)

    Signed-off-by: Soumya Ghosh Dastidar <gdsoumya@gmail.com>

commit a791559
Author: Alexandre Gaudreault <alexandre_gaudreault@intuit.com>
Date:   Wed May 28 11:29:55 2025 -0400

    fix merge

    Signed-off-by: Alexandre Gaudreault <alexandre_gaudreault@intuit.com>

commit e7a5572
Author: Alexandre Gaudreault <alexandre_gaudreault@intuit.com>
Date:   Wed May 28 11:05:39 2025 -0400

    unit tests

    Signed-off-by: Alexandre Gaudreault <alexandre_gaudreault@intuit.com>

commit 0559ab3
Author: Alexandre Gaudreault <alexandre_gaudreault@intuit.com>
Date:   Mon May 26 17:19:21 2025 -0400

    codegen

    Signed-off-by: Alexandre Gaudreault <alexandre_gaudreault@intuit.com>

commit 6405e14
Author: Alexandre Gaudreault <alexandre_gaudreault@intuit.com>
Date:   Mon May 26 17:12:40 2025 -0400

    sort application status

    Signed-off-by: Alexandre Gaudreault <alexandre_gaudreault@intuit.com>

commit 789e016
Author: Alexandre Gaudreault <alexandre_gaudreault@intuit.com>
Date:   Mon May 26 17:10:00 2025 -0400

    rename syncMap

    Signed-off-by: Alexandre Gaudreault <alexandre_gaudreault@intuit.com>

commit 3348d3f
Author: Alexandre Gaudreault <alexandre_gaudreault@intuit.com>
Date:   Mon May 26 16:23:32 2025 -0400

    use const for progressive sync

    Signed-off-by: Alexandre Gaudreault <alexandre_gaudreault@intuit.com>

commit 207a75b
Author: Alexandre Gaudreault <alexandre_gaudreault@intuit.com>
Date:   Mon May 26 16:04:59 2025 -0400

    refactor status updates

    Signed-off-by: Alexandre Gaudreault <alexandre_gaudreault@intuit.com>

commit 5328bd5
Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Date:   Wed May 28 08:45:50 2025 -0600

    Bump version to 3.0.4 on release-3.0 branch (argoproj#23185)

    Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
    Co-authored-by: crenshaw-dev <350466+crenshaw-dev@users.noreply.github.com>

commit 040ed44
Author: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
Date:   Wed May 28 08:20:49 2025 -0600

    Merge commit from fork

    Fix shadowed variable name

    Signed-off-by: Ry0taK <49341894+Ry0taK@users.noreply.github.com>
    Co-authored-by: Ry0taK <49341894+Ry0taK@users.noreply.github.com>

commit c27a9d3
Author: gcp-cherry-pick-bot[bot] <98988430+gcp-cherry-pick-bot[bot]@users.noreply.github.com>
Date:   Wed May 21 14:48:38 2025 -0400

    fix(commit-server): apply image override (cherry-pick argoproj#22916) (argoproj#22917)

    Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
    Co-authored-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>

commit a14b012
Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Date:   Wed May 21 14:18:58 2025 -0400

    Bump version to 3.0.3 on release-3.0 branch (argoproj#23087)

    Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
    Co-authored-by: crenshaw-dev <350466+crenshaw-dev@users.noreply.github.com>

commit 866db14
Author: Peter Jiang <35584807+pjiang-dev@users.noreply.github.com>
Date:   Tue May 20 18:09:18 2025 -0700

    chore: bump gitops-engine ssd fix (argoproj#23071)

    Signed-off-by: Peter Jiang <peterjiang823@gmail.com>

commit af3d926
Author: gcp-cherry-pick-bot[bot] <98988430+gcp-cherry-pick-bot[bot]@users.noreply.github.com>
Date:   Tue May 20 20:09:04 2025 -0400

    fix: Account for batch event processing in e2e tests (cherry-pick argoproj#22356) (argoproj#23070)

    Signed-off-by: Andrii Korotkov <andrii.korotkov@verkada.com>
    Co-authored-by: Andrii Korotkov <137232734+andrii-korotkov-verkada@users.noreply.github.com>

commit ddd6df5
Author: Alexandre Gaudreault <alexandre_gaudreault@intuit.com>
Date:   Tue May 20 16:12:00 2025 -0400

    fix: infinite reconciliation loop when app is in error (argoproj#23067)

    Signed-off-by: Alexandre Gaudreault <alexandre_gaudreault@intuit.com>

commit 927ed35
Author: gcp-cherry-pick-bot[bot] <98988430+gcp-cherry-pick-bot[bot]@users.noreply.github.com>
Date:   Tue May 20 09:43:08 2025 -0400

    fix: remove default `spec.preserveUnknownFields` ignoreDifference for CRD (cherry-pick argoproj#22948) (argoproj#23044)

    Signed-off-by: mikutas <23391543+mikutas@users.noreply.github.com>
    Signed-off-by: Alexandre Gaudreault <alexandre_gaudreault@intuit.com>
    Co-authored-by: Takumi Sue <23391543+mikutas@users.noreply.github.com>
    Co-authored-by: Alexandre Gaudreault <alexandre_gaudreault@intuit.com>

commit b1cafa9
Author: gcp-cherry-pick-bot[bot] <98988430+gcp-cherry-pick-bot[bot]@users.noreply.github.com>
Date:   Mon May 19 09:58:23 2025 -0700

    docs: fix jsonpath in 2.14-3.0 upgrade doc (cherry-pick argoproj#23045) (argoproj#23046)

    Signed-off-by: Cyril Gaudin <cyril.gaudin@camunda.com>
    Co-authored-by: Cyril Gaudin <cyril.gaudin@gmail.com>

commit 8a7c0f0
Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Date:   Mon May 19 16:41:34 2025 +0300

    Bump version to 3.0.2 on release-3.0 branch (argoproj#23039)

    Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
    Co-authored-by: reggie-k <19544836+reggie-k@users.noreply.github.com>

commit 3fb34b9
Author: Regina Voloshin <regina.voloshin@codefresh.io>
Date:   Mon May 19 15:48:47 2025 +0300

    fix(haproxy): setting maxconn in haproxy config cherry-pick (argoproj#15319) (argoproj#18283) (argoproj#23037)

    Signed-off-by: Timothy Griffiths <griffiths.timothy@gmail.com>
    Signed-off-by: Alexandre Gaudreault <alexandre_gaudreault@intuit.com>
    Co-authored-by: Timothy Griffiths <griffiths.timothy@gmail.com>
    Co-authored-by: Alexandre Gaudreault <alexandre_gaudreault@intuit.com>

commit 90e9d1a
Author: Oleksandr Saulyak <oleksandr.saulyak@octopus.com>
Date:   Mon May 19 11:07:32 2025 +0300

    fix: settings request doesn't return default tracking method (argoproj#22965) (cherry-pick) (argoproj#23034)

    Signed-off-by: oleksandr-codefresh <oleksandr.saulyak@octopus.com>

commit cca991a
Author: gcp-cherry-pick-bot[bot] <98988430+gcp-cherry-pick-bot[bot]@users.noreply.github.com>
Date:   Fri May 16 10:00:08 2025 -0700

    fix(test): broken e2e test (cherry-pick argoproj#22975) (argoproj#23017)

    Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
    Co-authored-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>

commit 3d37cfa
Author: gcp-cherry-pick-bot[bot] <98988430+gcp-cherry-pick-bot[bot]@users.noreply.github.com>
Date:   Wed May 14 11:40:19 2025 -0400

    docs(server): no resource health when using the list api (cherry-pick argoproj#22954) (argoproj#22972)

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

commit 2bcef48
Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Date:   Wed May 14 17:59:45 2025 +0300

    Bump version to 3.0.1 on release-3.0 branch (argoproj#22968)

    Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
    Co-authored-by: reggie-k <19544836+reggie-k@users.noreply.github.com>

commit cb5d6f5
Author: gcp-cherry-pick-bot[bot] <98988430+gcp-cherry-pick-bot[bot]@users.noreply.github.com>
Date:   Fri May 9 10:46:00 2025 -0400

    fix(health): handle nil lastTransitionTime (argoproj#22897) (cherry-pick argoproj#22900) (argoproj#22908)

    Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
    Co-authored-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>

commit 2913d5f
Author: gcp-cherry-pick-bot[bot] <98988430+gcp-cherry-pick-bot[bot]@users.noreply.github.com>
Date:   Thu May 8 08:01:31 2025 -0700

    fix: Race condition in `nativeGitClient.LsFiles` (issue argoproj#21754) (cherry-pick argoproj#22878) (argoproj#22906)

    Signed-off-by: Mathieu Agar <magar@mirakl.com>
    Co-authored-by: Mathieu Agar <magar@mirakl.com>
    Co-authored-by: rumstead <37445536+rumstead@users.noreply.github.com>

commit edd2358
Author: gcp-cherry-pick-bot[bot] <98988430+gcp-cherry-pick-bot[bot]@users.noreply.github.com>
Date:   Wed May 7 09:06:07 2025 -0400

    fix(docs): upgrading 3.0 docs (cherry-pick argoproj#22891) (argoproj#22894)

    Signed-off-by: Joerg Heyduk <joerg@heyduk.org>
    Co-authored-by: jheyduk <jheyduk@users.noreply.github.com>

commit e98f483
Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Date:   Tue May 6 14:20:53 2025 +0300

    Bump version to 3.0.0 on release-3.0 branch (argoproj#22880)

    Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
    Co-authored-by: reggie-k <19544836+reggie-k@users.noreply.github.com>

commit e2250ba
Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Date:   Sun May 4 11:43:11 2025 +0300

    Bump version to 3.0.0-rc6 on release-3.0 branch (argoproj#22861)

    Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
    Co-authored-by: reggie-k <19544836+reggie-k@users.noreply.github.com>

commit a444a05
Author: gcp-cherry-pick-bot[bot] <98988430+gcp-cherry-pick-bot[bot]@users.noreply.github.com>
Date:   Fri May 2 18:25:24 2025 -0400

    fix: AppSet PullRequest and SCM generators get 401 from GitHub without tokenRef (cherry-pick argoproj#22737) (argoproj#22744)

    Signed-off-by: reggie-k <regina.voloshin@codefresh.io>
    Co-authored-by: Regina Voloshin <regina.voloshin@codefresh.io>

commit f075c5a
Author: gcp-cherry-pick-bot[bot] <98988430+gcp-cherry-pick-bot[bot]@users.noreply.github.com>
Date:   Fri May 2 18:24:25 2025 -0400

    fix: Only port-forward to ready pods (argoproj#10610) (cherry-pick argoproj#22794) (argoproj#22825)

    Signed-off-by: Mike Bryant <mike.bryant@mettle.co.uk>
    Co-authored-by: Mike Bryant <mike.bryant@mettle.co.uk>

commit f58b807
Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Date:   Wed Apr 30 08:38:01 2025 +0300

    Bump version to 3.0.0-rc5 on release-3.0 branch (argoproj#22830)

    Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
    Co-authored-by: reggie-k <19544836+reggie-k@users.noreply.github.com>

commit b2e8753
Author: gcp-cherry-pick-bot[bot] <98988430+gcp-cherry-pick-bot[bot]@users.noreply.github.com>
Date:   Mon Apr 28 17:22:08 2025 -0400

    fix: do not normalize resource tracking on live crds (cherry-pick argoproj#22722) - cherry-pick 3.0 (argoproj#22735)

    Signed-off-by: Blake Pettersson <blake.pettersson@gmail.com>
    Co-authored-by: Blake Pettersson <blake.pettersson@gmail.com>

commit 6fea008
Author: gcp-cherry-pick-bot[bot] <98988430+gcp-cherry-pick-bot[bot]@users.noreply.github.com>
Date:   Mon Apr 28 16:47:01 2025 -0400

    fix: remove project from cache key for project scoped credentials (cherry-pick argoproj#22712) (argoproj#22817)

    Signed-off-by: Peter Jiang <peterjiang823@gmail.com>
    Co-authored-by: Peter Jiang <35584807+pjiang-dev@users.noreply.github.com>

commit ffbf9d5
Author: Regina Voloshin <regina.voloshin@codefresh.io>
Date:   Mon Apr 28 11:24:02 2025 +0300

    fix: AppSet PullRequest and SCM generators get 401 from GitHub without tokenRef (manually signed off cherry-pick argoproj#22737) (argoproj#22763)

    Signed-off-by: reggie-k <regina.voloshin@codefresh.io>

commit ebeae20
Author: gcp-cherry-pick-bot[bot] <98988430+gcp-cherry-pick-bot[bot]@users.noreply.github.com>
Date:   Fri Apr 25 08:35:07 2025 -0700

    fix(ui): fix bearerToken validate in helm connect page (cherry-pick argoproj#22791) (argoproj#22798)

    Signed-off-by: linghaoSu <linghao.su@daocloud.io>
    Co-authored-by: Linghao Su <linghao.su@daocloud.io>

commit 3ae374c
Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Date:   Tue Apr 22 08:25:30 2025 -0700

    Bump version to 3.0.0-rc4 on release-3.0 branch (argoproj#22756)

    Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
    Co-authored-by: crenshaw-dev <350466+crenshaw-dev@users.noreply.github.com>

commit 3d2c010
Author: gcp-cherry-pick-bot[bot] <98988430+gcp-cherry-pick-bot[bot]@users.noreply.github.com>
Date:   Tue Apr 22 08:21:13 2025 -0700

    feat(hydrator): handle sourceHydrator fields from webhook (argoproj#19397) (cherry-pick argoproj#22485) (argoproj#22753)

    Signed-off-by: daengdaengLee <gunho1020@gmail.com>
    Signed-off-by: Alexy Mantha <alexy@mantha.dev>
    Co-authored-by: Alexy Mantha <alexy.mantha@goto.com>
    Co-authored-by: Kunho Lee <gunho1020@gmail.com>

commit b6e6104
Author: gcp-cherry-pick-bot[bot] <98988430+gcp-cherry-pick-bot[bot]@users.noreply.github.com>
Date:   Thu Apr 17 16:40:54 2025 -0700

    fix(ui): avoid spurious error on hydration (argoproj#22506) (cherry-pick argoproj#22711) (argoproj#22715)

    Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
    Co-authored-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>

commit a8ce677
Author: gcp-cherry-pick-bot[bot] <98988430+gcp-cherry-pick-bot[bot]@users.noreply.github.com>
Date:   Mon Apr 14 12:50:58 2025 -0700

    fix(controller): always set health.status.lastTransitionTime (argoproj#22665) (cherry-pick argoproj#22666) (argoproj#22667)

    Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
    Co-authored-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>

commit 5d131c5
Author: gcp-cherry-pick-bot[bot] <98988430+gcp-cherry-pick-bot[bot]@users.noreply.github.com>
Date:   Mon Apr 7 12:24:48 2025 +0100

    fix: do not exclude APIService resources (cherry-pick argoproj#22586) (argoproj#22587)

    Signed-off-by: Alexandre Gaudreault <alexandre_gaudreault@intuit.com>
    Co-authored-by: Alexandre Gaudreault <alexandre_gaudreault@intuit.com>

commit d6a04a3
Author: gcp-cherry-pick-bot[bot] <98988430+gcp-cherry-pick-bot[bot]@users.noreply.github.com>
Date:   Thu Mar 27 11:27:26 2025 -0400

    fix: Check for semver constraint matching in application webhook handler (cherry-pick argoproj#21648) (argoproj#22507)

    Signed-off-by: eadred <eadred77@googlemail.com>
    Co-authored-by: Eadred <eadred77@googlemail.com>

commit 4f37dd8
Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Date:   Mon Mar 24 15:38:58 2025 -0400

    Bump version to 3.0.0-rc3 on release-3.0 branch (argoproj#22468)

    Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
    Co-authored-by: crenshaw-dev <350466+crenshaw-dev@users.noreply.github.com>

commit 20f0fc6
Author: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
Date:   Mon Mar 24 14:06:45 2025 -0400

    chore(deps): bump github.com/golang-jwt/jwt to 4.5.2/5.2.2 (argoproj#22464)

    Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>

commit 4ced513
Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Date:   Wed Mar 19 13:04:03 2025 -0400

    Bump version to 3.0.0-rc2 on release-3.0 branch (argoproj#22411)

    Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
    Co-authored-by: crenshaw-dev <350466+crenshaw-dev@users.noreply.github.com>

commit 0d2471b
Author: gcp-cherry-pick-bot[bot] <98988430+gcp-cherry-pick-bot[bot]@users.noreply.github.com>
Date:   Wed Mar 19 10:53:20 2025 -0400

    fix: Enable service account token automount for haproxy (argoproj#22226) (cherry-pick argoproj#22353) (argoproj#22406)

    Signed-off-by: Andrii Korotkov <andrii.korotkov@verkada.com>
    Co-authored-by: Andrii Korotkov <137232734+andrii-korotkov-verkada@users.noreply.github.com>

commit 226a670
Author: gcp-cherry-pick-bot[bot] <98988430+gcp-cherry-pick-bot[bot]@users.noreply.github.com>
Date:   Mon Mar 17 15:18:27 2025 -0400

    chore(ci): improve previous-version script readability, fix bug (cherry-pick argoproj#22378) (argoproj#22381)

    Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
    Co-authored-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>

commit 2933154
Author: gcp-cherry-pick-bot[bot] <98988430+gcp-cherry-pick-bot[bot]@users.noreply.github.com>
Date:   Mon Mar 17 20:01:18 2025 +0200

    fix(ci): get correct previous version, fail workflow if not (cherry-pick argoproj#22376) (argoproj#22377)

    Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
    Co-authored-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>

commit ba866bf
Author: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Date:   Mon Mar 17 17:48:35 2025 +0200

    Bump version to 3.0.0-rc1 on release-3.0 branch (argoproj#22374)

    Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
    Co-authored-by: reggie-k <19544836+reggie-k@users.noreply.github.com>

commit 6e4c8fd
Author: gcp-cherry-pick-bot[bot] <98988430+gcp-cherry-pick-bot[bot]@users.noreply.github.com>
Date:   Mon Mar 17 17:43:57 2025 +0200

    fix(ci): use tags instead of branches (cherry-pick argoproj#22372) (argoproj#22373)

    Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
    Co-authored-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>

commit 15046b9
Author: gcp-cherry-pick-bot[bot] <98988430+gcp-cherry-pick-bot[bot]@users.noreply.github.com>
Date:   Mon Mar 17 17:17:55 2025 +0200

    fix(ci): handle major versions in compatibility table generator (cherry-pick argoproj#22370) (argoproj#22371)

    Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
    Co-authored-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>

Signed-off-by: Alexandre Gaudreault <alexandre_gaudreault@intuit.com>
chansuke pushed a commit to chansuke/argo-cd that referenced this pull request Jun 4, 2025
@magat @rumstead @chansuke
fix: Race condition in nativeGitClient.LsFiles (issue argoproj#21754)…
eecb063 
… (argoproj#22878)

Signed-off-by: Mathieu Agar <magar@mirakl.com>
Co-authored-by: rumstead <37445536+rumstead@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nitishfy nitishfy nitishfy left review comments

@blakepettersson blakepettersson blakepettersson approved these changes

@rumstead rumstead rumstead approved these changes

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.

nativeGitClient.LsFiles is racy, may drop relevant files
4 participants
@magat @rumstead @nitishfy @blakepettersson