From 28c9e49c61a3dbc4b4659e0eef9da9eb4d7f8961 Mon Sep 17 00:00:00 2001 From: lowang-bh Date: Fri, 23 Jun 2023 13:24:14 +0800 Subject: [PATCH] remove duplicate code of add task spec annotation Signed-off-by: lowang-bh --- pkg/controller.v1/mpi/mpijob_controller.go | 6 ------ pkg/controller.v1/tensorflow/tfjob_controller.go | 3 --- 2 files changed, 9 deletions(-) diff --git a/pkg/controller.v1/mpi/mpijob_controller.go b/pkg/controller.v1/mpi/mpijob_controller.go index 6108c644ec..b3af1baeb9 100644 --- a/pkg/controller.v1/mpi/mpijob_controller.go +++ b/pkg/controller.v1/mpi/mpijob_controller.go @@ -1024,9 +1024,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{ @@ -1076,9 +1073,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 index 78565ed2a0..03f4a71c3d 100644 --- a/pkg/controller.v1/tensorflow/tfjob_controller.go +++ b/pkg/controller.v1/tensorflow/tfjob_controller.go @@ -900,9 +900,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)