Remarks

kubernetes-sigs · Mar 3, 2023 · 4dc53e4 · 4dc53e4
1 parent 015e75f
commit 4dc53e4
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/pkg/controller/workload/mpijob/mpijob_controller.go b/pkg/controller/workload/mpijob/mpijob_controller.go
@@ -484,6 +484,9 @@ func ConstructWorkloadFor(ctx context.Context, client client.Client,
 //  1. .spec.runPolicy.schedulingPolicy.priorityClass
 //  2. .spec.mpiReplicaSecs[Launcher].template.spec.priorityClassName
 //  3. .spec.mpiReplicaSecs[Worker].template.spec.priorityClassName
+//
+// This function is inspired by an analogous one in mpi-controller:
+// https://github.com/kubeflow/mpi-operator/blob/5946ef4157599a474ab82ff80e780d5c2546c9ee/pkg/controller/podgroup.go#L69-L72
 func calcPriorityClassName(job *kubeflow.MPIJob) string {
 	if job.Spec.RunPolicy.SchedulingPolicy != nil && len(job.Spec.RunPolicy.SchedulingPolicy.PriorityClass) != 0 {
 		return job.Spec.RunPolicy.SchedulingPolicy.PriorityClass

diff --git a/pkg/controller/workload/mpijob/mpijob_webhook.go b/pkg/controller/workload/mpijob/mpijob_webhook.go
@@ -90,7 +90,7 @@ func (w *MPIJobWebhook) ValidateCreate(ctx context.Context, obj runtime.Object)
 func validateCreate(job *kubeflow.MPIJob) field.ErrorList {
 	klog.InfoS("validateCreate invoked", "mpijob", job.Name)
 	var allErrs field.ErrorList
-	for _, crdNameAnnotation := range []string{constants.ParentWorkloadAnnotation, constants.QueueAnnotation} {
+	for _, crdNameAnnotation := range []string{constants.QueueAnnotation} {
 		if value, exists := job.Annotations[crdNameAnnotation]; exists {
 			if errs := validation.IsDNS1123Subdomain(value); len(errs) > 0 {
 				allErrs = append(allErrs, field.Invalid(annotationsPath.Key(crdNameAnnotation), value, strings.Join(errs, ",")))

diff --git a/test/integration/controller/job/job_controller_test.go b/test/integration/controller/job/job_controller_test.go
@@ -50,11 +50,10 @@ const (
 )
 
 var (
-	wlLookupKey = types.NamespacedName{Name: workloadjob.GetWorkloadNameForJob(jobName), Namespace: jobNamespace}
+	wlLookupKey               = types.NamespacedName{Name: workloadjob.GetWorkloadNameForJob(jobName), Namespace: jobNamespace}
+	ignoreConditionTimestamps = cmpopts.IgnoreFields(metav1.Condition{}, "LastTransitionTime")
 )
 
-var ignoreConditionTimestamps = cmpopts.IgnoreFields(metav1.Condition{}, "LastTransitionTime")
-
 // +kubebuilder:docs-gen:collapse=Imports
 
 var _ = ginkgo.Describe("Job controller", func() {

diff --git a/test/integration/controller/mpijob/mpijob_controller_test.go b/test/integration/controller/mpijob/mpijob_controller_test.go
@@ -47,10 +47,9 @@ const (
 	priorityValue     = 10
 )
 
-var ignoreConditionTimestamps = cmpopts.IgnoreFields(metav1.Condition{}, "LastTransitionTime")
-
 var (
-	wlLookupKey = types.NamespacedName{Name: workloadmpijob.GetWorkloadNameForMPIJob(jobName), Namespace: jobNamespace}
+	wlLookupKey               = types.NamespacedName{Name: workloadmpijob.GetWorkloadNameForMPIJob(jobName), Namespace: jobNamespace}
+	ignoreConditionTimestamps = cmpopts.IgnoreFields(metav1.Condition{}, "LastTransitionTime")
 )
 
 // +kubebuilder:docs-gen:collapse=Imports