Skip to content

Conversation

@ATGardner
Copy link

synced v3.5.9 from upstream, to our fork

Motivation

Modifications

Verification

github-actions bot and others added 30 commits July 5, 2024 22:31
Signed-off-by: GitHub <noreply@github.com>
Signed-off-by: Anton Gilgur <agilgur5@gmail.com>
Co-authored-by: agilgur5 <agilgur5@users.noreply.github.com>
Co-authored-by: Anton Gilgur <agilgur5@gmail.com>
(cherry picked from commit 66e64c8)
…argoproj#13163)

Signed-off-by: Dillen Padhiar <dillen_padhiar@intuit.com>
(cherry picked from commit 6201d75)
…rgoproj#13210 (argoproj#13214)

Signed-off-by: oninowang <oninowang@tencent.com>
Co-authored-by: jswxstw <jswxstw@gmail.com>
(cherry picked from commit 6c33cbb)
…riaDB. Fixes argoproj#13202 (argoproj#13203)

Signed-off-by: spaced <spaced.wombat@gmail.com>
(cherry picked from commit ac9cb3a)
…j#13244)

Signed-off-by: Anton Gilgur <agilgur5@gmail.com>
(cherry picked from commit 06da23e)
…13263)

Signed-off-by: shuangkun <tsk2013uestc@163.com>
Co-authored-by: AlbeeSo <suyashi1321@163.com>
(cherry picked from commit 77b5732)
…proj#12971 (argoproj#13280)

Signed-off-by: qingfeng777 <251098199@qq.com>
Signed-off-by: Anton Gilgur <4970083+agilgur5@users.noreply.github.com>
Signed-off-by: Anton Gilgur <agilgur5@gmail.com>
Co-authored-by: Neile Havens <neilehavens@gmail.com>
Co-authored-by: Anton Gilgur <4970083+agilgur5@users.noreply.github.com>
Co-authored-by: Anton Gilgur <agilgur5@gmail.com>
(cherry picked from commit 9c5dd5b)
…oproj#13091)

Signed-off-by: Tianchu Zhao <evantczhao@gmail.com>
Signed-off-by: Anton Gilgur <4970083+agilgur5@users.noreply.github.com>
Co-authored-by: Anton Gilgur <4970083+agilgur5@users.noreply.github.com>
(cherry picked from commit a929c8f)
…proj#13311)

Signed-off-by: Gongpu Zhu <7722194+ZhuGongpu@users.noreply.github.com>
(cherry picked from commit 3ece3b3)
- modified backport to use `release-3.5` instead of `main`

Signed-off-by: Anton Gilgur <agilgur5@gmail.com>
(cherry picked from commit 1a81dfb)
- fixed merge conflict within the table; removed `stopStrategy` for `release-3.5`

Signed-off-by: Anton Gilgur <agilgur5@gmail.com>
(cherry picked from commit 5aac5a8)
Signed-off-by: Anton Gilgur <agilgur5@gmail.com>
(cherry picked from commit 8d8f954)
…rgoproj#13172)

Signed-off-by: afenner <Andrew.fenner@est.tech>
Signed-off-by: andrew-est <andrew.fenner@est.tech>
(cherry picked from commit fc0f34e)
…te workflows. fixes argoproj#12944 (argoproj#13183)

Signed-off-by: Miltiadis Alexis <alexmiltiadis@gmail.com>
Co-authored-by: Alan Clucas <alan@clucas.org>
(cherry picked from commit c59ff53)
Signed-off-by: Alan Clucas <alan@clucas.org>
Co-authored-by: Anton Gilgur <4970083+agilgur5@users.noreply.github.com>
(cherry picked from commit c94e21e)
…#13251)

Signed-off-by: droctothorpe <mythicalsunlight@gmail.com>
(cherry picked from commit f6c567d)
…3371)

Signed-off-by: Anton Gilgur <agilgur5@gmail.com>
(cherry picked from commit b052452)
…#13294)

- merge conflicts with tests removed in backport by agilgur5

Signed-off-by: oninowang <oninowang@tencent.com>
Signed-off-by: jswxstw <jswxstw@gmail.com>
Co-authored-by: jswxstw <jswxstw@gmail.com>
Co-authored-by: agilgur5 <agilgur5@gmail.com>
(cherry picked from commit 825aacf)
Signed-off-by: Anton Gilgur <agilgur5@gmail.com>
(cherry picked from commit d7495b8)
…2997 (argoproj#13048)

Signed-off-by: Tianchu Zhao <evantczhao@gmail.com>
(cherry picked from commit a154a93)
 argoproj#13386 (argoproj#13387)

Signed-off-by: sh.yoon <sh.yoon.devops@gmail.com>
(cherry picked from commit c16c5e4)
…3317)

Signed-off-by: Anton Gilgur <agilgur5@gmail.com>
Signed-off-by: Anton Gilgur <4970083+agilgur5@users.noreply.github.com>
(cherry picked from commit 5d8ee22)
Signed-off-by: Anton Gilgur <agilgur5@gmail.com>
(cherry picked from commit 1239fd0)
…r estimation. Fixes argoproj#13382 (argoproj#13394)

Signed-off-by: linzhengen <linzhengen@yahoo.co.jp>
(cherry picked from commit 7cc20bb)
…Fixes argoproj#13006 (argoproj#13250)

- `go.mod` merge conflict fixed by agilgur5

Signed-off-by: Miltiadis Alexis <alexmiltiadis@gmail.com>
Co-authored-by: Alan Clucas <alan@clucas.org>
(cherry picked from commit c834ef5)
…x/v4 (argoproj#13406)

Signed-off-by: Yuan Tang <terrytangyuan@gmail.com>
(cherry picked from commit d4572aa)
…goproj#12964)

- resolved minor merge conflicts with file relocation, function style, and new lines

Signed-off-by: Anton Gilgur <agilgur5@gmail.com>
(cherry picked from commit 671320d)
…rgoproj#13039)

Signed-off-by: instauro <instauro@proton.me>
Signed-off-by: Anton Gilgur <agilgur5@gmail.com>
Co-authored-by: instauro <instauro@proton.me>
Co-authored-by: Anton Gilgur <agilgur5@gmail.com>
(cherry picked from commit 10e3a6d)
…goproj#13261)

Signed-off-by: shuangkun <tsk2013uestc@163.com>
Signed-off-by: Anton Gilgur <4970083+agilgur5@users.noreply.github.com>
Signed-off-by: Anton Gilgur <agilgur5@gmail.com>
Co-authored-by: AlbeeSo <suyashi1321@163.com>
Co-authored-by: Anton Gilgur <4970083+agilgur5@users.noreply.github.com>
Co-authored-by: Anton Gilgur <agilgur5@gmail.com>
(cherry picked from commit 3f9b992)
…proj#13308)

Signed-off-by: Alan Clucas <alan@clucas.org>
(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 <agilgur5@gmail.com>
@ATGardner ATGardner self-assigned this Jul 31, 2024
…o 26.1.4+incompatible in the go_modules group (argoproj#13416)

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@ATGardner ATGardner changed the title Sec vuln sync chore: sync v.3.5.9 into our fork Jul 31, 2024
Signed-off-by: Noam Gal <noam.gal@octopus.com>
Signed-off-by: Noam Gal <noam.gal@octopus.com>
@ATGardner ATGardner merged commit 2891faa into release-3.5 Jul 31, 2024
@ATGardner ATGardner deleted the sec-vuln-sync branch July 31, 2024 13:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.