Use StrategicMergePatch to apply overrides #175
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
lllamnyp
requested review from
sircthulhu,
Kirill-Garbar and
sergeyshevch
as code owners
sergeyshevch
requested changes
Apr 15, 2024
lllamnyp
force-pushed
the
feat/corev1-podspec
branch
from
66713e6 to
69444e6
Compare
lllamnyp
commented
Apr 15, 2024
lllamnyp
force-pushed
the
feat/corev1-podspec
branch
3 times, most recently
from
878749f to
80fbb47
Compare
hiddenmarten
requested changes
Apr 16, 2024
lllamnyp
force-pushed
the
feat/corev1-podspec
branch
from
80fbb47 to
28bc53b
Compare
lllamnyp
commented
Apr 17, 2024
This commit removes the custom etcdaenixiov1alpha1.PodSpec type in favor of corev1.PodSpec. As a result, StrategicMergePatch may be used to correctly applythe overrides from EtcdCluster.Spec.PodTemplate.Spec on top of the default PodSpec, generated by the operator. In turn, this allows removal of dozens of lines of code responsible for custom merging logic.
lllamnyp
force-pushed
the
feat/corev1-podspec
branch
from
28bc53b to
180c194
Compare
hiddenmarten
approved these changes
Apr 17, 2024
gecube
approved these changes
Apr 17, 2024
sergeyshevch
approved these changes
Apr 17, 2024
This was referenced Apr 18, 2024
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.
This commit removes the custom etcdaenixiov1alpha1.PodSpec type in favor of corev1.PodSpec. As a result, StrategicMergePatch may be used to correctly applythe overrides from EtcdCluster.Spec.PodTemplate.Spec on top of the default PodSpec, generated by the operator. In turn, this allows removal of dozens of lines of code responsible for custom merging logic.