✨ [release-0.8] Add client.StrategicMergeFrom #1413
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
k8s-ci-robot
added
the
cncf-cla: yes
|
Hi @timebertt. Thanks for your PR. I'm waiting for a kubernetes-sigs member to verify that this patch is reasonable to test. If it is, they should reply with Once the patch is verified, the new status will be reflected by the I understand the commands that are listed here. Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. |
k8s-ci-robot
added
needs-ok-to-test
|
I wasn't sure, if we can backport this feature to |
|
/ok-to-test |
k8s-ci-robot
added
ok-to-test
k8s-ci-robot
added
the
lgtm
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: alvaroaleman, timebertt The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
k8s-ci-robot
added
the
approved
|
Great, thank you! |
This was referenced Mar 9, 2021
Merged
rfranzke
added a commit
to rfranzke/gardener
that referenced
this pull request
Mar 9, 2021
Due to kubernetes-sigs/controller-runtime#1413, naive gomock expectations don't work anymore. The reason is that the `mergeFromPatch` struct has now a function attribute (`createPatch`), and as `gomega` is using `reflect.DeepEqual` under the hood, the comparison now fails: > Func values are deeply equal if both are nil; otherwise they are not deeply equal. (from https://golang.org/pkg/reflect/#DeepEqual) Hence, we introduce our own `test.EXPECTPatch()` function. Thanks to @timuthy for pointing this out.
This was referenced Mar 11, 2021
rfranzke
added a commit
to rfranzke/gardener
that referenced
this pull request
Mar 12, 2021
Due to kubernetes-sigs/controller-runtime#1413, naive gomock expectations don't work anymore. The reason is that the `mergeFromPatch` struct has now a function attribute (`createPatch`), and as `gomega` is using `reflect.DeepEqual` under the hood, the comparison now fails: > Func values are deeply equal if both are nil; otherwise they are not deeply equal. (from https://golang.org/pkg/reflect/#DeepEqual) Hence, we introduce our own `test.EXPECTPatch()` function. Thanks to @timuthy for pointing this out.
This was referenced Mar 15, 2021
Closed
Closed
timuthy
pushed a commit
to gardener/gardener
that referenced
this pull request
Mar 15, 2021
* make revendor generate * Get rid of third_party/forked/kubernetes * Adapt Patch() expectations of MockClient Due to kubernetes-sigs/controller-runtime#1413, naive gomock expectations don't work anymore. The reason is that the `mergeFromPatch` struct has now a function attribute (`createPatch`), and as `gomega` is using `reflect.DeepEqual` under the hood, the comparison now fails: > Func values are deeply equal if both are nil; otherwise they are not deeply equal. (from https://golang.org/pkg/reflect/#DeepEqual) Hence, we introduce our own `test.EXPECTPatch()` function. Thanks to @timuthy for pointing this out. * Adapt kubelet config
krgostev
pushed a commit
to krgostev/gardener
that referenced
this pull request
Apr 21, 2022
* make revendor generate * Get rid of third_party/forked/kubernetes * Adapt Patch() expectations of MockClient Due to kubernetes-sigs/controller-runtime#1413, naive gomock expectations don't work anymore. The reason is that the `mergeFromPatch` struct has now a function attribute (`createPatch`), and as `gomega` is using `reflect.DeepEqual` under the hood, the comparison now fails: > Func values are deeply equal if both are nil; otherwise they are not deeply equal. (from https://golang.org/pkg/reflect/#DeepEqual) Hence, we introduce our own `test.EXPECTPatch()` function. Thanks to @timuthy for pointing this out. * Adapt kubelet config
krgostev
pushed a commit
to krgostev/gardener
that referenced
this pull request
Jul 5, 2022
* make revendor generate * Get rid of third_party/forked/kubernetes * Adapt Patch() expectations of MockClient Due to kubernetes-sigs/controller-runtime#1413, naive gomock expectations don't work anymore. The reason is that the `mergeFromPatch` struct has now a function attribute (`createPatch`), and as `gomega` is using `reflect.DeepEqual` under the hood, the comparison now fails: > Func values are deeply equal if both are nil; otherwise they are not deeply equal. (from https://golang.org/pkg/reflect/#DeepEqual) Hence, we introduce our own `test.EXPECTPatch()` function. Thanks to @timuthy for pointing this out. * Adapt kubelet config
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.
Cherry-pick of #1406:
This PR adds
client.StrategicMergeFrom.The function is similar to
client.{MergeFrom,MergeFromWithOptions}, but it creates astrategic-merge-patchinstead of amerge-patch. See doc strings for more details about the differences of the two patch types and to figure out when to use which one.Note, that strategic merge patches are not supported by CRDs.