From 1b74f28ed8587d8e315911896d9b0da817012c05 Mon Sep 17 00:00:00 2001 From: ialidzhikov Date: Sat, 2 Jan 2021 01:09:22 +0200 Subject: [PATCH] Clean up some redundant imports Signed-off-by: ialidzhikov --- pkg/controller/daemon/daemon_controller.go | 5 ++--- pkg/controller/job/job_controller.go | 5 ++--- pkg/controller/replicaset/replica_set.go | 5 ++--- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/pkg/controller/daemon/daemon_controller.go b/pkg/controller/daemon/daemon_controller.go index a0fc135156e..fdedf17315c 100644 --- a/pkg/controller/daemon/daemon_controller.go +++ b/pkg/controller/daemon/daemon_controller.go @@ -29,7 +29,6 @@ import ( apps "k8s.io/api/apps/v1" v1 "k8s.io/api/core/v1" apiequality "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/apimachinery/pkg/labels" @@ -972,7 +971,7 @@ func (dsc *DaemonSetsController) syncNodes(ds *apps.DaemonSet, podsToDelete, nod ds, metav1.NewControllerRef(ds, controllerKind)) if err != nil { - if errors.HasStatusCause(err, v1.NamespaceTerminatingCause) { + if apierrors.HasStatusCause(err, v1.NamespaceTerminatingCause) { // If the namespace is being torn down, we can safely ignore // this error since all subsequent creations will fail. return @@ -1137,7 +1136,7 @@ func (dsc *DaemonSetsController) syncDaemonSet(key string) error { return err } ds, err := dsc.dsLister.DaemonSets(namespace).Get(name) - if errors.IsNotFound(err) { + if apierrors.IsNotFound(err) { klog.V(3).Infof("daemon set has been deleted %v", key) dsc.expectations.DeleteExpectations(key) return nil diff --git a/pkg/controller/job/job_controller.go b/pkg/controller/job/job_controller.go index 70c7504834b..78be3063dea 100644 --- a/pkg/controller/job/job_controller.go +++ b/pkg/controller/job/job_controller.go @@ -27,7 +27,6 @@ import ( batch "k8s.io/api/batch/v1" "k8s.io/api/core/v1" - "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/labels" @@ -453,7 +452,7 @@ func (jm *Controller) syncJob(key string) (bool, error) { } sharedJob, err := jm.jobLister.Jobs(ns).Get(name) if err != nil { - if errors.IsNotFound(err) { + if apierrors.IsNotFound(err) { klog.V(4).Infof("Job has been deleted: %v", key) jm.expectations.DeleteExpectations(key) return true, nil @@ -778,7 +777,7 @@ func (jm *Controller) manageJob(activePods []*v1.Pod, succeeded int32, job *batc defer wait.Done() err := jm.podControl.CreatePodsWithControllerRef(job.Namespace, &job.Spec.Template, job, metav1.NewControllerRef(job, controllerKind)) if err != nil { - if errors.HasStatusCause(err, v1.NamespaceTerminatingCause) { + if apierrors.HasStatusCause(err, v1.NamespaceTerminatingCause) { // If the namespace is being torn down, we can safely ignore // this error since all subsequent creations will fail. return diff --git a/pkg/controller/replicaset/replica_set.go b/pkg/controller/replicaset/replica_set.go index f52eab6ca92..ac0137581e5 100644 --- a/pkg/controller/replicaset/replica_set.go +++ b/pkg/controller/replicaset/replica_set.go @@ -38,7 +38,6 @@ import ( apps "k8s.io/api/apps/v1" "k8s.io/api/core/v1" - "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/labels" @@ -568,7 +567,7 @@ func (rsc *ReplicaSetController) manageReplicas(filteredPods []*v1.Pod, rs *apps successfulCreations, err := slowStartBatch(diff, controller.SlowStartInitialBatchSize, func() error { err := rsc.podControl.CreatePodsWithControllerRef(rs.Namespace, &rs.Spec.Template, rs, metav1.NewControllerRef(rs, rsc.GroupVersionKind)) if err != nil { - if errors.HasStatusCause(err, v1.NamespaceTerminatingCause) { + if apierrors.HasStatusCause(err, v1.NamespaceTerminatingCause) { // if the namespace is being terminated, we don't have to do // anything because any creation will fail return nil @@ -654,7 +653,7 @@ func (rsc *ReplicaSetController) syncReplicaSet(key string) error { return err } rs, err := rsc.rsLister.ReplicaSets(namespace).Get(name) - if errors.IsNotFound(err) { + if apierrors.IsNotFound(err) { klog.V(4).Infof("%v %v has been deleted", rsc.Kind, key) rsc.expectations.DeleteExpectations(key) return nil