fix(commit-server): apply image override (cherry-pick #22916) #22917
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
![gcp-cherry-pick-bot[bot]](https://avatars.githubusercontent.com/in/169664?s=60&v=4){kind=small}
Signed-off-by: Michael Crenshaw <[email protected]>
ishitasequeira
approved these changes
May 10, 2025
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## release-3.0 #22917 +/- ##
===============================================
- Coverage 55.98% 55.89% -0.10%
===============================================
Files 343 343
Lines 57360 57360
===============================================
- Hits 32114 32059 -55
- Misses 22616 22655 +39
- Partials 2630 2646 +16 ☔ View full report in Codecov by Sentry. |
agaudreault
added a commit
to agaudreault/argo-cd
that referenced
this pull request
Jun 2, 2025
commit 1d23403 Author: Alexandre Gaudreault <[email protected]> Date: Mon Jun 2 11:58:22 2025 -0400 ordered checks Signed-off-by: Alexandre Gaudreault <[email protected]> commit 544abb0 Author: Alexandre Gaudreault <[email protected]> Date: Mon Jun 2 10:44:57 2025 -0400 unit tests Signed-off-by: Alexandre Gaudreault <[email protected]> commit 0d70bcc Author: Alexandre Gaudreault <[email protected]> Date: Mon Jun 2 09:52:47 2025 -0400 e2e Signed-off-by: Alexandre Gaudreault <[email protected]> commit b9d10b0 Author: Alexandre Gaudreault <[email protected]> Date: Fri May 30 12:42:07 2025 -0400 health Signed-off-by: Alexandre Gaudreault <[email protected]> commit e5182cc Author: Alexandre Gaudreault <[email protected]> Date: Fri May 30 11:55:20 2025 -0400 better logs Signed-off-by: Alexandre Gaudreault <[email protected]> commit 5c78cfc Author: Alexandre Gaudreault <[email protected]> Date: Fri May 30 11:50:09 2025 -0400 better logs Signed-off-by: Alexandre Gaudreault <[email protected]> commit 5fa7c32 Author: Alexandre Gaudreault <[email protected]> Date: Fri May 30 11:43:23 2025 -0400 info logs since transition are not frequent Signed-off-by: Alexandre Gaudreault <[email protected]> commit 31e425a Merge: 6a9eea4 5c24b6b Author: Alexandre Gaudreault <[email protected]> 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 <[email protected]> commit 6a9eea4 Author: Alexandre Gaudreault <[email protected]> Date: Fri May 30 11:24:11 2025 -0400 fix appset conditions wiped-out with progressive sync Signed-off-by: Alexandre Gaudreault <[email protected]> commit 5c24b6b Author: Michael Crenshaw <[email protected]> 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 <[email protected]> commit 59c14a0 Author: Alexandre Gaudreault <[email protected]> Date: Thu May 29 16:38:23 2025 -0400 add app context to validation error Signed-off-by: Alexandre Gaudreault <[email protected]> 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 <[email protected]> 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 <[email protected]> Co-authored-by: Michael Crenshaw <[email protected]> commit 0e20cb6 Author: Soumya Ghosh Dastidar <[email protected]> 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 <[email protected]> commit a791559 Author: Alexandre Gaudreault <[email protected]> Date: Wed May 28 11:29:55 2025 -0400 fix merge Signed-off-by: Alexandre Gaudreault <[email protected]> commit e7a5572 Author: Alexandre Gaudreault <[email protected]> Date: Wed May 28 11:05:39 2025 -0400 unit tests Signed-off-by: Alexandre Gaudreault <[email protected]> commit 0559ab3 Author: Alexandre Gaudreault <[email protected]> Date: Mon May 26 17:19:21 2025 -0400 codegen Signed-off-by: Alexandre Gaudreault <[email protected]> commit 6405e14 Author: Alexandre Gaudreault <[email protected]> Date: Mon May 26 17:12:40 2025 -0400 sort application status Signed-off-by: Alexandre Gaudreault <[email protected]> commit 789e016 Author: Alexandre Gaudreault <[email protected]> Date: Mon May 26 17:10:00 2025 -0400 rename syncMap Signed-off-by: Alexandre Gaudreault <[email protected]> commit 3348d3f Author: Alexandre Gaudreault <[email protected]> Date: Mon May 26 16:23:32 2025 -0400 use const for progressive sync Signed-off-by: Alexandre Gaudreault <[email protected]> commit 207a75b Author: Alexandre Gaudreault <[email protected]> Date: Mon May 26 16:04:59 2025 -0400 refactor status updates Signed-off-by: Alexandre Gaudreault <[email protected]> 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 <[email protected]> commit 040ed44 Author: Michael Crenshaw <[email protected]> Date: Wed May 28 08:20:49 2025 -0600 Merge commit from fork Fix shadowed variable name Signed-off-by: Ry0taK <[email protected]> Co-authored-by: Ry0taK <[email protected]> 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 <[email protected]> Co-authored-by: Michael Crenshaw <[email protected]> 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 <[email protected]> commit 866db14 Author: Peter Jiang <[email protected]> Date: Tue May 20 18:09:18 2025 -0700 chore: bump gitops-engine ssd fix (argoproj#23071) Signed-off-by: Peter Jiang <[email protected]> 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 <[email protected]> Co-authored-by: Andrii Korotkov <[email protected]> commit ddd6df5 Author: Alexandre Gaudreault <[email protected]> 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 <[email protected]> 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 <[email protected]> Signed-off-by: Alexandre Gaudreault <[email protected]> Co-authored-by: Takumi Sue <[email protected]> Co-authored-by: Alexandre Gaudreault <[email protected]> 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 <[email protected]> Co-authored-by: Cyril Gaudin <[email protected]> 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 <[email protected]> commit 3fb34b9 Author: Regina Voloshin <[email protected]> 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 <[email protected]> Signed-off-by: Alexandre Gaudreault <[email protected]> Co-authored-by: Timothy Griffiths <[email protected]> Co-authored-by: Alexandre Gaudreault <[email protected]> commit 90e9d1a Author: Oleksandr Saulyak <[email protected]> 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 <[email protected]> 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 <[email protected]> Co-authored-by: Michael Crenshaw <[email protected]> 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 <[email protected]> Co-authored-by: rumstead <[email protected]> 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 <[email protected]> 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 <[email protected]> Co-authored-by: Michael Crenshaw <[email protected]> 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 <[email protected]> Co-authored-by: Mathieu Agar <[email protected]> Co-authored-by: rumstead <[email protected]> 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 <[email protected]> Co-authored-by: jheyduk <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> Co-authored-by: Regina Voloshin <[email protected]> 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 <[email protected]> Co-authored-by: Mike Bryant <[email protected]> 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 <[email protected]> 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 <[email protected]> Co-authored-by: Blake Pettersson <[email protected]> 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 <[email protected]> Co-authored-by: Peter Jiang <[email protected]> commit ffbf9d5 Author: Regina Voloshin <[email protected]> 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 <[email protected]> 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 <[email protected]> Co-authored-by: Linghao Su <[email protected]> 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 <[email protected]> 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 <[email protected]> Signed-off-by: Alexy Mantha <[email protected]> Co-authored-by: Alexy Mantha <[email protected]> Co-authored-by: Kunho Lee <[email protected]> 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 <[email protected]> Co-authored-by: Michael Crenshaw <[email protected]> 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 <[email protected]> Co-authored-by: Michael Crenshaw <[email protected]> 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 <[email protected]> Co-authored-by: Alexandre Gaudreault <[email protected]> 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 <[email protected]> Co-authored-by: Eadred <[email protected]> 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 <[email protected]> commit 20f0fc6 Author: Michael Crenshaw <[email protected]> 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 <[email protected]> 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 <[email protected]> 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 <[email protected]> Co-authored-by: Andrii Korotkov <[email protected]> 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 <[email protected]> Co-authored-by: Michael Crenshaw <[email protected]> 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 <[email protected]> Co-authored-by: Michael Crenshaw <[email protected]> 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 <[email protected]> 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 <[email protected]> Co-authored-by: Michael Crenshaw <[email protected]> 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 <[email protected]> Co-authored-by: Michael Crenshaw <[email protected]> Signed-off-by: Alexandre Gaudreault <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Cherry-picked fix(commit-server): apply image override (#22916)
Signed-off-by: Michael Crenshaw [email protected]