chore: sync v.3.5.9 into our fork
#347
Merged
Conversation
This file contains 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
Signed-off-by: GitHub <[email protected]> Signed-off-by: Anton Gilgur <[email protected]> Co-authored-by: agilgur5 <[email protected]> Co-authored-by: Anton Gilgur <[email protected]> (cherry picked from commit 66e64c8)
…argoproj#13163) Signed-off-by: Dillen Padhiar <[email protected]> (cherry picked from commit 6201d75)
…rgoproj#13210 (argoproj#13214) Signed-off-by: oninowang <[email protected]> Co-authored-by: jswxstw <[email protected]> (cherry picked from commit 6c33cbb)
…riaDB. Fixes argoproj#13202 (argoproj#13203) Signed-off-by: spaced <[email protected]> (cherry picked from commit ac9cb3a)
…j#13244) Signed-off-by: Anton Gilgur <[email protected]> (cherry picked from commit 06da23e)
…13263) Signed-off-by: shuangkun <[email protected]> Co-authored-by: AlbeeSo <[email protected]> (cherry picked from commit 77b5732)
…proj#12971 (argoproj#13280) Signed-off-by: qingfeng777 <[email protected]> Signed-off-by: Anton Gilgur <[email protected]> Signed-off-by: Anton Gilgur <[email protected]> Co-authored-by: Neile Havens <[email protected]> Co-authored-by: Anton Gilgur <[email protected]> Co-authored-by: Anton Gilgur <[email protected]> (cherry picked from commit 9c5dd5b)
…oproj#13091) Signed-off-by: Tianchu Zhao <[email protected]> Signed-off-by: Anton Gilgur <[email protected]> Co-authored-by: Anton Gilgur <[email protected]> (cherry picked from commit a929c8f)
…proj#13311) Signed-off-by: Gongpu Zhu <[email protected]> (cherry picked from commit 3ece3b3)
- modified backport to use `release-3.5` instead of `main` Signed-off-by: Anton Gilgur <[email protected]> (cherry picked from commit 1a81dfb)
- fixed merge conflict within the table; removed `stopStrategy` for `release-3.5` Signed-off-by: Anton Gilgur <[email protected]> (cherry picked from commit 5aac5a8)
Signed-off-by: Anton Gilgur <[email protected]> (cherry picked from commit 8d8f954)
…rgoproj#13172) Signed-off-by: afenner <[email protected]> Signed-off-by: andrew-est <[email protected]> (cherry picked from commit fc0f34e)
…te workflows. fixes argoproj#12944 (argoproj#13183) Signed-off-by: Miltiadis Alexis <[email protected]> Co-authored-by: Alan Clucas <[email protected]> (cherry picked from commit c59ff53)
Signed-off-by: Alan Clucas <[email protected]> Co-authored-by: Anton Gilgur <[email protected]> (cherry picked from commit c94e21e)
…#13251) Signed-off-by: droctothorpe <[email protected]> (cherry picked from commit f6c567d)
…3371) Signed-off-by: Anton Gilgur <[email protected]> (cherry picked from commit b052452)
…#13294) - merge conflicts with tests removed in backport by agilgur5 Signed-off-by: oninowang <[email protected]> Signed-off-by: jswxstw <[email protected]> Co-authored-by: jswxstw <[email protected]> Co-authored-by: agilgur5 <[email protected]> (cherry picked from commit 825aacf)
Signed-off-by: Anton Gilgur <[email protected]> (cherry picked from commit d7495b8)
…2997 (argoproj#13048) Signed-off-by: Tianchu Zhao <[email protected]> (cherry picked from commit a154a93)
argoproj#13386 (argoproj#13387) Signed-off-by: sh.yoon <[email protected]> (cherry picked from commit c16c5e4)
…3317) Signed-off-by: Anton Gilgur <[email protected]> Signed-off-by: Anton Gilgur <[email protected]> (cherry picked from commit 5d8ee22)
Signed-off-by: Anton Gilgur <[email protected]> (cherry picked from commit 1239fd0)
…r estimation. Fixes argoproj#13382 (argoproj#13394) Signed-off-by: linzhengen <[email protected]> (cherry picked from commit 7cc20bb)
…Fixes argoproj#13006 (argoproj#13250) - `go.mod` merge conflict fixed by agilgur5 Signed-off-by: Miltiadis Alexis <[email protected]> Co-authored-by: Alan Clucas <[email protected]> (cherry picked from commit c834ef5)
…x/v4 (argoproj#13406) Signed-off-by: Yuan Tang <[email protected]> (cherry picked from commit d4572aa)
…goproj#12964) - resolved minor merge conflicts with file relocation, function style, and new lines Signed-off-by: Anton Gilgur <[email protected]> (cherry picked from commit 671320d)
…rgoproj#13039) Signed-off-by: instauro <[email protected]> Signed-off-by: Anton Gilgur <[email protected]> Co-authored-by: instauro <[email protected]> Co-authored-by: Anton Gilgur <[email protected]> (cherry picked from commit 10e3a6d)
…goproj#13261) Signed-off-by: shuangkun <[email protected]> Signed-off-by: Anton Gilgur <[email protected]> Signed-off-by: Anton Gilgur <[email protected]> Co-authored-by: AlbeeSo <[email protected]> Co-authored-by: Anton Gilgur <[email protected]> Co-authored-by: Anton Gilgur <[email protected]> (cherry picked from commit 3f9b992)
…proj#13308) Signed-off-by: Alan Clucas <[email protected]> (cherry picked from commit efb52e5)
- the original commit (7cc20bb) was generated with an updated version of `mockery`, while this branch's version is older - remove the new version's codegen and use the codegen from this branch's version Signed-off-by: Anton Gilgur <[email protected]>
…o 26.1.4+incompatible in the go_modules group (argoproj#13416) Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: Noam Gal <[email protected]>
danielm-codefresh
approved these changes
Jul 31, 2024
Signed-off-by: Noam Gal <[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.
synced
v3.5.9from upstream, to our forkMotivation
Modifications
Verification