Skip to content

Commit 1cc5b19

Browse files
openshift-merge-robotopenshift-merge-robot
authored
Merge pull request #2059 from timflannagan/remove-duplicate-apierrors-package
test/e2e: Remove duplicate package imports
2 parents 591aace + 0e74517 commit 1cc5b19

File tree

4 files changed

+322
-326
lines changed

4 files changed

+322
-326
lines changed

‎test/e2e/csv_e2e_test.go

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import (
1515
"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions"
1616
apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
1717
"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
18-
"k8s.io/apimachinery/pkg/api/errors"
1918
k8serrors "k8s.io/apimachinery/pkg/api/errors"
2019
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2120
"k8s.io/apimachinery/pkg/runtime"
@@ -3695,7 +3694,7 @@ func waitForDeploymentToDelete(c operatorclient.ClientInterface, name string) er
36953694
Eventually(func() (bool, error) {
36963695
ctx.Ctx().Logf("waiting for deployment %s to delete", name)
36973696
_, err := c.GetDeployment(testNamespace, name)
3698-
if errors.IsNotFound(err) {
3697+
if k8serrors.IsNotFound(err) {
36993698
ctx.Ctx().Logf("deleted %s", name)
37003699
return true, nil
37013700
}
@@ -3711,7 +3710,7 @@ func waitForDeploymentToDelete(c operatorclient.ClientInterface, name string) er
37113710
func csvExists(c versioned.Interface, name string) bool {
37123711

37133712
fetched, err := c.OperatorsV1alpha1().ClusterServiceVersions(testNamespace).Get(context.TODO(), name, metav1.GetOptions{})
3714-
if errors.IsNotFound(err) {
3713+
if k8serrors.IsNotFound(err) {
37153714
return false
37163715
}
37173716
ctx.Ctx().Logf("%s (%s): %s", fetched.Status.Phase, fetched.Status.Reason, fetched.Status.Message)
@@ -3773,7 +3772,7 @@ func createLegacyAPIResources(csv *v1alpha1.ClusterServiceVersion, desc v1alpha1
37733772
}
37743773

37753774
_, err = c.CreateSecret(&secret)
3776-
if err != nil && !errors.IsAlreadyExists(err) {
3775+
if err != nil && !k8serrors.IsAlreadyExists(err) {
37773776
Expect(err).ShouldNot(HaveOccurred())
37783777
}
37793778

@@ -3838,25 +3837,25 @@ func checkLegacyAPIResources(desc v1alpha1.APIServiceDescription, expectedIsNotF
38383837

38393838
// Attempt to create the legacy service
38403839
_, err := c.GetService(testNamespace, strings.Replace(apiServiceName, ".", "-", -1))
3841-
Expect(errors.IsNotFound(err)).Should(Equal(expectedIsNotFound))
3840+
Expect(k8serrors.IsNotFound(err)).Should(Equal(expectedIsNotFound))
38423841

38433842
// Attempt to create the legacy secret
38443843
_, err = c.GetSecret(testNamespace, apiServiceName+"-cert")
3845-
Expect(errors.IsNotFound(err)).Should(Equal(expectedIsNotFound))
3844+
Expect(k8serrors.IsNotFound(err)).Should(Equal(expectedIsNotFound))
38463845

38473846
// Attempt to create the legacy secret role
38483847
_, err = c.GetRole(testNamespace, apiServiceName+"-cert")
3849-
Expect(errors.IsNotFound(err)).Should(Equal(expectedIsNotFound))
3848+
Expect(k8serrors.IsNotFound(err)).Should(Equal(expectedIsNotFound))
38503849

38513850
// Attempt to create the legacy secret role binding
38523851
_, err = c.GetRoleBinding(testNamespace, apiServiceName+"-cert")
3853-
Expect(errors.IsNotFound(err)).Should(Equal(expectedIsNotFound))
3852+
Expect(k8serrors.IsNotFound(err)).Should(Equal(expectedIsNotFound))
38543853

38553854
// Attempt to create the legacy authDelegatorClusterRoleBinding
38563855
_, err = c.GetClusterRoleBinding(apiServiceName + "-system:auth-delegator")
3857-
Expect(errors.IsNotFound(err)).Should(Equal(expectedIsNotFound))
3856+
Expect(k8serrors.IsNotFound(err)).Should(Equal(expectedIsNotFound))
38583857

38593858
// Attempt to create the legacy authReadingRoleBinding
38603859
_, err = c.GetRoleBinding("kube-system", apiServiceName+"-auth-reader")
3861-
Expect(errors.IsNotFound(err)).Should(Equal(expectedIsNotFound))
3860+
Expect(k8serrors.IsNotFound(err)).Should(Equal(expectedIsNotFound))
38623861
}

‎test/e2e/operator_groups_e2e_test.go

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import (
1414
corev1 "k8s.io/api/core/v1"
1515
rbacv1 "k8s.io/api/rbac/v1"
1616
"k8s.io/apiextensions-apiserver/pkg/apis/apiextensions"
17-
"k8s.io/apimachinery/pkg/api/errors"
1817
k8serrors "k8s.io/apimachinery/pkg/api/errors"
1918
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2019
"k8s.io/apimachinery/pkg/labels"
@@ -219,7 +218,7 @@ var _ = Describe("Operator Group", func() {
219218
err = wait.Poll(pollInterval, pollDuration, func() (bool, error) {
220219
fetchedCSV, fetchErr := crc.OperatorsV1alpha1().ClusterServiceVersions(opGroupNamespace).Get(context.TODO(), csvName, metav1.GetOptions{})
221220
if fetchErr != nil {
222-
if errors.IsNotFound(fetchErr) {
221+
if k8serrors.IsNotFound(fetchErr) {
223222
return false, nil
224223
}
225224
log(fmt.Sprintf("Error (in %v): %v", testNamespace, fetchErr.Error()))
@@ -236,7 +235,7 @@ var _ = Describe("Operator Group", func() {
236235
err = wait.Poll(pollInterval, pollDuration, func() (bool, error) {
237236
fetchedCSV, fetchErr := crc.OperatorsV1alpha1().ClusterServiceVersions(otherNamespaceName).Get(context.TODO(), csvName, metav1.GetOptions{})
238237
if fetchErr != nil {
239-
if errors.IsNotFound(fetchErr) {
238+
if k8serrors.IsNotFound(fetchErr) {
240239
return false, nil
241240
}
242241
log(fmt.Sprintf("Error (in %v): %v", otherNamespaceName, fetchErr.Error()))
@@ -253,7 +252,7 @@ var _ = Describe("Operator Group", func() {
253252
err = wait.Poll(pollInterval, pollDuration, func() (bool, error) {
254253
fetchedCSV, fetchErr := crc.OperatorsV1alpha1().ClusterServiceVersions(otherNamespaceName).Get(context.TODO(), csvName, metav1.GetOptions{})
255254
if fetchErr != nil {
256-
if errors.IsNotFound(fetchErr) {
255+
if k8serrors.IsNotFound(fetchErr) {
257256
return false, nil
258257
}
259258
GinkgoT().Logf("Error (in %v): %v", otherNamespaceName, fetchErr.Error())
@@ -270,7 +269,7 @@ var _ = Describe("Operator Group", func() {
270269
err = wait.Poll(pollInterval, pollDuration, func() (bool, error) {
271270
createdDeployment, err := c.GetDeployment(opGroupNamespace, deploymentName)
272271
if err != nil {
273-
if errors.IsNotFound(err) {
272+
if k8serrors.IsNotFound(err) {
274273
return false, nil
275274
}
276275
return false, err
@@ -389,7 +388,7 @@ var _ = Describe("Operator Group", func() {
389388
}
390389
return true, err
391390
})
392-
require.True(GinkgoT(), errors.IsNotFound(err))
391+
require.True(GinkgoT(), k8serrors.IsNotFound(err))
393392

394393
err = wait.Poll(pollInterval, pollDuration, func() (bool, error) {
395394
_, err := c.KubernetesInterface().RbacV1().ClusterRoles().Get(context.TODO(), operatorGroup.Name+"-edit", metav1.GetOptions{})
@@ -398,7 +397,7 @@ var _ = Describe("Operator Group", func() {
398397
}
399398
return true, err
400399
})
401-
require.True(GinkgoT(), errors.IsNotFound(err))
400+
require.True(GinkgoT(), k8serrors.IsNotFound(err))
402401

403402
err = wait.Poll(pollInterval, pollDuration, func() (bool, error) {
404403
_, err := c.KubernetesInterface().RbacV1().ClusterRoles().Get(context.TODO(), operatorGroup.Name+"-view", metav1.GetOptions{})
@@ -407,7 +406,7 @@ var _ = Describe("Operator Group", func() {
407406
}
408407
return true, err
409408
})
410-
require.True(GinkgoT(), errors.IsNotFound(err))
409+
require.True(GinkgoT(), k8serrors.IsNotFound(err))
411410
})
412411
It("role aggregation", func() {
413412

@@ -1487,7 +1486,7 @@ var _ = Describe("Operator Group", func() {
14871486
err = wait.Poll(pollInterval, pollDuration, func() (bool, error) {
14881487
fetchedCSV, fetchErr := crc.OperatorsV1alpha1().ClusterServiceVersions(opGroupNamespace).Get(context.TODO(), csvName, metav1.GetOptions{})
14891488
if fetchErr != nil {
1490-
if errors.IsNotFound(fetchErr) {
1489+
if k8serrors.IsNotFound(fetchErr) {
14911490
return false, nil
14921491
}
14931492
GinkgoT().Logf("Error (in %v): %v", testNamespace, fetchErr.Error())
@@ -1520,7 +1519,7 @@ var _ = Describe("Operator Group", func() {
15201519
err = wait.Poll(pollInterval, pollDuration, func() (bool, error) {
15211520
fetchedCSV, fetchErr := crc.OperatorsV1alpha1().ClusterServiceVersions(otherNamespaceName).Get(context.TODO(), csvName, metav1.GetOptions{})
15221521
if fetchErr != nil {
1523-
if errors.IsNotFound(fetchErr) {
1522+
if k8serrors.IsNotFound(fetchErr) {
15241523
return false, nil
15251524
}
15261525
GinkgoT().Logf("Error (in %v): %v", otherNamespaceName, fetchErr.Error())
@@ -1551,7 +1550,7 @@ var _ = Describe("Operator Group", func() {
15511550
err = wait.Poll(pollInterval, 2*pollDuration, func() (bool, error) {
15521551
_, fetchErr := crc.OperatorsV1alpha1().ClusterServiceVersions(otherNamespaceName).Get(context.TODO(), csvName, metav1.GetOptions{})
15531552
if fetchErr != nil {
1554-
if errors.IsNotFound(fetchErr) {
1553+
if k8serrors.IsNotFound(fetchErr) {
15551554
return true, nil
15561555
}
15571556
GinkgoT().Logf("Error (in %v): %v", opGroupNamespace, fetchErr.Error())
@@ -1967,7 +1966,7 @@ var _ = Describe("Operator Group", func() {
19671966
err = wait.Poll(pollInterval, pollDuration, func() (bool, error) {
19681967
fetchedCSV, fetchErr := crc.OperatorsV1alpha1().ClusterServiceVersions(opGroupNamespace).Get(context.TODO(), csvName, metav1.GetOptions{})
19691968
if fetchErr != nil {
1970-
if errors.IsNotFound(fetchErr) {
1969+
if k8serrors.IsNotFound(fetchErr) {
19711970
return false, nil
19721971
}
19731972
GinkgoT().Logf("Error (in %v): %v", testNamespace, fetchErr.Error())
@@ -2000,7 +1999,7 @@ var _ = Describe("Operator Group", func() {
20001999
err = wait.Poll(pollInterval, pollDuration, func() (bool, error) {
20012000
fetchedCSV, fetchErr := crc.OperatorsV1alpha1().ClusterServiceVersions(otherNamespaceName).Get(context.TODO(), csvName, metav1.GetOptions{})
20022001
if fetchErr != nil {
2003-
if errors.IsNotFound(fetchErr) {
2002+
if k8serrors.IsNotFound(fetchErr) {
20042003
return false, nil
20052004
}
20062005
GinkgoT().Logf("Error (in %v): %v", otherNamespaceName, fetchErr.Error())
@@ -2027,7 +2026,7 @@ var _ = Describe("Operator Group", func() {
20272026
err = wait.Poll(pollInterval, 2*pollDuration, func() (bool, error) {
20282027
csv, fetchErr := crc.OperatorsV1alpha1().ClusterServiceVersions(otherNamespaceName).Get(context.TODO(), csvName, metav1.GetOptions{})
20292028
if fetchErr != nil {
2030-
if errors.IsNotFound(fetchErr) {
2029+
if k8serrors.IsNotFound(fetchErr) {
20312030
return true, nil
20322031
}
20332032
GinkgoT().Logf("Error (in %v): %v", opGroupNamespace, fetchErr.Error())

0 commit comments

Comments
 (0)