Skip to content
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.

Sign up for GitHub

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

Fix nil error for update statefulset util #1896

Merged
merged 2 commits into from
Mar 10, 2020
Merged

Fix nil error for update statefulset util #1896

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ca2c340
Update utils.go
Mar 10, 2020
021ea0d
Merge branch 'master' into fix_nil_error_in_member_util
sre-bot Mar 10, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions pkg/manager/member/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,6 +267,12 @@ func MapContainers(podSpec *corev1.PodSpec) map[string]corev1.Container {
// updateStatefulSet is a template function to update the statefulset of components
func updateStatefulSet(setCtl controller.StatefulSetControlInterface, tc *v1alpha1.TidbCluster, newSet, oldSet *apps.StatefulSet) error {
isOrphan := metav1.GetControllerOf(oldSet) == nil
if newSet.Annotations == nil {
newSet.Annotations = map[string]string{}
}
if oldSet.Annotations == nil {
oldSet.Annotations = map[string]string{}
}
if !statefulSetEqual(*newSet, *oldSet) || isOrphan {
set := *oldSet
// Retain the deprecated last applied pod template annotation for backward compatibility
Expand Down