chore: pkg import only once (#1950)

Signed-off-by: guoguangwu <guoguangwu@magic-shield.com>
kubeflow · Nov 23, 2023 · b199882 · b199882
1 parent e2d6ba4
commit b199882
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/pkg/controller.v1/common/job.go b/pkg/controller.v1/common/job.go
@@ -30,7 +30,6 @@ import (
 
 	log "github.com/sirupsen/logrus"
 	corev1 "k8s.io/api/core/v1"
-	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
@@ -253,7 +252,7 @@ func (jc *JobController) ReconcileJobs(
 			queue := ""
 			priorityClass := ""
 			var schedulerTimeout *int32
-			var minResources *v1.ResourceList
+			var minResources *corev1.ResourceList
 
 			if runPolicy.SchedulingPolicy != nil {
 				if minAvailable := runPolicy.SchedulingPolicy.MinAvailable; minAvailable != nil {
@@ -266,7 +265,7 @@ func (jc *JobController) ReconcileJobs(
 					priorityClass = pc
 				}
 				if mr := runPolicy.SchedulingPolicy.MinResources; mr != nil {
-					minResources = (*v1.ResourceList)(mr)
+					minResources = (*corev1.ResourceList)(mr)
 				}
 				if timeout := runPolicy.SchedulingPolicy.ScheduleTimeoutSeconds; timeout != nil {
 					schedulerTimeout = timeout
@@ -364,7 +363,7 @@ func (jc *JobController) CleanUpResources(
 	runtimeObject runtime.Object,
 	metaObject metav1.Object,
 	jobStatus apiv1.JobStatus,
-	pods []*v1.Pod,
+	pods []*corev1.Pod,
 ) error {
 	if err := jc.DeletePodsAndServices(runtimeObject, runPolicy, jobStatus, pods); err != nil {
 		return err
@@ -448,6 +447,6 @@ func (jc *JobController) CleanupJob(runPolicy *apiv1.RunPolicy, jobStatus apiv1.
 	}
 }
 
-func (jc *JobController) calcPGMinResources(minMember int32, replicas map[apiv1.ReplicaType]*apiv1.ReplicaSpec) *v1.ResourceList {
+func (jc *JobController) calcPGMinResources(minMember int32, replicas map[apiv1.ReplicaType]*apiv1.ReplicaSpec) *corev1.ResourceList {
 	return CalcPGMinResources(minMember, replicas, jc.PriorityClassLister.Get)
 }
diff --git a/pkg/controller.v1/common/service_test.go b/pkg/controller.v1/common/service_test.go
@@ -8,7 +8,6 @@ import (
 	apiv1 "github.com/kubeflow/training-operator/pkg/apis/kubeflow.org/v1"
 	"github.com/stretchr/testify/assert"
 	corev1 "k8s.io/api/core/v1"
-	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
@@ -71,7 +70,7 @@ func TestCalculateServiceSliceSize(t *testing.T) {
 }
 
 func TestFilterServicesForReplicaType(t *testing.T) {
-	services := []*v1.Service{
+	services := []*corev1.Service{
 		{
 			ObjectMeta: metav1.ObjectMeta{
 				Name:   "a",
@@ -110,6 +109,6 @@ func TestFilterServicesForReplicaType(t *testing.T) {
 	if err != nil {
 		t.Fatalf("FilterPodsForReplicaType returned error: %v", err)
 	}
-	want := []*v1.Service{services[0], services[2], services[4]}
+	want := []*corev1.Service{services[0], services[2], services[4]}
 	assert.Equal(t, want, got)
 }