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

Update service when labels and annotations are modified #2210

Merged
merged 2 commits into from
Dec 5, 2019

Conversation

charith-elastic
Copy link
Contributor

@charith-elastic charith-elastic commented Dec 4, 2019

Currently, if a user edits a resource and changes the labels and/or annotations of the service template, those changes don't get applied to the existing service.

This PR fixes the above problem and adds a few more unit tests to verify the behaviour. Additionally, any labels/annotations added manually (i.e. not through the service template) will be preserved as long as they don't conflict with the defaults or the service template.

Fixes #2175

@charith-elastic charith-elastic added >bug Something isn't working v1.0.0 labels Dec 4, 2019
Copy link
Collaborator

@pebrc pebrc left a comment

Choose a reason for hiding this comment

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

LGTM

@charith-elastic charith-elastic merged commit 35bc1ba into elastic:master Dec 5, 2019
@charith-elastic charith-elastic deleted the svc-annotations branch December 5, 2019 08:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
>bug Something isn't working v1.0.0
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Impossible to annotate Kibana Service
3 participants