Skip to content
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

cherry-pick: Reconcile master #28

Open
wants to merge 288 commits into
base: master
Choose a base branch
from
Open

cherry-pick: Reconcile master #28

wants to merge 288 commits into from

Conversation

JPZ13
Copy link
Collaborator

@JPZ13 JPZ13 commented Jul 4, 2023

This PR:

  • Reconciles our master branch with the upstream master branch

@tico24 and @Joibel - could y'all take a look and make sure everything is kosher? Let me know if there are commits that we should remove. There were also some merge conflicts that I resolved along the way

dependabot bot and others added 30 commits July 4, 2023 15:15
@dependabot @JPZ13
chore(deps): bump actions/setup-go from 3 to 4 (argoproj#10701)
4ce0028 
Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot @JPZ13
chore(deps): bump cloud.google.com/go/storage from 1.29.0 to 1.30.0 (a…
acab1a0 
…rgoproj#10702)

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot @JPZ13
chore(deps-dev): bump sass from 1.59.2 to 1.59.3 in /ui (argoproj#10706)
73371e7 
Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot @JPZ13
chore(deps-dev): bump glob from 9.2.1 to 9.3.0 in /ui (argoproj#10705)
dec8a78 
Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot @JPZ13
chore(deps-dev): bump webpack-dev-server from 4.11.1 to 4.13.0 in /ui (…
496c500 
…argoproj#10707)

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot @JPZ13
chore(deps-dev): bump @babel/core from 7.21.0 to 7.21.3 in /ui (argop…
1beb8e3 
…roj#10708)

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@Joibel @JPZ13
docs: Document possible phase values (argoproj#10698)
6efb47c 
Signed-off-by: Alan Clucas <[email protected]>
@jsoref @JPZ13
fix(ui): reword Workflow DELETED error (argoproj#10689)
6886711 
Signed-off-by: Josh Soref <[email protected]>
@dependabot @JPZ13
chore(deps): bump google.golang.org/api from 0.112.0 to 0.114.0 (argo…
70d9efd 
…proj#10703)

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@terrytangyuan @JPZ13
fix: Support v1 PDB in k8s v1.25+. Fixes argoproj#10649 (argoproj#10712)
e952cb6 
Signed-off-by: Yuan Tang <[email protected]>
@terrytangyuan @JPZ13
docs: podDisruptionBudget.minAvailable should be numeric (argoproj#10715
5ee4d0e 
)

Signed-off-by: Yuan Tang <[email protected]>
@isubasinghe @krrrr38
@alexec @JPZ13
feat: Parse JSON structured logs in Argo UI. Fixes argoproj#6856 (arg…
396674d 
…oproj#10145)

Signed-off-by: krrrr38 <[email protected]>
Signed-off-by: Isitha Subasinghe <[email protected]>
Co-authored-by: krrrr38 <[email protected]>
Co-authored-by: Alex Collins <[email protected]>
@weafscast @JPZ13
fix: Improve templating diagnostics. Fixes argoproj#8311 (argoproj#10741
a5afaf7 
)

Signed-off-by: weafscast <[email protected]>
@mahmoudajawad @JPZ13
docs: Update quick-start.md (argoproj#10720)
eadadba 
Signed-off-by: Mahmoud Abduljawad <[email protected]>
@terrytangyuan @JPZ13
docs: Check v1.25 K8s support in compatibility matrix (argoproj#10742)
b70a787 
Signed-off-by: Yuan Tang <[email protected]>
@terrytangyuan @JPZ13
fix: Workflow stuck at running when init container failed but wait co…
c540f28 
…ntainer did not. Fixes argoproj#10717 (argoproj#10740)
@terrytangyuan @JPZ13
fix: DB sessions are recreated whenever controller configmap updates. F…
5ee0093 
…ixes argoproj#10498 (argoproj#10734)
@dependabot @JPZ13
chore(deps-dev): bump sass from 1.59.3 to 1.60.0 in /ui (argoproj#10749)
04b937e 
Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot @JPZ13
chore(deps): bump github.com/minio/minio-go/v7 from 7.0.49 to 7.0.50 (a…
0b4f8eb 
…rgoproj#10751)

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot @JPZ13
chore(deps): bump cloud.google.com/go/storage from 1.30.0 to 1.30.1 (a…
fb22669 
…rgoproj#10750)

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot @JPZ13
chore(deps): bump moment-timezone from 0.5.41 to 0.5.42 in /ui (argop…
8988968 
…roj#10752)

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot @JPZ13
chore(deps-dev): bump webpack-dev-server from 4.13.0 to 4.13.1 in /ui (…
11d231d 
…argoproj#10756)

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot @JPZ13
chore(deps): bump cronstrue from 2.23.0 to 2.24.0 in /ui (argoproj#10757
e8ab7b3 
)

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@GeunSam2 @JPZ13
docs: Add Karrot to users (argoproj#10760)
6618c63
@terrytangyuan @JPZ13
fix: Immediately release locks by pending workflows that are shutting…
f6dd3f0 
… down. Fixes argoproj#10733 (argoproj#10735)

Signed-off-by: Yuan Tang <[email protected]>
@jiachengxu @sarabala1979 @JPZ13
fix: metrics don't get emitted properly during retry. Fixes argoproj#…
c795d1b 
…8207 argoproj#10463 (argoproj#10489)

Signed-off-by: Jiacheng Xu <[email protected]>
Co-authored-by: Saravanan Balasubramanian <[email protected]>
@tico24 @JPZ13
chore: Add python to devcontainer for make docs (argoproj#10765)
731e434 
Signed-off-by: Tim Collins <[email protected]>
@tico24 @JPZ13
docs: Enhance s3 setup docs with IRSA information (argoproj#10766)
08d970d 
Signed-off-by: Tim Collins <[email protected]>
@vnzongzna @JPZ13
docs: Add Salesforce to USERS.md (argoproj#10770)
d2bc7b1 
Signed-off-by: Vaibhav Kaushik <[email protected]>
@xuliang2019 @JPZ13
docs: Remove days in examples/retry-backoff.yaml (argoproj#10773)
1bb77b9 
Signed-off-by: liang <[email protected]>
terrytangyuan and others added 25 commits July 4, 2023 15:22
@terrytangyuan @JPZ13
docs: Adjust release schedule for minor releases (argoproj#11239)
2cc7dbe 
Signed-off-by: Yuan Tang <[email protected]>
@Joibel @JPZ13
fix: Allow hooks to be specified in workflowDefaults (argoproj#11214)
6478c3a
@iainlane @sarabala1979 @JPZ13
fix: Support inputs for inline steps templates (argoproj#11074)
31b44b0 
Signed-off-by: Iain Lane <[email protected]>
Co-authored-by: Saravanan Balasubramanian <[email protected]>
@toredash @JPZ13
fix: Update Bitbucket SSH host key (argoproj#11245)
ae75d11 
Signed-off-by: Tore S. Loenoey <[email protected]>
@isubasinghe @juliev0 @JPZ13
docs: add makefile improvement proposal (argoproj#10188)
0dd5104 
Signed-off-by: Isitha Subasinghe <[email protected]>
Signed-off-by: Julie Vogelman <[email protected]>
Co-authored-by: Julie Vogelman <[email protected]>
@tico24 @JPZ13
fix: Upgrade windows container to ltsc2022 (argoproj#11246)
55f32cf 
Signed-off-by: Tim Collins <[email protected]>
@brianloss @JPZ13
chore: bump azidentity and storage/azblob to latest version (argoproj…
7afe148 
…#11254) (argoproj#11255)

Signed-off-by: Brian Loss <[email protected]>
@dependabot @JPZ13
chore(deps): bump github.com/minio/minio-go/v7 from 7.0.56 to 7.0.58 (a…
744d679 
…rgoproj#11261)

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot @JPZ13
chore(deps): bump golang.org/x/sync from 0.2.0 to 0.3.0 (argoproj#11262)
1b31d63 
Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot @JPZ13
chore(deps): bump react-datepicker from 4.14.0 to 4.14.1 in /ui (argo…
20ce4f6 
…proj#11263)

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@abrabah @JPZ13
fix: do not delete pvc when max parallelism has been reached. Fixes a…
fc490ca 
…rgoproj#11119 (argoproj#11138)

Signed-off-by: Abraham Bah <[email protected]>
@dbragdon1 @JPZ13
feat: Added label selectors to argo cron list. Fixes argoproj#11158 (a…
66b8066 
…rgoproj#11202)

Signed-off-by: Dylan Bragdon <[email protected]>
@smile-luobin @JPZ13
fix: fix bugs in throttler and syncManager initialization in Workflow…
7c96281 
…Controller (argoproj#11210)

Signed-off-by: smile-luobin <[email protected]>
@tico24 @JPZ13
chore: use k8s 1.27 for CI (argoproj#11267)
c04c49e 
Signed-off-by: Tim Collins <[email protected]>
@Joibel @JPZ13
docs: Link memoization and work-avoidance (argoproj#11257)
c53b68b
@dependabot @JPZ13
chore(deps): bump cloud.google.com/go/storage from 1.30.1 to 1.31.0 (a…
de29a4a 
…rgoproj#11284)

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot @JPZ13
chore(deps): bump github.com/minio/minio-go/v7 from 7.0.58 to 7.0.59 (a…
f959485 
…rgoproj#11285)

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot @JPZ13
chore(deps): bump dependabot/fetch-metadata from 1.5.1 to 1.6.0 (argo…
6a12673 
…proj#11287)

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot @JPZ13
chore(deps): bump react-datepicker from 4.14.1 to 4.15.0 in /ui (argo…
1a66489 
…proj#11289)

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot @JPZ13
chore(deps): bump google.golang.org/api from 0.128.0 to 0.129.0 (argo…
79adfc4 
…proj#11286)

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@Akashinfy @JPZ13
docs: Update README.md (argoproj#11288)
e4f14e5
@astraw99 @JPZ13
fix: Argo DB init conflict when deploy workflow-controller with multi…
e3f136c 
…ple replicas argoproj#11177 (argoproj#11178)

Signed-off-by: astraw99 <[email protected]>
@liangyuanpeng @JPZ13
fix: Azure input artifact support optional. Fixes argoproj#11179 (arg…
159e71f 
…oproj#11235)

Signed-off-by: Lan Liang <[email protected]>
@sxllwx @JPZ13
chore: gofile typo(registery) (argoproj#11291)
04d919a
@SlaterByte @JPZ13
fix: use unformatted templateName as args to PodName. Fixes argoproj#…
c7be4bc 
…11250 (argoproj#11251)

Signed-off-by: James Slater <[email protected]>
Co-authored-by: James Slater <[email protected]>
@JPZ13 JPZ13 changed the title Reconcile master cherry-pick: Reconcile master Jul 4, 2023
@JPZ13
Copy link
Collaborator Author

JPZ13 commented Jul 4, 2023

@isubasinghe - I think some of these test failures are related to #22. Could you take a look when you have some down time? No immediate rush

@Joibel
Copy link
Collaborator

Joibel commented Jul 4, 2023

Reverting #22 fixes the hooks unit tests at least, but I haven't managed to bisect or determine which bit.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.