Merge pull request #264 from wangyizhi1/main

fix: the pod with a custom scheduler cannot be started
kosmos-io · Nov 20, 2023 · 79d4c65 · 79d4c65
2 parents e61b8f2 + 3162b0d
commit 79d4c65
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/pkg/clustertree/cluster-manager/controllers/common_controller.go b/pkg/clustertree/cluster-manager/controllers/common_controller.go
@@ -30,7 +30,7 @@ var SYNC_GVRS = []schema.GroupVersionResource{utils.GVR_CONFIGMAP, utils.GVR_SEC
 var SYNC_OBJS = []client.Object{&corev1.ConfigMap{}, &corev1.Secret{}}
 
 const SYNC_KIND_CONFIGMAP = "ConfigMap"
-const SYNC_KIND_SECRET = "SECRET"
+const SYNC_KIND_SECRET = "Secret"
 
 type SyncResourcesReconciler struct {
 	GroupVersionResource schema.GroupVersionResource

diff --git a/pkg/utils/constants.go b/pkg/utils/constants.go
@@ -14,6 +14,7 @@ const (
 	DefaultWaitTime            = 120
 	RootClusterAnnotationKey   = "kosmos.io/cluster-role"
 	RootClusterAnnotationValue = "root"
+	KosmosSchedulerName        = "kosmos-scheduler"
 )
 
 const (

diff --git a/pkg/utils/podutils/pod.go b/pkg/utils/podutils/pod.go
@@ -166,7 +166,9 @@ func FitPod(pod *corev1.Pod, ignoreLabels []string, cleanNodeName bool) *corev1.
 	podCopy.Spec.Volumes = vols
 	podCopy.Status = corev1.PodStatus{}
 
-	podCopy.Spec.SchedulerName = ""
+	if podCopy.Spec.SchedulerName == utils.KosmosSchedulerName {
+		podCopy.Spec.SchedulerName = ""
+	}
 
 	if cleanNodeName {
 		podCopy.Spec.NodeName = ""