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

Accept .yml files as well as .yaml for templates. #3646

Merged
merged 1 commit into from Mar 12, 2018

Conversation

nicdoye
Copy link
Contributor

@nicdoye nicdoye commented Mar 9, 2018

See helm/helm-classic#306 for helm classic
and
https://kubernetes.slack.com/archives/C51E88VDG/p1520588964000061

This means charts can be made with .yml files. It's backwards compatible as helm install doesn't care about the contents of the package, and so older versions of helm can still install the packaged chart.

@k8s-ci-robot
Copy link

Thanks for your pull request. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

📝 Please follow instructions at https://git.k8s.io/community/CLA.md#the-contributor-license-agreement to sign the CLA.

It may take a couple minutes for the CLA signature to be fully registered; after that, please reply here with a new comment and we'll verify. Thanks.


Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@k8s-ci-robot k8s-ci-robot added cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Mar 9, 2018
@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. and removed cncf-cla: no Indicates the PR's author has not signed the CNCF CLA. labels Mar 9, 2018
@thomastaylor312
Copy link
Contributor

@nicdoye This is looking good to me! I am just double checking that wasn't added in the first place for a good reason. I should get an answer soon and then I'll merge!

@thomastaylor312 thomastaylor312 added this to the 2.9.0 - Features milestone Mar 10, 2018
@thomastaylor312 thomastaylor312 merged commit 2c51155 into helm:master Mar 12, 2018
splisson pushed a commit to splisson/helm that referenced this pull request Dec 6, 2018
Accept .yml files as well as .yaml for templates.
@@ -101,7 +101,7 @@ func Templates(linter *support.Linter, values []byte, namespace string, strict b
linter.RunLinterRule(support.ErrorSev, path, validateAllowedExtension(fileName))

// We only apply the following lint rules to yaml files
if filepath.Ext(fileName) != ".yaml" {
if filepath.Ext(fileName) != ".yaml" || filepath.Ext(fileName) == ".yml" {
Copy link

Choose a reason for hiding this comment

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

Shouldn't this be != ".yml"?

Copy link
Contributor Author

@nicdoye nicdoye Sep 30, 2021

Choose a reason for hiding this comment

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

Good catch. In fact, it should be:

filepath.Ext(fileName) != ".yaml" && filepath.Ext(fileName) != ".yml"

as we only want to go to continue if it's not .yaml and it's not .yml.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. feature size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants