Skip to content

Conversation

jimtoniq
Copy link
Contributor

@jimtoniq jimtoniq commented Sep 6, 2021

Hi,

with v2.1 the selected value-files with helm-charts are not used correctly.

Problem evolved from this PR https://github.com/argoproj/argo-cd/pull/5634/files#diff-66db997cf6001ce63d5c5803380962f4b474aae67abacc9e86192673080d2c59R1239
valueFiles contains all available value-files in the chosen directory, but those are used afterwards to retrieve all Parameters.

It should be done as it was implemented before: https://github.com/argoproj/argo-cd/pull/5634/files#diff-66db997cf6001ce63d5c5803380962f4b474aae67abacc9e86192673080d2c59L1220

q.Source.Helm.ValueFiles contains the value-files the user selected in the UI, while res.Helm.ValueFiles should contain all available value-files to be displayed as auto-complete in the UI.

It seems that currently all value-files in the app-directory are used to generate the parameters.
This should solve issue #7099.

Fixes #7099


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: Thomas Münzl <thomasmuenzl@icloud.com>
@codecov
Copy link

codecov bot commented Sep 6, 2021

Codecov Report

Merging #7166 (e24018e) into master (d2100a3) will decrease coverage by 0.00%.
The diff coverage is 66.66%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #7166      +/-   ##
==========================================
- Coverage   41.14%   41.14%   -0.01%     
==========================================
  Files         158      158              
  Lines       21230    21232       +2     
==========================================
  Hits         8736     8736              
- Misses      11241    11242       +1     
- Partials     1253     1254       +1     
Impacted Files Coverage Δ
reposerver/repository/repository.go 60.84% <66.66%> (-0.16%) ⬇️
util/settings/settings.go 47.15% <0.00%> (ø)

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update d2100a3...e24018e. Read the comment docs.

@jimtoniq jimtoniq changed the title fix: use selected helm-values fix: use selected helm-values #7099 Sep 6, 2021
@alexmt alexmt self-assigned this Sep 6, 2021
@alexmt alexmt added the cherry-pick/2.1 Candidate for cherry picking into the 2.1 release branch label Sep 7, 2021
Copy link
Collaborator

@alexmt alexmt left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you!

@alexmt alexmt merged commit 85c45ca into argoproj:master Sep 10, 2021
alexmt pushed a commit that referenced this pull request Sep 10, 2021
Signed-off-by: Thomas Münzl <thomasmuenzl@icloud.com>
plakyda-codefresh pushed a commit to plakyda-codefresh/argo-cd that referenced this pull request Sep 28, 2021
Signed-off-by: Thomas Münzl <thomasmuenzl@icloud.com>
Signed-off-by: viktorplakida <plakyda1@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cherry-pick/2.1 Candidate for cherry picking into the 2.1 release branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

in ArgoCD 2.1.1 Parameters shown in ArgoCD UI for helm based applications do not match parameters used
2 participants