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

feat: Add configurable Helm version (#3872) #4111

Merged
merged 1 commit into from
Aug 25, 2020

Conversation

loxley
Copy link
Contributor

@loxley loxley commented Aug 17, 2020

This commit adds support for configurable Helm version either via
declarative syntax or via argocd cli.

New helm option 'Version' added to the ApplicationSourceHelm
struct which can be either 'v2' or 'v3'.

Argocd app create accepts '--helm-version' that also looks for the
same Helm versions as above.

Closes #3872 .

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 updated both the CLI and UI to expose my feature, or I plan to submit a second PR with them.
  • Optional. My organization is added to USERS.md.
  • I've signed the CLA and my build is green (troubleshooting builds).

@jannfis
Copy link
Member

jannfis commented Aug 17, 2020

Hey, this is cool! Will take a closer look tomorrow :)

@loxley
Copy link
Contributor Author

loxley commented Aug 17, 2020

Hey, this is cool! Will take a closer look tomorrow :)

Cool :)

@loxley loxley force-pushed the add-configurable-helm-version branch from e8a7968 to cbb5b27 Compare August 19, 2020 07:16
@codecov-commenter
Copy link

codecov-commenter commented Aug 19, 2020

Codecov Report

Merging #4111 into master will increase coverage by 0.03%.
The diff coverage is 69.44%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #4111      +/-   ##
==========================================
+ Coverage   42.78%   42.81%   +0.03%     
==========================================
  Files         124      124              
  Lines       18257    18286      +29     
==========================================
+ Hits         7812     7830      +18     
- Misses       9448     9455       +7     
- Partials      997     1001       +4     
Impacted Files Coverage Δ
reposerver/repository/repository.go 59.53% <44.44%> (-0.37%) ⬇️
cmd/argocd/commands/app.go 5.67% <60.00%> (+0.16%) ⬆️
util/settings/settings.go 42.61% <66.66%> (+0.35%) ⬆️
pkg/apis/application/v1alpha1/types.go 59.01% <100.00%> (ø)
util/helm/cmd.go 44.69% <100.00%> (+2.63%) ⬆️
util/helm/helm.go 66.15% <100.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 ebb216f...6699414. Read the comment docs.

This commit adds support for configurable Helm version either via
declarative syntax or via argocd cli.

New helm option 'Version' added to the ApplicationSourceHelm
struct which can be either 'v2' or 'v3'.

Argocd app create accepts '--helm-version' that also looks for the
same Helm versions as above.
@loxley loxley force-pushed the add-configurable-helm-version branch from cbb5b27 to 6699414 Compare August 19, 2020 13:46
Copy link
Member

@jannfis jannfis left a comment

Choose a reason for hiding this comment

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

LGTM, @alexmt do you want to take an additional look please?

@jannfis jannfis requested a review from alexmt August 24, 2020 16:17
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.

LGTM!

@alexmt alexmt merged commit f208700 into argoproj:master Aug 25, 2020
@loxley loxley deleted the add-configurable-helm-version branch August 27, 2020 17:38
@wrdls
Copy link

wrdls commented Sep 16, 2020

@alexmt Any idea when this will be included in a release? I checked the 1.7.5 tag but it doesn't seem to be included yet.

I checked https://github.com/argoproj/argo-cd/blob/v1.7.5/cmd/argocd/commands/app.go#L739 for example but version is not in appOptions.

jon-walton pushed a commit to playstudios/argo-cd that referenced this pull request Oct 27, 2020
This commit adds support for configurable Helm version either via
declarative syntax or via argocd cli.

New helm option 'Version' added to the ApplicationSourceHelm
struct which can be either 'v2' or 'v3'.

Argocd app create accepts '--helm-version' that also looks for the
same Helm versions as above.
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.

Configurable Helm Version
5 participants