diff --git a/pkg/controllers/garbagecollector/garbagecollector.go b/pkg/controllers/garbagecollector/garbagecollector.go index be0a6b7e69..a6fcb5b392 100644 --- a/pkg/controllers/garbagecollector/garbagecollector.go +++ b/pkg/controllers/garbagecollector/garbagecollector.go @@ -21,7 +21,6 @@ import ( "fmt" "time" - "k8s.io/apimachinery/pkg/api/errors" apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/util/wait" @@ -196,7 +195,7 @@ func (gc *gccontroller) processJob(key string) error { klog.V(4).Infof("Checking if Job %s/%s is ready for cleanup", namespace, name) // Ignore the Jobs that are already deleted or being deleted, or the ones that don't need clean up. job, err := gc.jobLister.Jobs(namespace).Get(name) - if errors.IsNotFound(err) { + if apierrors.IsNotFound(err) { return nil } if err != nil { @@ -214,7 +213,7 @@ func (gc *gccontroller) processJob(key string) error { // If TTL is modified before we do this check, we cannot be sure if the TTL truly expires. // The latest Job may have a different UID, but it's fine because the checks will be run again. fresh, err := gc.vcClient.BatchV1alpha1().Jobs(namespace).Get(context.TODO(), name, metav1.GetOptions{}) - if errors.IsNotFound(err) { + if apierrors.IsNotFound(err) { return nil } if err != nil { diff --git a/pkg/controllers/job/job_controller_actions.go b/pkg/controllers/job/job_controller_actions.go index 0e45b045d8..d646310083 100644 --- a/pkg/controllers/job/job_controller_actions.go +++ b/pkg/controllers/job/job_controller_actions.go @@ -26,7 +26,6 @@ import ( v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/equality" - "k8s.io/apimachinery/pkg/api/errors" apierrors "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/klog/v2" @@ -137,7 +136,7 @@ func (cc *jobcontroller) killJob(jobInfo *apis.JobInfo, podRetainPhase state.Pha // Update Job status newJob, err := cc.vcClient.BatchV1alpha1().Jobs(job.Namespace).UpdateStatus(context.TODO(), job, metav1.UpdateOptions{}) - if errors.IsNotFound(err) { + if apierrors.IsNotFound(err) { klog.Errorf("Job %v/%v was not found", job.Namespace, job.Name) return nil } diff --git a/pkg/controllers/job/job_controller_util_test.go b/pkg/controllers/job/job_controller_util_test.go index 80e8afc472..25f6b1d20f 100644 --- a/pkg/controllers/job/job_controller_util_test.go +++ b/pkg/controllers/job/job_controller_util_test.go @@ -25,7 +25,6 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "volcano.sh/apis/pkg/apis/batch/v1alpha1" - batch "volcano.sh/apis/pkg/apis/batch/v1alpha1" busv1alpha1 "volcano.sh/apis/pkg/apis/bus/v1alpha1" "volcano.sh/volcano/pkg/controllers/apis" ) @@ -1027,10 +1026,10 @@ func TestTaskPriority_CalcPGMin(t *testing.T) { func TestCalcPGMinResources(t *testing.T) { jc := newFakeController() - job := &batch.Job{ + job := &v1alpha1.Job{ TypeMeta: metav1.TypeMeta{}, - Spec: batch.JobSpec{ - Tasks: []batch.TaskSpec{ + Spec: v1alpha1.JobSpec{ + Tasks: []v1alpha1.TaskSpec{ master, worker, }, }, diff --git a/pkg/controllers/jobflow/jobflow_controller.go b/pkg/controllers/jobflow/jobflow_controller.go index 77512cb48a..dbff48fdcd 100755 --- a/pkg/controllers/jobflow/jobflow_controller.go +++ b/pkg/controllers/jobflow/jobflow_controller.go @@ -39,7 +39,6 @@ import ( flowlister "volcano.sh/apis/pkg/client/listers/flow/v1alpha1" "volcano.sh/volcano/pkg/controllers/apis" "volcano.sh/volcano/pkg/controllers/framework" - "volcano.sh/volcano/pkg/controllers/jobflow/state" jobflowstate "volcano.sh/volcano/pkg/controllers/jobflow/state" ) @@ -129,7 +128,7 @@ func (jf *jobflowcontroller) Initialize(opt *framework.ControllerOption) error { jf.syncHandler = jf.handleJobFlow - state.SyncJobFlow = jf.syncJobFlow + jobflowstate.SyncJobFlow = jf.syncJobFlow return nil }