update DistributedRedisClusterSpec: add RequiredAntiAffinity

Author: polefishu

pkg/apis/redis/v1alpha1/distributedrediscluster_types.go

@@ -24,16 +24,18 @@ type DistributedRedisClusterSpec struct {
 	ClusterReplicas  int32                         `json:"clusterReplicas,omitempty"`
 	ServiceName      string                        `json:"serviceName,omitempty"`
 	Config           map[string]string             `json:"config,omitempty"`
-	Affinity         *corev1.Affinity              `json:"affinity,omitempty"`
-	NodeSelector     map[string]string             `json:"nodeSelector,omitempty"`
-	ToleRations      []corev1.Toleration           `json:"toleRations,omitempty"`
-	SecurityContext  *corev1.PodSecurityContext    `json:"securityContext,omitempty"`
-	Annotations      map[string]string             `json:"annotations,omitempty"`
-	Storage          *RedisStorage                 `json:"storage,omitempty"`
-	Resources        *corev1.ResourceRequirements  `json:"resources,omitempty"`
-	PasswordSecret   *corev1.LocalObjectReference  `json:"passwordSecret,omitempty"`
-	Monitor          *AgentSpec                    `json:"monitor,omitempty"`
-	Init             *InitSpec                     `json:"init,omitempty"`
+	// Set RequiredAntiAffinity to force the master-slave node anti-affinity.
+	RequiredAntiAffinity bool                         `json:"requiredAntiAffinity,omitempty"`
+	Affinity             *corev1.Affinity             `json:"affinity,omitempty"`
+	NodeSelector         map[string]string            `json:"nodeSelector,omitempty"`
+	ToleRations          []corev1.Toleration          `json:"toleRations,omitempty"`
+	SecurityContext      *corev1.PodSecurityContext   `json:"securityContext,omitempty"`
+	Annotations          map[string]string            `json:"annotations,omitempty"`
+	Storage              *RedisStorage                `json:"storage,omitempty"`
+	Resources            *corev1.ResourceRequirements `json:"resources,omitempty"`
+	PasswordSecret       *corev1.LocalObjectReference `json:"passwordSecret,omitempty"`
+	Monitor              *AgentSpec                   `json:"monitor,omitempty"`
+	Init                 *InitSpec                    `json:"init,omitempty"`
 }
 
 type AgentSpec struct {

pkg/apis/redis/v1alpha1/zz_generated.deepcopy.go

@@ -62,7 +62,7 @@ func NewStatefulSetForCR(cluster *redisv1alpha1.DistributedRedisCluster, ssName,
 				},
 				Spec: corev1.PodSpec{
 					ImagePullSecrets: cluster.Spec.ImagePullSecrets,
-					Affinity:         getAffinity(spec.Affinity, labels),
+					Affinity:         getAffinity(cluster, labels),
 					Tolerations:      spec.ToleRations,
 					SecurityContext:  spec.SecurityContext,
 					NodeSelector:     cluster.Spec.NodeSelector,
@@ -97,11 +97,37 @@ func NewStatefulSetForCR(cluster *redisv1alpha1.DistributedRedisCluster, ssName,
 	return ss, nil
 }
 
-func getAffinity(affinity *corev1.Affinity, labels map[string]string) *corev1.Affinity {
+func getAffinity(cluster *redisv1alpha1.DistributedRedisCluster, labels map[string]string) *corev1.Affinity {
+	affinity := cluster.Spec.Affinity
 	if affinity != nil {
 		return affinity
 	}
 
+	if cluster.Spec.RequiredAntiAffinity {
+		return &corev1.Affinity{
+			PodAntiAffinity: &corev1.PodAntiAffinity{
+				PreferredDuringSchedulingIgnoredDuringExecution: []corev1.WeightedPodAffinityTerm{
+					{
+						Weight: 100,
+						PodAffinityTerm: corev1.PodAffinityTerm{
+							TopologyKey: hostnameTopologyKey,
+							LabelSelector: &metav1.LabelSelector{
+								MatchLabels: map[string]string{redisv1alpha1.LabelClusterName: cluster.Name},
+							},
+						},
+					},
+				},
+				RequiredDuringSchedulingIgnoredDuringExecution: []corev1.PodAffinityTerm{
+					{
+						TopologyKey: hostnameTopologyKey,
+						LabelSelector: &metav1.LabelSelector{
+							MatchLabels: labels,
+						},
+					},
+				},
+			},
+		}
+	}
 	// return a SOFT anti-affinity by default
 	return &corev1.Affinity{
 		PodAntiAffinity: &corev1.PodAntiAffinity{
@@ -111,7 +137,7 @@ func getAffinity(affinity *corev1.Affinity, labels map[string]string) *corev1.Af
 					PodAffinityTerm: corev1.PodAffinityTerm{
 						TopologyKey: hostnameTopologyKey,
 						LabelSelector: &metav1.LabelSelector{
-							MatchLabels: labels,
+							MatchLabels: map[string]string{redisv1alpha1.LabelClusterName: cluster.Name},
 						},
 					},
 				},