Skip to content

add support for strip-trailing-cr #237

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

Merged
merged 2 commits into from
May 18, 2021
Merged

add support for strip-trailing-cr #237

merged 2 commits into from
May 18, 2021

Conversation

bakito
Copy link
Contributor

@bakito bakito commented Aug 24, 2020

This PR add support to strip the trailing cr from charts that have been deployed wit different line endings.

See #144

@aleksandr-morozov
Copy link

Can somebody merge this request?

@stale
Copy link

stale bot commented Feb 16, 2021

This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions.

@stale stale bot added the stale label Feb 16, 2021
@bakito
Copy link
Contributor Author

bakito commented Feb 16, 2021

Can someone please have a look at this?

@stale stale bot removed the stale label Feb 16, 2021
cmd/upgrade.go Outdated
@@ -270,7 +272,8 @@ func (d *diffCmd) run() error {
}
}

seenAnyChanges := diff.Manifests(currentSpecs, newSpecs, d.suppressedKinds, d.showSecrets, d.outputContext, d.output, os.Stdout)
println("#######################################################################################################################################*******************************************************")
Copy link
Collaborator

Choose a reason for hiding this comment

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

Can we remove this as an irrelevant change?

Copy link
Collaborator

@mumoshu mumoshu left a comment

Choose a reason for hiding this comment

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

Sorry for the delayed response.

Just one comment on a seemingly redundant println. It would be great if you could confirm that it does look like an unnecessary change.

I'll merge this and revert the println addition only after a few days anyway.
Thanks for your contribution @bakito!

@bakito
Copy link
Contributor Author

bakito commented May 18, 2021

Hi @mumoshu
I remove the debug line, sorry I missed that.

@mumoshu
Copy link
Collaborator

mumoshu commented May 18, 2021

@bakito Thanks again for your support! Merging.

@mumoshu mumoshu merged commit 818e596 into databus23:master May 18, 2021
Sajfer pushed a commit to Sajfer/helm-diff that referenced this pull request Jan 4, 2022
* add support for strip-trailing-cr

Fixes databus23#144
Sajfer pushed a commit to Sajfer/helm-diff that referenced this pull request Jan 5, 2022
* add support for strip-trailing-cr

Fixes databus23#144
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.

3 participants