Merge pull request #1501 from beautytiger/cleanup/duplicate_import

openshift-merge-robot · web-flow · commit 31ba47b7c896 · 2020-06-03T09:41:36.000+02:00
cleanup: delete duplicated import in olm
diff --git a/cmd/olm/cleanup.go b/cmd/olm/cleanup.go
@@ -6,7 +6,6 @@ import (
 
 	"github.com/sirupsen/logrus"
 	rbacv1 "k8s.io/api/rbac/v1"
-	"k8s.io/apimachinery/pkg/api/errors"
 	k8serrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
@@ -66,15 +65,15 @@ func cleanup(logger *logrus.Logger, c operatorclient.ClientInterface, crc versio
 }
 
 func waitForDelete(checkResource checkResourceFunc, deleteResource deleteResourceFunc) error {
-	if err := checkResource(); err != nil && errors.IsNotFound(err) {
+	if err := checkResource(); err != nil && k8serrors.IsNotFound(err) {
 		return nil
 	}
 	if err := deleteResource(); err != nil {
 		return err
 	}
 	err := wait.Poll(pollInterval, pollDuration, func() (bool, error) {
 		err := checkResource()
-		if errors.IsNotFound(err) {
+		if k8serrors.IsNotFound(err) {
 			return true, nil
 		}
 		if err != nil {

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@ import (`
`6`	`6`
`7`	`7`	`"github.com/sirupsen/logrus"`
`8`	`8`	`rbacv1 "k8s.io/api/rbac/v1"`
`9`		`- "k8s.io/apimachinery/pkg/api/errors"`
`10`	`9`	`k8serrors "k8s.io/apimachinery/pkg/api/errors"`
`11`	`10`	`metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"`
`12`	`11`	`"k8s.io/apimachinery/pkg/types"`
`@@ -66,15 +65,15 @@ func cleanup(logger *logrus.Logger, c operatorclient.ClientInterface, crc versio`
`66`	`65`	`}`
`67`	`66`
`68`	`67`	`func waitForDelete(checkResource checkResourceFunc, deleteResource deleteResourceFunc) error {`
`69`		`- if err := checkResource(); err != nil && errors.IsNotFound(err) {`
	`68`	`+ if err := checkResource(); err != nil && k8serrors.IsNotFound(err) {`
`70`	`69`	`return nil`
`71`	`70`	`}`
`72`	`71`	`if err := deleteResource(); err != nil {`
`73`	`72`	`return err`
`74`	`73`	`}`
`75`	`74`	`err := wait.Poll(pollInterval, pollDuration, func() (bool, error) {`
`76`	`75`	`err := checkResource()`
`77`		`- if errors.IsNotFound(err) {`
	`76`	`+ if k8serrors.IsNotFound(err) {`
`78`	`77`	`return true, nil`
`79`	`78`	`}`
`80`	`79`	`if err != nil {`