Skip to content

Commit

Permalink
remove duplicate code of add task spec annotation
Browse files Browse the repository at this point in the history
Signed-off-by: lowang-bh <lhui_wang@163.com>
  • Loading branch information
lowang-bh committed Jun 23, 2023
1 parent 7383114 commit 28c9e49
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 9 deletions.
6 changes: 0 additions & 6 deletions pkg/controller.v1/mpi/mpijob_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down Expand Up @@ -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
Expand Down
3 changes: 0 additions & 3 deletions pkg/controller.v1/tensorflow/tfjob_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 28c9e49

Please sign in to comment.