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

Strip strategic merge patch annotations #228

Merged
merged 1 commit into from
Aug 29, 2019
Merged

Strip strategic merge patch annotations #228

merged 1 commit into from
Aug 29, 2019

Conversation

mkmik
Copy link
Collaborator

@mkmik mkmik commented Aug 29, 2019

Closes #227

@mkmik mkmik requested a review from atomatt August 29, 2019 09:10
}
keys := []string{
"kubectl.kubernetes.io/last-applied-configuration",
"kubecfg.ksonnet.io/last-applied-configuration",

Choose a reason for hiding this comment

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

Good catch!

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

do you know any other tool that does something similar?

Choose a reason for hiding this comment

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

Not that I know of.
Perhaps make a regex on *last-applied-configuration ?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

I suspect I'd regret that choice when somebody would report bewilderment at a stripped annotation with a similar name but with a different semantics.

Copy link

Choose a reason for hiding this comment

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

Perhaps check all annotations and strip anything that contains original plain text?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

that wouldn't work with "kubecfg.ksonnet.io/last-applied-configuration since it's gzip compressed

}
keys := []string{
"kubectl.kubernetes.io/last-applied-configuration",
"kubecfg.ksonnet.io/last-applied-configuration",
Copy link

Choose a reason for hiding this comment

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

Perhaps check all annotations and strip anything that contains original plain text?

@mkmik
Copy link
Collaborator Author

mkmik commented Aug 29, 2019

bors r+

bors bot added a commit that referenced this pull request Aug 29, 2019
228: Strip strategic merge patch annotations r=mkmik a=mkmik

Closes #227

Co-authored-by: Marko Mikulicic <mkm@bitnami.com>
@bors
Copy link
Contributor

bors bot commented Aug 29, 2019

Build succeeded

@bors bors bot merged commit 02a421c into master Aug 29, 2019
@bors bors bot deleted the stripanno branch August 29, 2019 10:35
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.

Round-tripping secrets can leak cleartext in last-applied-configuration
3 participants