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.

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

docs: Modify examples for ArgoCD ApplicationSet Git Generator #10857

Merged

Conversation

toyamagu-2021
Copy link
Member

@toyamagu-2021 toyamagu-2021 commented Oct 8, 2022

I modify the document about ArgoCD ApplicationSet Git Generator because:

  • Example application versions are outdated
    • PromtheusOperator and ArgoWorkflow use apiextensions.k8s.io/v1beta1 which is no longer served as of v1.22.
    • So we can not deploy them into the current k8s version.
  • Example uses template name: '{{path[0]}}', but we should use {{path.basename}}
    • If we use name: '{{path[0]}}', this result in a duplicate Application name.

And I have made additional minor changes.


Signed-off-by: toyamagu toyamagu2021@gmail.com

Note on DCO:

If the DCO action in the integration test fails, one or more of your commits are not signed off. Please click on the Details link next to the DCO action for instructions on how to resolve this.

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).
  • 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).

Signed-off-by: toyamagu <toyamagu2021@gmail.com>
@codecov
Copy link

codecov bot commented Oct 8, 2022

Codecov Report

Base: 45.67% // Head: 45.67% // No change to project coverage 👍

Coverage data is based on head (be86572) compared to base (441b583).
Patch has no changes to coverable lines.

Additional details and impacted files
@@           Coverage Diff           @@
##           master   #10857   +/-   ##
=======================================
  Coverage   45.67%   45.67%           
=======================================
  Files         236      236           
  Lines       28698    28698           
=======================================
  Hits        13107    13107           
  Misses      13799    13799           
  Partials     1792     1792           
Impacted Files Coverage Δ
util/settings/settings.go 51.25% <0.00%> (ø)

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 at Codecov.
📢 Do you have feedback about the report comment? Let us know in this issue.

@toyamagu-2021 toyamagu-2021 marked this pull request as ready for review October 8, 2022 15:24
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 @toyamagu-2021! Just a couple suggestions given.

Signed-off-by: toyamagu <toyamagu2021@gmail.com>
@toyamagu-2021 toyamagu-2021 force-pushed the doc-applicationset-gitgenerator branch from be7065b to be86572 Compare October 8, 2022 15:59
@crenshaw-dev crenshaw-dev added cherry-pick/2.4 Candidate for cherry picking into the 2.4 release branch cherry-pick/2.5 labels Oct 8, 2022
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, @toyamagu-2021!

@crenshaw-dev crenshaw-dev merged commit 612c415 into argoproj:master Oct 8, 2022
crenshaw-dev pushed a commit that referenced this pull request Oct 8, 2022
* Doc: ArgoCD ApplicationSet Git directory

Signed-off-by: toyamagu <toyamagu2021@gmail.com>

* Docs: use "my-project" rather than default project

Signed-off-by: toyamagu <toyamagu2021@gmail.com>

Signed-off-by: toyamagu <toyamagu2021@gmail.com>
nirsht pushed a commit to nirsht/argo-cd that referenced this pull request Oct 8, 2022
…10857)

* Doc: ArgoCD ApplicationSet Git directory

Signed-off-by: toyamagu <toyamagu2021@gmail.com>

* Docs: use "my-project" rather than default project

Signed-off-by: toyamagu <toyamagu2021@gmail.com>

Signed-off-by: toyamagu <toyamagu2021@gmail.com>
Signed-off-by: Nir Shtein <89006520+nirsht@users.noreply.github.com>
crenshaw-dev added a commit that referenced this pull request Oct 8, 2022
Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
@crenshaw-dev
Copy link
Collaborator

Cherry-picked onto release-2.4 for 2.4.15 and release-2.5 for 2.5.0-rc2.

nirsht pushed a commit to nirsht/argo-cd that referenced this pull request Oct 8, 2022
…10857)

* Doc: ArgoCD ApplicationSet Git directory

Signed-off-by: toyamagu <toyamagu2021@gmail.com>

* Docs: use "my-project" rather than default project

Signed-off-by: toyamagu <toyamagu2021@gmail.com>

Signed-off-by: toyamagu <toyamagu2021@gmail.com>
Signed-off-by: Nir Shtein <89006520+nirsht@users.noreply.github.com>
nirsht added a commit to nirsht/argo-cd that referenced this pull request Oct 8, 2022
nirsht added a commit to nirsht/argo-cd that referenced this pull request Oct 8, 2022
crenshaw-dev added a commit that referenced this pull request Oct 13, 2022
* Wrap error objects to include context

Signed-off-by: Nir Shtein <89006520+nirsht@users.noreply.github.com>

* Revert "Wrap error objects to include context"

This reverts commit d1789bd.

Signed-off-by: Nir Shtein <89006520+nirsht@users.noreply.github.com>

* In Application Details, link the path field directly to the path in the repo

Signed-off-by: Nir Shtein <89006520+nirsht@users.noreply.github.com>

* fix: duplicate source namespace validation (#10853)

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

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

* docs: fix examples for ArgoCD ApplicationSet Git Generator (#10857)

* Doc: ArgoCD ApplicationSet Git directory

Signed-off-by: toyamagu <toyamagu2021@gmail.com>

* Docs: use "my-project" rather than default project

Signed-off-by: toyamagu <toyamagu2021@gmail.com>

Signed-off-by: toyamagu <toyamagu2021@gmail.com>
Signed-off-by: Nir Shtein <89006520+nirsht@users.noreply.github.com>

* Change 'branch' to 'src'

Signed-off-by: Nir Shtein <89006520+nirsht@users.noreply.github.com>

* Fix CR

Signed-off-by: Nir Shtein <89006520+nirsht@users.noreply.github.com>

* Fix CR

Signed-off-by: Nir Shtein <89006520+nirsht@users.noreply.github.com>

* renaming

Signed-off-by: Nir Shtein <89006520+nirsht@users.noreply.github.com>

* Add comment

Signed-off-by: Nir Shtein <89006520+nirsht@users.noreply.github.com>

Signed-off-by: Nir Shtein <89006520+nirsht@users.noreply.github.com>
Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
Signed-off-by: toyamagu <toyamagu2021@gmail.com>
Co-authored-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
Co-authored-by: toyamagu <83329336+toyamagu-2021@users.noreply.github.com>
nbjohnson pushed a commit to nbjohnson/argo-cd that referenced this pull request Oct 18, 2022
…oj#10860)

* Wrap error objects to include context

Signed-off-by: Nir Shtein <89006520+nirsht@users.noreply.github.com>

* Revert "Wrap error objects to include context"

This reverts commit d1789bd.

Signed-off-by: Nir Shtein <89006520+nirsht@users.noreply.github.com>

* In Application Details, link the path field directly to the path in the repo

Signed-off-by: Nir Shtein <89006520+nirsht@users.noreply.github.com>

* fix: duplicate source namespace validation (argoproj#10853)

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

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

* docs: fix examples for ArgoCD ApplicationSet Git Generator (argoproj#10857)

* Doc: ArgoCD ApplicationSet Git directory

Signed-off-by: toyamagu <toyamagu2021@gmail.com>

* Docs: use "my-project" rather than default project

Signed-off-by: toyamagu <toyamagu2021@gmail.com>

Signed-off-by: toyamagu <toyamagu2021@gmail.com>
Signed-off-by: Nir Shtein <89006520+nirsht@users.noreply.github.com>

* Change 'branch' to 'src'

Signed-off-by: Nir Shtein <89006520+nirsht@users.noreply.github.com>

* Fix CR

Signed-off-by: Nir Shtein <89006520+nirsht@users.noreply.github.com>

* Fix CR

Signed-off-by: Nir Shtein <89006520+nirsht@users.noreply.github.com>

* renaming

Signed-off-by: Nir Shtein <89006520+nirsht@users.noreply.github.com>

* Add comment

Signed-off-by: Nir Shtein <89006520+nirsht@users.noreply.github.com>

Signed-off-by: Nir Shtein <89006520+nirsht@users.noreply.github.com>
Signed-off-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
Signed-off-by: toyamagu <toyamagu2021@gmail.com>
Co-authored-by: Michael Crenshaw <350466+crenshaw-dev@users.noreply.github.com>
Co-authored-by: toyamagu <83329336+toyamagu-2021@users.noreply.github.com>
Signed-off-by: Nicholas Johnson <nbjohnson10@gmail.com>
@toyamagu-2021 toyamagu-2021 deleted the doc-applicationset-gitgenerator branch December 16, 2022 03:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cherry-pick/2.4 Candidate for cherry picking into the 2.4 release branch cherry-pick/2.5
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants