init

Author: leon-ape

pkg/controller/scheduling/scheduling_utils.go

@@ -44,14 +44,18 @@ func ApplySchedulingPolicyToPodSpec(podSpec *corev1.PodSpec, schedulingPolicy *a
 }
 
 func BuildSchedulingPolicy(cluster *appsv1.Cluster, compSpec *appsv1.ClusterComponentSpec) (*appsv1.SchedulingPolicy, error) {
-	if cluster.Spec.SchedulingPolicy != nil || (compSpec != nil && compSpec.SchedulingPolicy != nil) {
+	if cluster.Spec.SchedulingPolicy != nil ||
+		(compSpec != nil && compSpec.SchedulingPolicy != nil) || hasClusterAffinityOrTolerations() {
 		return buildSchedulingPolicy(cluster, compSpec)
 	}
 	return nil, nil
 }
 
 func buildSchedulingPolicy(cluster *appsv1.Cluster, compSpec *appsv1.ClusterComponentSpec) (*appsv1.SchedulingPolicy, error) {
-	schedulingPolicy := cluster.Spec.SchedulingPolicy.DeepCopy()
+	schedulingPolicy := &appsv1.SchedulingPolicy{}
+	if cluster.Spec.SchedulingPolicy != nil {
+		schedulingPolicy = cluster.Spec.SchedulingPolicy.DeepCopy()
+	}
 	if compSpec != nil && compSpec.SchedulingPolicy != nil {
 		schedulingPolicy = compSpec.SchedulingPolicy.DeepCopy()
 	}
@@ -61,7 +65,7 @@ func buildSchedulingPolicy(cluster *appsv1.Cluster, compSpec *appsv1.ClusterComp
 		if err != nil {
 			return err
 		}
-		schedulingPolicy.Affinity = MergeAffinity(schedulingPolicy.Affinity, affinity)
+		schedulingPolicy.Affinity = mergeAffinity(schedulingPolicy.Affinity, affinity)
 		return nil
 	}
 
@@ -70,7 +74,7 @@ func buildSchedulingPolicy(cluster *appsv1.Cluster, compSpec *appsv1.ClusterComp
 		if err != nil {
 			return err
 		}
-		intctrlutil.MergeList(&schedulingPolicy.Tolerations, &tolerations, makeCmp[corev1.Toleration]())
+		intctrlutil.MergeList(&tolerations, &schedulingPolicy.Tolerations, makeCmp[corev1.Toleration]())
 		return nil
 	}
 
@@ -83,25 +87,31 @@ func buildSchedulingPolicy(cluster *appsv1.Cluster, compSpec *appsv1.ClusterComp
 	return schedulingPolicy, nil
 }
 
-// buildClusterWideAffinity builds data plane affinity from global config
+func hasClusterAffinityOrTolerations() bool {
+	return viper.GetString(constant.CfgKeyDataPlaneAffinity) != "" ||
+		viper.GetString(constant.CfgKeyDataPlaneTolerations) != ""
+}
+
 func buildClusterWideAffinity() (*corev1.Affinity, error) {
+	val := viper.GetString(constant.CfgKeyDataPlaneAffinity)
+	if val == "" {
+		return nil, nil
+	}
 	affinity := new(corev1.Affinity)
-	if val := viper.GetString(constant.CfgKeyDataPlaneAffinity); val != "" {
-		if err := json.Unmarshal([]byte(val), &affinity); err != nil {
-			return nil, err
-		}
+	if err := json.Unmarshal([]byte(val), &affinity); err != nil {
+		return nil, err
 	}
 	return affinity, nil
 }
 
-// buildClusterWideTolerations builds data plane tolerations from global config
 func buildClusterWideTolerations() ([]corev1.Toleration, error) {
-	// build data plane tolerations from config
+	val := viper.GetString(constant.CfgKeyDataPlaneTolerations)
+	if val == "" {
+		return nil, nil
+	}
 	var tolerations []corev1.Toleration
-	if val := viper.GetString(constant.CfgKeyDataPlaneTolerations); val != "" {
-		if err := json.Unmarshal([]byte(val), &tolerations); err != nil {
-			return nil, err
-		}
+	if err := json.Unmarshal([]byte(val), &tolerations); err != nil {
+		return nil, err
 	}
 	return tolerations, nil
 }
@@ -114,9 +124,7 @@ func makeCmp[E any]() func(E) func(E) bool {
 	}
 }
 
-// MergeAffinity merges src to dst, return value is deepcopied
-// Items in src will overwrite items in dst, if possible.
-func MergeAffinity(src, dst *corev1.Affinity) *corev1.Affinity {
+func mergeAffinity(src, dst *corev1.Affinity) *corev1.Affinity {
 	if src == nil {
 		return dst.DeepCopy()
 	}
@@ -127,7 +135,7 @@ func MergeAffinity(src, dst *corev1.Affinity) *corev1.Affinity {
 
 	rtn := dst.DeepCopy()
 
-	// Merge PodAffinity
+	// merge PodAffinity
 	if src.PodAffinity != nil {
 		if rtn.PodAffinity == nil {
 			rtn.PodAffinity = &corev1.PodAffinity{}
@@ -136,7 +144,7 @@ func MergeAffinity(src, dst *corev1.Affinity) *corev1.Affinity {
 		intctrlutil.MergeList(&src.PodAffinity.PreferredDuringSchedulingIgnoredDuringExecution, &rtn.PodAffinity.PreferredDuringSchedulingIgnoredDuringExecution, makeCmp[corev1.WeightedPodAffinityTerm]())
 	}
 
-	// Merge PodAntiAffinity
+	// merge PodAntiAffinity
 	if src.PodAntiAffinity != nil {
 		if rtn.PodAntiAffinity == nil {
 			rtn.PodAntiAffinity = &corev1.PodAntiAffinity{}
@@ -145,7 +153,7 @@ func MergeAffinity(src, dst *corev1.Affinity) *corev1.Affinity {
 		intctrlutil.MergeList(&src.PodAntiAffinity.PreferredDuringSchedulingIgnoredDuringExecution, &rtn.PodAntiAffinity.PreferredDuringSchedulingIgnoredDuringExecution, makeCmp[corev1.WeightedPodAffinityTerm]())
 	}
 
-	// Merge NodeAffinity
+	// merge NodeAffinity
 	if src.NodeAffinity != nil {
 		if rtn.NodeAffinity == nil {
 			rtn.NodeAffinity = &corev1.NodeAffinity{}

pkg/controller/scheduling/scheduling_utils_test.go

@@ -22,13 +22,14 @@ package scheduling
 import (
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
+
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
 	appsv1 "github.com/apecloud/kubeblocks/apis/apps/v1"
 )
 
-var _ = Describe("Scheduling util test", func() {
+var _ = Describe("scheduling util test", func() {
 	Context("mergeAffinity", func() {
 		It("merge all configs", func() {
 			affinity1 := &corev1.Affinity{
@@ -189,7 +190,7 @@ var _ = Describe("Scheduling util test", func() {
 				},
 			}
 
-			rtn := MergeAffinity(affinity1, affinity2)
+			rtn := mergeAffinity(affinity1, affinity2)
 
 			expectMergedAffinity := &corev1.Affinity{
 				NodeAffinity: &corev1.NodeAffinity{
@@ -362,7 +363,7 @@ var _ = Describe("Scheduling util test", func() {
 				},
 			}
 
-			rtn := MergeAffinity(affinity1, affinity2)
+			rtn := mergeAffinity(affinity1, affinity2)
 
 			expectMergedAffinity := &corev1.Affinity{
 				NodeAffinity: &corev1.NodeAffinity{
@@ -501,7 +502,7 @@ var _ = Describe("Scheduling util test", func() {
 			}
 			var affinity2 *corev1.Affinity = nil
 
-			rtn := MergeAffinity(affinity1, affinity2)
+			rtn := mergeAffinity(affinity1, affinity2)
 
 			expectMergedAffinity := &corev1.Affinity{
 				NodeAffinity: &corev1.NodeAffinity{