statefulsets are updated during each sync even if no changes to the config #2308
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
Yisaer
previously approved these changes
Apr 27, 2020
weekface
previously approved these changes
Apr 27, 2020
|
/merge |
|
/run-all-tests |
1 similar comment
|
/run-all-tests |
|
@DanielZhangQD merge failed. |
|
/merge |
|
/run-all-tests |
|
@DanielZhangQD merge failed. |
|
/merge |
|
/run-all-tests |
|
@DanielZhangQD merge failed. |
|
/merge |
|
/run-all-tests |
|
github actions failed, it's not possible to merge this PR. github actions jobs must be re-run manually:
|
|
@DanielZhangQD merge failed. |
OK, Thanks! |
|
/merge |
|
/run-all-tests |
1 similar comment
|
/run-all-tests |
|
@DanielZhangQD merge failed. |
|
/merge |
|
/run-all-tests |
|
@DanielZhangQD merge failed. |
|
/run-e2e-in-kind |
cofyc
reviewed
Apr 28, 2020
pkg/manager/member/utils.go
Outdated
| @@ -100,7 +100,14 @@ func GetLastAppliedConfig(set *apps.StatefulSet) (*apps.StatefulSetSpec, *corev1 | |||
|
|
|||
| // statefulSetEqual compares the new Statefulset's spec with old Statefulset's last applied config | |||
| func statefulSetEqual(new apps.StatefulSet, old apps.StatefulSet) bool { | |||
| if !apiequality.Semantic.DeepEqual(new.Annotations, old.Annotations) { | |||
| // The annotations in old sts may include LastAppliedConfigAnnotation | |||
| var tmpAnno map[string]string | |||
There was a problem hiding this comment.
Suggested change
| var tmpAnno map[string]string | |
| tmpAnno := make(map[string]string) |
There was a problem hiding this comment.
Thanks a lot! Fixed.
pkg/manager/member/utils.go
Outdated
Comment on lines
124
to
126
| if _, ok := tmpTemplate.Annotations[LastAppliedConfigAnnotation]; ok { | ||
| delete(tmpTemplate.Annotations, LastAppliedConfigAnnotation) | ||
| } |
There was a problem hiding this comment.
Suggested change
| if _, ok := tmpTemplate.Annotations[LastAppliedConfigAnnotation]; ok { | |
| delete(tmpTemplate.Annotations, LastAppliedConfigAnnotation) | |
| } | |
| delete(tmpTemplate.Annotations, LastAppliedConfigAnnotation) |
cofyc
approved these changes
Apr 28, 2020
Yisaer
approved these changes
Apr 28, 2020
|
cherry pick to release-1.1 in PR #2325 |
sre-bot
added a commit
that referenced
this pull request
Apr 28, 2020
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.
What problem does this PR solve?
statefulsets are updated during each sync even if no changes to the config
What is changed and how does it work?
Fix the equality check logic
Check List
Tests
Code changes
Related changes
Does this PR introduce a user-facing change?: