Add merge function for cluster snapshot #301
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Issues linked to changelog: |
jahvon
commented
Oct 8, 2021
| if _, ok := merged[gvk]; ok { | ||
| for name, object := range objectsMap { | ||
| // If there is already an object specified here, the object from toMerge | ||
| // will replace it |
There was a problem hiding this comment.
Does this conflict resolution approach seem fine?
There was a problem hiding this comment.
Yes, but you also need to loop over all of the objects in toMerge and add them
There was a problem hiding this comment.
Can you elaborate? That's what I'm doing here
EItanya
reviewed
Oct 11, 2021
| @@ -71,6 +71,22 @@ func (s Snapshot) Clone(selectors ...GVKSelectorFunc) Snapshot { | |||
| return clone | |||
| } | |||
|
|
|||
| func (s Snapshot) Merge(toMerge Snapshot) Snapshot { | |||
There was a problem hiding this comment.
Can you add a comment to the method about the what it does, and the merge semantics
EItanya
reviewed
Oct 11, 2021
| @@ -128,3 +144,15 @@ func (cs ClusterSnapshot) Clone(selectors ...GVKSelectorFunc) ClusterSnapshot { | |||
| } | |||
| return clone | |||
| } | |||
|
|
|||
| func (cs ClusterSnapshot) Merge(toMerge ClusterSnapshot) ClusterSnapshot { | |||
EItanya
approved these changes
Oct 11, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
BOT NOTES:
resolves #302