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

Fix logic for setting annotation based fields #150

Merged
merged 1 commit into from
Apr 27, 2018

Conversation

cjellick
Copy link

  • Do not drop a field-to-annotation conversion if the value of the field is
    nil. The user is excplicitly trying to set it to nil
  • Never delete field annotations, even if they are not in the new map of
    annotations sent by the user.
  • Prevent the modification of the creatorId field, which is a special case
    field that should be considered protected

- Do not drop a field-to-annotation conversion if the value of the field is
nil. The user is excplicitly trying to set it to nil
- Never delete field annotations, even if they are not in the new map of
annotations sent by the user.
- Prevent the modification of the creatorId field, which is a special case
field that should be considered protected
@cjellick
Copy link
Author

addresses rancher/rancher#12564 (but will need pulled into rancher)

@ibuildthecloud
Copy link
Contributor

LGTM

@ibuildthecloud ibuildthecloud merged commit 719d3af into rancher:master Apr 27, 2018
jordanjean pushed a commit to jordanjean/norman that referenced this pull request Jan 7, 2020
Added rancher2_alert_group and rancher2_alert_rule datasource and resource
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.

2 participants