Skip to content

Commit

Permalink
Fix nil error for update statefulset util (#1896)
Browse files Browse the repository at this point in the history
  • Loading branch information
Yisaer authored Mar 10, 2020
1 parent ac408e3 commit 4ff25e8
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions pkg/manager/member/utils.go
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

0 comments on commit 4ff25e8

Please sign in to comment.