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

fix: append elementsYaml in order to keep fields order #13335

Merged
merged 21 commits into from May 1, 2023
Merged

fix: append elementsYaml in order to keep fields order #13335

merged 21 commits into from May 1, 2023

Conversation

lsoica
Copy link
Contributor

@lsoica lsoica commented Apr 24, 2023 •
edited

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.
  • Optional. My organization is added to USERS.md.
  • 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.

Please see Contribution FAQs if you have questions about your pull-request.

crenshaw-dev and others added 18 commits February 17, 2023 07:22
@crenshaw-dev @lsoica
fix: use field-wise templating for child matrix generators (argoproj#…
f6ec6ce 
…11661)

Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
@crenshaw-dev @lsoica
test shouldn't use go template
d04eecb 
Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
@lsoica
feat: extend List generator with ElementsJsonBase64
f6c6705 
Signed-off-by: Laurentiu Soica <laurentiu@soica.ro>
@lsoica
fix: proper field name and crd update
f99b254 
Signed-off-by: Laurentiu Soica <laurentiu@soica.ro>
@lsoica
fix: indentation
4085ca9 
Signed-off-by: Laurentiu Soica <laurentiu@soica.ro>
@lsoica
fix: remove b64 encoding. Based on argoproj#12287
c2c6819 
Signed-off-by: Laurentiu Soica <laurentiu@soica.ro>
@lsoica
fix: generated with codegen
aa4ff42 
Signed-off-by: Laurentiu Soica <laurentiu@soica.ro>
@lsoica
fix: reset some of the generated files
3d003fc 
Signed-off-by: Laurentiu Soica <laurentiu@soica.ro>
@lsoica
fix: elementsyaml to cover both yaml and json
7ee6537 
Signed-off-by: Laurentiu Soica <laurentiu@soica.ro>
@lsoica
Merge branch 'master' into master
eed223b
@lsoica
Merge branch 'master' into master
b3a702c
@lsoica
Merge branch 'master' into master
0d8ac9a 
Signed-off-by: Laurentiu Soica <laurentiu@soica.ro>
@lsoica
Merge branch master of https://github.com/argoproj/argo-cd
ccc51f2 
Signed-off-by: laurentiusoica <laurentiu@soica.ro>
@lsoica
fix: regenerate code
5ba9d5b 
Signed-off-by: laurentiusoica <laurentiu@soica.ro>
@lsoica
Merge branch 'master' of https://github.com/argoproj/argo-cd
5481d0e 
Signed-off-by: laurentiusoica <laurentiu@soica.ro>
@lsoica
Regenerate code
13c4666 
Signed-off-by: laurentiusoica <laurentiu@soica.ro>
@lsoica
fix: update ApplicationSet docs
d60a06b 
Signed-off-by: laurentiusoica <laurentiu@soica.ro>
@lsoica
fix: elementsyaml to elementsYaml to be more consistent with other fi…
ed1b810 
…elds

Signed-off-by: laurentiusoica <laurentiu@soica.ro>
@lsoica
Merge branch 'master' of https://github.com/argoproj/argo-cd
7ee0b00 
Signed-off-by: laurentiusoica <laurentiu@soica.ro>
@codecov
Copy link

codecov bot commented Apr 24, 2023 •
edited

Codecov Report

Patch coverage: 100.00% and no project coverage change.

Comparison is base (93f8723) 49.02% compared to head (cf1e59d) 49.03%.

Additional details and impacted files 
@@           Coverage Diff           @@
##           master   #13335   +/-   ##
=======================================
  Coverage   49.02%   49.03%           
=======================================
  Files         247      247           
  Lines       42692    42694    +2     
=======================================
+ Hits        20928    20933    +5     
+ Misses      19647    19645    -2     
+ Partials     2117     2116    -1
Impacted Files Coverage Δ
.../apis/application/v1alpha1/applicationset_types.go 28.57% <ø> (ø)
util/helm/helm.go 44.14% <ø> (ø)
controller/appcontroller.go 53.10% <100.00%> (+0.06%) ⬆️

... and 2 files with indirect coverage changes

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report in Codecov by Sentry.
📢 Do you have feedback about the report comment? Let us know in this issue.

@lsoica
fix: preserve field order
086dc5b 
Signed-off-by: laurentiusoica <laurentiu@soica.ro>
@lsoica lsoica mentioned this pull request Apr 24, 2023
Merged
10 tasks
crenshaw-dev
crenshaw-dev approved these changes May 1, 2023
View reviewed changes
Copy link
Collaborator

@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, @lsoica!

@crenshaw-dev crenshaw-dev merged commit ad07b9d into argoproj:master May 1, 2023
26 checks passed
@onematchfox
Copy link
Contributor

@crenshaw-dev, please can you cherry-pick this across to 2.7?

@crenshaw-dev
Copy link
Collaborator

/cherry-pick release-2.7

@gcp-cherry-pick-bot
Copy link

Cherry-pick failed with Merge error ad07b9d43591bfdda076ce4e342f885eade350f9 into temp-cherry-pick-beaa35-release-2.7

crenshaw-dev pushed a commit to crenshaw-dev/argo-cd that referenced this pull request May 9, 2023
@lsoica @crenshaw-dev
fix: append elementsYaml in order to keep fields order (argoproj#13335)
418b5ff 
Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
@onematchfox onematchfox mentioned this pull request May 16, 2023
Merged
crenshaw-dev added a commit that referenced this pull request May 18, 2023
@crenshaw-dev @lsoica
fix: append elementsYaml in order to keep fields order (#13335) (#13508)
fb2ae11 
Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
Co-authored-by: Laurentiu Soica <laurentiu@soica.ro>
@christianh814 christianh814 mentioned this pull request Jun 14, 2023
Closed
3 tasks
schakrad pushed a commit to schakrad/argo-cd that referenced this pull request Jul 24, 2023
@crenshaw-dev @lsoica @schakrad
fix: append elementsYaml in order to keep fields order (argoproj#13335)…
5cca672 
… (argoproj#13508)

Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
Co-authored-by: Laurentiu Soica <laurentiu@soica.ro>
Signed-off-by: schakrad <58915923+schakrad@users.noreply.github.com>
yyzxw pushed a commit to yyzxw/argo-cd that referenced this pull request Aug 9, 2023
@lsoica @crenshaw-dev
fix: append elementsYaml in order to keep fields order (argoproj#13335)
43293ef 
* fix: use field-wise templating for child matrix generators (argoproj#11661)

Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>

* test shouldn't use go template

Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>

* feat: extend List generator with ElementsJsonBase64

Signed-off-by: Laurentiu Soica <laurentiu@soica.ro>

* fix: proper field name and crd update

Signed-off-by: Laurentiu Soica <laurentiu@soica.ro>

* fix: indentation

Signed-off-by: Laurentiu Soica <laurentiu@soica.ro>

* fix: remove b64 encoding. Based on argoproj#12287

Signed-off-by: Laurentiu Soica <laurentiu@soica.ro>

* fix: generated with codegen

Signed-off-by: Laurentiu Soica <laurentiu@soica.ro>

* fix: reset some of the generated files

Signed-off-by: Laurentiu Soica <laurentiu@soica.ro>

* fix: elementsyaml to cover both yaml and json

Signed-off-by: Laurentiu Soica <laurentiu@soica.ro>

* fix: regenerate code

Signed-off-by: laurentiusoica <laurentiu@soica.ro>

* Regenerate code

Signed-off-by: laurentiusoica <laurentiu@soica.ro>

* fix: update ApplicationSet docs

Signed-off-by: laurentiusoica <laurentiu@soica.ro>

* fix: elementsyaml to elementsYaml to be more consistent with other fields

Signed-off-by: laurentiusoica <laurentiu@soica.ro>

* fix: preserve field order

Signed-off-by: laurentiusoica <laurentiu@soica.ro>

---------

Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
Signed-off-by: Laurentiu Soica <laurentiu@soica.ro>
Signed-off-by: laurentiusoica <laurentiu@soica.ro>
Co-authored-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.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

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@lsoica @onematchfox @crenshaw-dev