Skip to content

Proposal: support multi-fields merge key #610

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 11, 2017

Conversation

mengqiy
Copy link
Member

@mengqiy mengqiy commented May 9, 2017

As @pwittrock suggested, break #476 to 2 proposals:

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label May 9, 2017
@mengqiy mengqiy force-pushed the multi_fields_merge_keys branch from a8a2ae2 to 4766413 Compare May 9, 2017 23:28
@mengqiy
Copy link
Member Author

mengqiy commented May 9, 2017

/assign @pwittrock @liggitt
Updated #476.

@mengqiy mengqiy changed the title support multi-fields merge key Proposal: support multi-fields merge key May 10, 2017
If a merge key only has one field, it will be the same as before, i.e. `patchMergeKey:"<key1>"`.

There are no patch format changes.
Additional fields are just extra fields in the patch.
Copy link
Member

Choose a reason for hiding this comment

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

Additional fields are just extra fields in the patch.

Patches for fields that have multiple fields in the merge key must include all of the fields part of the mergekey in the patch.

If a merge key only has one field, it will be the same as before, i.e. `patchMergeKey:"<key1>"`.

There are no patch format changes.
Additional fields are just extra fields in the patch.
Copy link
Member

Choose a reason for hiding this comment

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

What is the behavior if any of the fields are missing from the patch? Does the server reject the request?

Copy link
Member Author

Choose a reason for hiding this comment

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

We should reject that patch when it happens to a new API using multi-fields merge key.
Updated.

@pwittrock
Copy link
Member

Alright, I think this has been discussed enough in the other PR, and there have been no objections. I am going to merge it.

FYI: @liggitt @fabianofranz @adohe

@pwittrock pwittrock merged commit 4bf47d1 into kubernetes:master May 11, 2017
@mengqiy mengqiy deleted the multi_fields_merge_keys branch May 12, 2017 22:45
danehans pushed a commit to danehans/community that referenced this pull request Jul 18, 2023
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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants