Skip to content

feat(hydrator): handle sourceHydrator fields from webhook #19397

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
Aug 19, 2024
Merged

feat(hydrator): handle sourceHydrator fields from webhook #19397

merged 3 commits into from
Aug 19, 2024

Conversation

daengdaengLee
Copy link
Member

@daengdaengLee daengdaengLee commented Aug 6, 2024 •
edited
Loading

Hello. This is a PR resolves #19070.

I added logging when the new code was executed. I confirmed that the logs were recorded when the webhook was triggered.
hydrator-webhook

If you notice anything I missed, please let me know in the comments, and I'll make the necessary corrections!
Thanks.

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

@daengdaengLee daengdaengLee mentioned this pull request Aug 6, 2024
Closed
@daengdaengLee daengdaengLee changed the title hydrator: handle sourceHydrator fields from webhook feat(hydrator): handle sourceHydrator fields from webhook Aug 6, 2024
@daengdaengLee daengdaengLee force-pushed the issue-19070 branch 2 times, most recently from 1d7fbe3 to a76bcb6 Compare August 11, 2024 02:01
@daengdaengLee daengdaengLee marked this pull request as ready for review August 11, 2024 08:51
@daengdaengLee daengdaengLee requested a review from a team as a code owner August 11, 2024 08:51
@daengdaengLee
feat(hydrator): handle sourceHydrator fields from webhook
4b3767f 
Signed-off-by: daengdaengLee <gunho1020@gmail.com>
@daengdaengLee
Copy link
Member Author

daengdaengLee commented Aug 12, 2024 •
edited
Loading

Hello, @crenshaw-dev .
I rebased after the latest commit and adjusted my code to match the new changes using your code.
Could you check if I'm using the code correctly?
Thanks!

crenshaw-dev
crenshaw-dev approved these changes Aug 12, 2024
View reviewed changes
Copy link
Member

@crenshaw-dev crenshaw-dev left a comment

Choose a reason for hiding this comment

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

Thanks so much for all the work and for the rebase! Looks like we had some similar ideas over the weekend. :-)

Do you have time to add some tests for apps with source hydrators?

util/webhook/webhook.go Outdated
if path.AppFilesHaveChanged(refreshPaths, changedFiles) {
namespacedAppInterface := a.appClientset.ArgoprojV1alpha1().Applications(app.ObjectMeta.Namespace)
log.Debugf("webhook trigger refresh app to hydrate '%s'", app.ObjectMeta.Name)
_, err = argo.RefreshApp(namespacedAppInterface, app.ObjectMeta.Name, v1alpha1.RefreshTypeNormal)
Copy link
Member

Choose a reason for hiding this comment

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

Should we modify the argo.RefreshApp function to allow setting just the hydrate annotation instead of the refresh annotation?

Copy link
Member Author

Choose a reason for hiding this comment

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

Since the app's features are functioning properly, I think it's fine as it is.

If I understand correctly, when there’s an update (patch to k8s, and listen that from informer), messages are added to both the appRefreshQueue (roughly) and appHydrateQueue, and the subscribers to each queue check the execution conditions after receiving the messages.
So even if we make something like argo.HydrateApp, it shouldn't make a significant difference in how the messages are handled.

If I misunderstood something, could you correct me in a comment pleaase?
Thanks!

@daengdaengLee
fix: use GetDrySource instead of GetHydratorDrySource
0b11db6 
Signed-off-by: daengdaengLee <gunho1020@gmail.com>
@daengdaengLee
Copy link
Member Author

daengdaengLee commented Aug 13, 2024 •
edited
Loading

Hello, @crenshaw-dev.

Sure! I can add some tests.
But I have some questions :

  • Should I add tests in this PR?
  • Could you please explain in more detail what kind of tests you're looking for?

@crenshaw-dev
Copy link
Member

Yep, tests in this PR would be great! I'd just copy some of the test cases in webhook_test.go and use a SourceHydrator in the spec instead of a Source.

@daengdaengLee
test: test if the hydration is properly triggered in the webhook when…
1b2ae93 
… SourceHydrator is configured

Signed-off-by: daengdaengLee <gunho1020@gmail.com>
@daengdaengLee
Copy link
Member Author

daengdaengLee commented Aug 13, 2024 •
edited
Loading

Hello @crenshaw-dev.

Thank you for letting me know there are tests for webhook.
I’ve added a test to confirm that the new code runs correctly. : TestGitHubCommitEvent_Hydrate

Please let me know if I missed anything.
Thanks!

@daengdaengLee
Copy link
Member Author

daengdaengLee commented Aug 19, 2024 •
edited
Loading

Hello, @crenshaw-dev .

Could you check this PR please?
Is there anything else needed for this PR to be merged?
If any changes are needed, please let me know.

Thank you.

crenshaw-dev
crenshaw-dev approved these changes Aug 19, 2024
View reviewed changes
Copy link
Member

@crenshaw-dev crenshaw-dev left a comment

Choose a reason for hiding this comment

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

lgtm, thank you!

@crenshaw-dev crenshaw-dev merged commit 7a1dfc2 into argoproj:hydrator Aug 19, 2024
8 of 9 checks passed
@daengdaengLee daengdaengLee deleted the issue-19070 branch August 19, 2024 14:30
@daengdaengLee daengdaengLee mentioned this pull request Oct 5, 2024
Closed
6 tasks
alexymantha pushed a commit to alexymantha/argo-cd that referenced this pull request Mar 25, 2025
@daengdaengLee @alexymantha
feat(hydrator): handle sourceHydrator fields from webhook (argoproj#1…
4cdcbe7 
…9397)

* feat(hydrator): handle sourceHydrator fields from webhook

Signed-off-by: daengdaengLee <gunho1020@gmail.com>

* fix: use GetDrySource instead of GetHydratorDrySource

Signed-off-by: daengdaengLee <gunho1020@gmail.com>

* test: test if the hydration is properly triggered in the webhook when SourceHydrator is configured

Signed-off-by: daengdaengLee <gunho1020@gmail.com>

---------

Signed-off-by: daengdaengLee <gunho1020@gmail.com>
@alexymantha alexymantha mentioned this pull request Mar 25, 2025
Merged
14 tasks
alexymantha pushed a commit to alexymantha/argo-cd that referenced this pull request Mar 25, 2025
@daengdaengLee @alexymantha
feat(hydrator): handle sourceHydrator fields from webhook (argoproj#1…
879d1df 
…9397)

* feat(hydrator): handle sourceHydrator fields from webhook

Signed-off-by: daengdaengLee <gunho1020@gmail.com>

* fix: use GetDrySource instead of GetHydratorDrySource

Signed-off-by: daengdaengLee <gunho1020@gmail.com>

* test: test if the hydration is properly triggered in the webhook when SourceHydrator is configured

Signed-off-by: daengdaengLee <gunho1020@gmail.com>

---------

Signed-off-by: daengdaengLee <gunho1020@gmail.com>
Signed-off-by: Alexy Mantha <alexy@mantha.dev>
agaudreault pushed a commit that referenced this pull request Mar 26, 2025
@alexymantha @daengdaengLee
feat(hydrator): handle sourceHydrator fields from webhook (#19397) (#…
d9ef10a 
…22485)

Signed-off-by: daengdaengLee <gunho1020@gmail.com>
Signed-off-by: Alexy Mantha <alexy@mantha.dev>
Co-authored-by: Kunho Lee <gunho1020@gmail.com>
gcp-cherry-pick-bot bot pushed a commit that referenced this pull request Mar 27, 2025
@alexymantha @daengdaengLee
feat(hydrator): handle sourceHydrator fields from webhook (#19397) (#…
dc6aead 
…22485)

Signed-off-by: daengdaengLee <gunho1020@gmail.com>
Signed-off-by: Alexy Mantha <alexy@mantha.dev>
Co-authored-by: Kunho Lee <gunho1020@gmail.com>
@gcp-cherry-pick-bot gcp-cherry-pick-bot bot mentioned this pull request Mar 27, 2025
Closed
gcp-cherry-pick-bot bot pushed a commit that referenced this pull request Mar 27, 2025
@alexymantha @daengdaengLee
feat(hydrator): handle sourceHydrator fields from webhook (#19397) (#…
645366f 
…22485)

Signed-off-by: daengdaengLee <gunho1020@gmail.com>
Signed-off-by: Alexy Mantha <alexy@mantha.dev>
Co-authored-by: Kunho Lee <gunho1020@gmail.com>
@gcp-cherry-pick-bot gcp-cherry-pick-bot bot mentioned this pull request Mar 27, 2025
Closed
gcp-cherry-pick-bot bot pushed a commit that referenced this pull request Apr 22, 2025
@alexymantha @daengdaengLee
feat(hydrator): handle sourceHydrator fields from webhook (#19397) (#…
18c06c7 
…22485)

Signed-off-by: daengdaengLee <gunho1020@gmail.com>
Signed-off-by: Alexy Mantha <alexy@mantha.dev>
Co-authored-by: Kunho Lee <gunho1020@gmail.com>
@gcp-cherry-pick-bot gcp-cherry-pick-bot bot mentioned this pull request Apr 22, 2025
Merged
gcp-cherry-pick-bot bot pushed a commit that referenced this pull request Apr 22, 2025
@alexymantha @daengdaengLee
feat(hydrator): handle sourceHydrator fields from webhook (#19397) (#…
21eb6c0 
…22485)

Signed-off-by: daengdaengLee <gunho1020@gmail.com>
Signed-off-by: Alexy Mantha <alexy@mantha.dev>
Co-authored-by: Kunho Lee <gunho1020@gmail.com>
@gcp-cherry-pick-bot gcp-cherry-pick-bot bot mentioned this pull request Apr 22, 2025
Merged
crenshaw-dev pushed a commit that referenced this pull request Apr 22, 2025
@gcp-cherry-pick-bot @alexymantha @daengdaengLee
feat(hydrator): handle sourceHydrator fields from webhook (#19397) (c…
91f5445 
…herry-pick #22485) (#22754)

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>
crenshaw-dev pushed a commit that referenced this pull request Apr 22, 2025
@gcp-cherry-pick-bot @alexymantha @daengdaengLee
feat(hydrator): handle sourceHydrator fields from webhook (#19397) (c…
3d2c010 
…herry-pick #22485) (#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>
Hapshanko pushed a commit to Hapshanko/argo-cd that referenced this pull request Apr 29, 2025
@alexymantha @daengdaengLee @Hapshanko
feat(hydrator): handle sourceHydrator fields from webhook (argoproj#1…
ac5a9ca 
…9397) (argoproj#22485)

Signed-off-by: daengdaengLee <gunho1020@gmail.com>
Signed-off-by: Alexy Mantha <alexy@mantha.dev>
Co-authored-by: Kunho Lee <gunho1020@gmail.com>
Signed-off-by: Hapshanko <adamgaming391100@gmail.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>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@crenshaw-dev crenshaw-dev crenshaw-dev approved these changes

+1 more reviewer

@christianh814 christianh814 christianh814 approved these changes

Reviewers whose approvals may not affect merge requirements
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@daengdaengLee @crenshaw-dev @christianh814