remove duplicate code of add task spec annotation (#1839)

Signed-off-by: lowang-bh <lhui_wang@163.com>
kubeflow · Jun 25, 2023 · af8a77d · af8a77d
1 parent 9ffcd36
commit af8a77d
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 15 deletions.
diff --git a/pkg/controller.v1/mpi/mpijob.go b/pkg/controller.v1/mpi/mpijob.go
@@ -73,9 +73,6 @@ const (
 	// podTemplateSchedulerNameReason is the warning reason when other scheduler name is set
 	// in pod templates with gang-scheduling enabled
 	podTemplateSchedulerNameReason = "SettedPodTemplateSchedulerName"
-
-	// volcanoTaskSpecKey task spec key used in pod annotation when EnableGangScheduling is true
-	volcanoTaskSpecKey = "volcano.sh/task-spec"
 )
 
 const (

diff --git a/pkg/controller.v1/mpi/mpijob_controller.go b/pkg/controller.v1/mpi/mpijob_controller.go
@@ -998,9 +998,6 @@ func (jc *MPIJobReconciler) newWorker(mpiJob *kubeflowv1.MPIJob, name string) *c
 
 		rtWorker := strings.ToLower(string(kubeflowv1.MPIJobReplicaTypeWorker))
 		jc.PodGroupControl.DecoratePodTemplateSpec(podSpec, mpiJob, rtWorker)
-		if jc.PodGroupControl.GetSchedulerName() == "volcano" {
-			podSpec.Annotations[volcanoTaskSpecKey] = rtWorker
-		}
 	}
 
 	return &corev1.Pod{
@@ -1050,9 +1047,6 @@ func (jc *MPIJobReconciler) newLauncher(mpiJob *kubeflowv1.MPIJob, kubectlDelive
 
 		rt := strings.ToLower(string(kubeflowv1.MPIJobReplicaTypeLauncher))
 		jc.PodGroupControl.DecoratePodTemplateSpec(podSpec, mpiJob, rt)
-		if jc.PodGroupControl.GetSchedulerName() == "volcano" {
-			podSpec.Annotations[volcanoTaskSpecKey] = rt
-		}
 	}
 
 	podSpec.Spec.ServiceAccountName = launcherName

diff --git a/pkg/controller.v1/tensorflow/tfjob_controller.go b/pkg/controller.v1/tensorflow/tfjob_controller.go
@@ -72,9 +72,6 @@ const (
 
 	controllerName = "tfjob-controller"
 
-	// volcanoTaskSpecKey task spec key used in pod annotation when EnableGangScheduling is true
-	volcanoTaskSpecKey = "volcano.sh/task-spec"
-
 	// tfConfig is the environment variable name of TensorFlow cluster spec.
 	tfConfig = "TF_CONFIG"
 	// exitedWithCodeReason is the normal reason when the pod is exited because of the exit code.
@@ -877,9 +874,6 @@ func (r *TFJobReconciler) createNewPod(tfjob *kubeflowv1.TFJob, rt, index string
 		}
 
 		r.PodGroupControl.DecoratePodTemplateSpec(podTemplate, tfjob, rt)
-		if gangSchedulerName == "volcano" {
-			podTemplate.Annotations[volcanoTaskSpecKey] = rt
-		}
 	}
 
 	err = r.PodControl.CreatePodsWithControllerRef(tfjob.Namespace, podTemplate, tfjob, controllerRef)