From 0663f0e915cd33a12a2641eae49e902849f29449 Mon Sep 17 00:00:00 2001 From: pingcap-github-bot Date: Tue, 10 Mar 2020 16:31:33 +0800 Subject: [PATCH] Update utils.go (#1898) Co-authored-by: Song Gao <2695690803@qq.com> --- pkg/manager/member/utils.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkg/manager/member/utils.go b/pkg/manager/member/utils.go index 26d23490f8..7c451d26af 100644 --- a/pkg/manager/member/utils.go +++ b/pkg/manager/member/utils.go @@ -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