Merge pull request #495 from jiuker/feature_keep_rf_annotations

[feature]add rf Annotations to sts

Author: ese

operator/redisfailover/service/generator.go

@@ -280,6 +280,7 @@ func generateRedisStatefulSet(rf *redisfailoverv1.RedisFailover, labels map[stri
 
 	ss := &appsv1.StatefulSet{
 		ObjectMeta: metav1.ObjectMeta{
+			Annotations:     rf.Annotations,
 			Name:            name,
 			Namespace:       namespace,
 			Labels:          labels,

operator/redisfailover/util/label.go

@@ -11,3 +11,15 @@ func MergeLabels(allLabels ...map[string]string) map[string]string {
 	}
 	return res
 }
+
+// MergeAnnotations merges all the annotations maps received as argument into a single new label map.
+func MergeAnnotations(allMergeAnnotations ...map[string]string) map[string]string {
+	res := map[string]string{}
+
+	for _, labels := range allMergeAnnotations {
+		for k, v := range labels {
+			res[k] = v
+		}
+	}
+	return res
+}

service/k8s/statefulset.go

@@ -5,6 +5,8 @@ import (
 	"fmt"
 	"strings"
 
+	"github.com/spotahome/redis-operator/operator/redisfailover/util"
+
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
@@ -105,6 +107,7 @@ func (s *StatefulSetService) CreateOrUpdateStatefulSet(namespace string, statefu
 	// namespace is our spec(https://github.com/kubernetes/community/blob/master/contributors/devel/api-conventions.md#concurrency-control-and-consistency),
 	// we will replace the current namespace state.
 	statefulSet.ResourceVersion = storedStatefulSet.ResourceVersion
+	statefulSet.Annotations = util.MergeAnnotations(statefulSet.Annotations, storedStatefulSet.Annotations)
 	return s.UpdateStatefulSet(namespace, statefulSet)
 }