Skip to content

Commit 6596a14

Browse files
danielqsjdanielqsj
committed
add missing alias of api errors under test
1 parent 5bc0e26 commit 6596a14

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+221
-223
lines changed

‎staging/src/k8s.io/apiserver/pkg/registry/generic/registry/store.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -933,7 +933,7 @@ func (e *Store) Delete(ctx context.Context, name string, deleteValidation rest.V
933933
if err == nil && deleteImmediately && preconditions.ResourceVersion != nil {
934934
accessor, err = meta.Accessor(out)
935935
if err != nil {
936-
return out, false, kubeerr.NewInternalError(err)
936+
return out, false, apierrors.NewInternalError(err)
937937
}
938938
resourceVersion := accessor.GetResourceVersion()
939939
preconditions.ResourceVersion = &resourceVersion

‎test/e2e/apimachinery/chunking.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import (
2727
"github.com/onsi/gomega"
2828

2929
v1 "k8s.io/api/core/v1"
30-
"k8s.io/apimachinery/pkg/api/errors"
30+
apierrors "k8s.io/apimachinery/pkg/api/errors"
3131
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3232
"k8s.io/apimachinery/pkg/util/wait"
3333
"k8s.io/apiserver/pkg/features"
@@ -153,11 +153,11 @@ var _ = SIGDescribe("Servers with support for API chunking", func() {
153153
framework.Logf("Token %s has not expired yet", firstToken)
154154
return false, nil
155155
}
156-
if err != nil && !errors.IsResourceExpired(err) {
156+
if err != nil && !apierrors.IsResourceExpired(err) {
157157
return false, err
158158
}
159159
framework.Logf("got error %s", err)
160-
status, ok := err.(errors.APIStatus)
160+
status, ok := err.(apierrors.APIStatus)
161161
if !ok {
162162
return false, fmt.Errorf("expect error to implement the APIStatus interface, got %v", reflect.TypeOf(err))
163163
}

‎test/e2e/apimachinery/crd_conversion_webhook.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import (
2626
appsv1 "k8s.io/api/apps/v1"
2727
v1 "k8s.io/api/core/v1"
2828
rbacv1 "k8s.io/api/rbac/v1"
29-
"k8s.io/apimachinery/pkg/api/errors"
29+
apierrors "k8s.io/apimachinery/pkg/api/errors"
3030
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3131
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
3232
"k8s.io/apimachinery/pkg/util/intstr"
@@ -236,7 +236,7 @@ func createAuthReaderRoleBindingForCRDConversion(f *framework.Framework, namespa
236236
},
237237
},
238238
})
239-
if err != nil && errors.IsAlreadyExists(err) {
239+
if err != nil && apierrors.IsAlreadyExists(err) {
240240
framework.Logf("role binding %s already exists", roleBindingCRDName)
241241
} else {
242242
framework.ExpectNoError(err, "creating role binding %s:webhook to access configMap", namespace)

‎test/e2e/apimachinery/garbage_collector.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import (
2828
apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
2929
apiextensionsclientset "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
3030
apiextensionstestserver "k8s.io/apiextensions-apiserver/test/integration/fixtures"
31-
"k8s.io/apimachinery/pkg/api/errors"
31+
apierrors "k8s.io/apimachinery/pkg/api/errors"
3232
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3333
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
3434
"k8s.io/apimachinery/pkg/runtime/schema"
@@ -667,7 +667,7 @@ var _ = SIGDescribe("Garbage collector", func() {
667667
framework.Logf("")
668668
return false, nil
669669
}
670-
if errors.IsNotFound(err) {
670+
if apierrors.IsNotFound(err) {
671671
return true, nil
672672
}
673673
return false, err
@@ -769,7 +769,7 @@ var _ = SIGDescribe("Garbage collector", func() {
769769
framework.Logf("")
770770
return false, nil
771771
}
772-
if errors.IsNotFound(err) {
772+
if apierrors.IsNotFound(err) {
773773
return true, nil
774774
}
775775
return false, err
@@ -882,7 +882,7 @@ var _ = SIGDescribe("Garbage collector", func() {
882882
definition := apiextensionstestserver.NewRandomNameV1CustomResourceDefinition(apiextensionsv1.ClusterScoped)
883883
defer func() {
884884
err = apiextensionstestserver.DeleteV1CustomResourceDefinition(definition, apiExtensionClient)
885-
if err != nil && !errors.IsNotFound(err) {
885+
if err != nil && !apierrors.IsNotFound(err) {
886886
framework.Failf("failed to delete CustomResourceDefinition: %v", err)
887887
}
888888
}()
@@ -951,7 +951,7 @@ var _ = SIGDescribe("Garbage collector", func() {
951951
// Ensure the dependent is deleted.
952952
if err := wait.Poll(5*time.Second, 60*time.Second, func() (bool, error) {
953953
_, err := resourceClient.Get(dependentName, metav1.GetOptions{})
954-
return errors.IsNotFound(err), nil
954+
return apierrors.IsNotFound(err), nil
955955
}); err != nil {
956956
framework.Logf("owner: %#v", persistedOwner)
957957
framework.Logf("dependent: %#v", persistedDependent)
@@ -963,7 +963,7 @@ var _ = SIGDescribe("Garbage collector", func() {
963963
if err == nil {
964964
framework.Failf("expected owner resource %q to be deleted", ownerName)
965965
} else {
966-
if !errors.IsNotFound(err) {
966+
if !apierrors.IsNotFound(err) {
967967
framework.Failf("unexpected error getting owner resource %q: %v", ownerName, err)
968968
}
969969
}
@@ -985,7 +985,7 @@ var _ = SIGDescribe("Garbage collector", func() {
985985
definition := apiextensionstestserver.NewRandomNameV1CustomResourceDefinition(apiextensionsv1.ClusterScoped)
986986
defer func() {
987987
err = apiextensionstestserver.DeleteV1CustomResourceDefinition(definition, apiExtensionClient)
988-
if err != nil && !errors.IsNotFound(err) {
988+
if err != nil && !apierrors.IsNotFound(err) {
989989
framework.Failf("failed to delete CustomResourceDefinition: %v", err)
990990
}
991991
}()
@@ -1056,7 +1056,7 @@ var _ = SIGDescribe("Garbage collector", func() {
10561056
if err == nil {
10571057
return false, nil
10581058
}
1059-
if err != nil && !errors.IsNotFound(err) {
1059+
if err != nil && !apierrors.IsNotFound(err) {
10601060
return false, fmt.Errorf("failed to get owner: %v", err)
10611061
}
10621062
return true, nil

‎test/e2e/apimachinery/namespace.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
"time"
2424

2525
"k8s.io/api/core/v1"
26-
"k8s.io/apimachinery/pkg/api/errors"
26+
apierrors "k8s.io/apimachinery/pkg/api/errors"
2727
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2828
"k8s.io/apimachinery/pkg/util/intstr"
2929
"k8s.io/apimachinery/pkg/util/wait"
@@ -121,7 +121,7 @@ func ensurePodsAreRemovedWhenNamespaceIsDeleted(f *framework.Framework) {
121121
framework.ExpectNoError(wait.Poll(1*time.Second, time.Duration(maxWaitSeconds)*time.Second,
122122
func() (bool, error) {
123123
_, err = f.ClientSet.CoreV1().Namespaces().Get(namespace.Name, metav1.GetOptions{})
124-
if err != nil && errors.IsNotFound(err) {
124+
if err != nil && apierrors.IsNotFound(err) {
125125
return true, nil
126126
}
127127
return false, nil
@@ -178,7 +178,7 @@ func ensureServicesAreRemovedWhenNamespaceIsDeleted(f *framework.Framework) {
178178
framework.ExpectNoError(wait.Poll(1*time.Second, time.Duration(maxWaitSeconds)*time.Second,
179179
func() (bool, error) {
180180
_, err = f.ClientSet.CoreV1().Namespaces().Get(namespace.Name, metav1.GetOptions{})
181-
if err != nil && errors.IsNotFound(err) {
181+
if err != nil && apierrors.IsNotFound(err) {
182182
return true, nil
183183
}
184184
return false, nil

‎test/e2e/apimachinery/protocol.go‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
g "github.com/onsi/ginkgo"
2424
o "github.com/onsi/gomega"
2525

26-
"k8s.io/apimachinery/pkg/api/errors"
26+
apierrors "k8s.io/apimachinery/pkg/api/errors"
2727
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2828
"k8s.io/apimachinery/pkg/watch"
2929
"k8s.io/client-go/kubernetes"
@@ -63,16 +63,16 @@ var _ = SIGDescribe("client-go should negotiate", func() {
6363
case watch.Added, watch.Modified:
6464
// this is allowed
6565
case watch.Error:
66-
err := errors.FromObject(evt.Object)
67-
// In Kubernetes 1.17 and earlier, the api server returns both apierrs.StatusReasonExpired and
68-
// apierrs.StatusReasonGone for HTTP 410 (Gone) status code responses. In 1.18 the kube server is more consistent
69-
// and always returns apierrs.StatusReasonExpired. For backward compatibility we can only remove the apierrs.IsGone
66+
err := apierrors.FromObject(evt.Object)
67+
// In Kubernetes 1.17 and earlier, the api server returns both apierrors.StatusReasonExpired and
68+
// apierrors.StatusReasonGone for HTTP 410 (Gone) status code responses. In 1.18 the kube server is more consistent
69+
// and always returns apierrors.StatusReasonExpired. For backward compatibility we can only remove the apierrs.IsGone
7070
// check when we fully drop support for Kubernetes 1.17 servers from reflectors.
71-
if errors.IsGone(err) || errors.IsResourceExpired(err) {
71+
if apierrors.IsGone(err) || apierrors.IsResourceExpired(err) {
7272
// this is allowed, since the kubernetes object could be very old
7373
break
7474
}
75-
if errors.IsUnexpectedObjectError(err) {
75+
if apierrors.IsUnexpectedObjectError(err) {
7676
g.Fail(fmt.Sprintf("unexpected object, wanted v1.Status: %#v", evt.Object))
7777
}
7878
g.Fail(fmt.Sprintf("unexpected error: %#v", evt.Object))

‎test/e2e/apimachinery/resource_quota.go‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
appsv1 "k8s.io/api/apps/v1"
2525
v1 "k8s.io/api/core/v1"
2626
schedulingv1 "k8s.io/api/scheduling/v1"
27-
"k8s.io/apimachinery/pkg/api/errors"
27+
apierrors "k8s.io/apimachinery/pkg/api/errors"
2828
"k8s.io/apimachinery/pkg/api/resource"
2929
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3030
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
@@ -886,7 +886,7 @@ var _ = SIGDescribe("ResourceQuota", func() {
886886

887887
ginkgo.By("Verifying the deleted ResourceQuota")
888888
_, err = client.CoreV1().ResourceQuotas(ns).Get(quotaName, metav1.GetOptions{})
889-
framework.ExpectEqual(errors.IsNotFound(err), true)
889+
framework.ExpectEqual(apierrors.IsNotFound(err), true)
890890
})
891891
})
892892

@@ -1076,7 +1076,7 @@ var _ = SIGDescribe("ResourceQuota [Feature:PodPriority]", func() {
10761076
ginkgo.It("should verify ResourceQuota's priority class scope (quota set to pod count: 1) against a pod with same priority class.", func() {
10771077

10781078
_, err := f.ClientSet.SchedulingV1().PriorityClasses().Create(&schedulingv1.PriorityClass{ObjectMeta: metav1.ObjectMeta{Name: "pclass1"}, Value: int32(1000)})
1079-
framework.ExpectEqual(err == nil || errors.IsAlreadyExists(err), true)
1079+
framework.ExpectEqual(err == nil || apierrors.IsAlreadyExists(err), true)
10801080

10811081
hard := v1.ResourceList{}
10821082
hard[v1.ResourcePods] = resource.MustParse("1")
@@ -1115,7 +1115,7 @@ var _ = SIGDescribe("ResourceQuota [Feature:PodPriority]", func() {
11151115
ginkgo.It("should verify ResourceQuota's priority class scope (quota set to pod count: 1) against 2 pods with same priority class.", func() {
11161116

11171117
_, err := f.ClientSet.SchedulingV1().PriorityClasses().Create(&schedulingv1.PriorityClass{ObjectMeta: metav1.ObjectMeta{Name: "pclass2"}, Value: int32(1000)})
1118-
framework.ExpectEqual(err == nil || errors.IsAlreadyExists(err), true)
1118+
framework.ExpectEqual(err == nil || apierrors.IsAlreadyExists(err), true)
11191119

11201120
hard := v1.ResourceList{}
11211121
hard[v1.ResourcePods] = resource.MustParse("1")
@@ -1160,7 +1160,7 @@ var _ = SIGDescribe("ResourceQuota [Feature:PodPriority]", func() {
11601160
ginkgo.It("should verify ResourceQuota's priority class scope (quota set to pod count: 1) against 2 pods with different priority class.", func() {
11611161

11621162
_, err := f.ClientSet.SchedulingV1().PriorityClasses().Create(&schedulingv1.PriorityClass{ObjectMeta: metav1.ObjectMeta{Name: "pclass3"}, Value: int32(1000)})
1163-
framework.ExpectEqual(err == nil || errors.IsAlreadyExists(err), true)
1163+
framework.ExpectEqual(err == nil || apierrors.IsAlreadyExists(err), true)
11641164

11651165
hard := v1.ResourceList{}
11661166
hard[v1.ResourcePods] = resource.MustParse("1")
@@ -1206,10 +1206,10 @@ var _ = SIGDescribe("ResourceQuota [Feature:PodPriority]", func() {
12061206

12071207
ginkgo.It("should verify ResourceQuota's multiple priority class scope (quota set to pod count: 2) against 2 pods with same priority classes.", func() {
12081208
_, err := f.ClientSet.SchedulingV1().PriorityClasses().Create(&schedulingv1.PriorityClass{ObjectMeta: metav1.ObjectMeta{Name: "pclass5"}, Value: int32(1000)})
1209-
framework.ExpectEqual(err == nil || errors.IsAlreadyExists(err), true)
1209+
framework.ExpectEqual(err == nil || apierrors.IsAlreadyExists(err), true)
12101210

12111211
_, err = f.ClientSet.SchedulingV1().PriorityClasses().Create(&schedulingv1.PriorityClass{ObjectMeta: metav1.ObjectMeta{Name: "pclass6"}, Value: int32(1000)})
1212-
framework.ExpectEqual(err == nil || errors.IsAlreadyExists(err), true)
1212+
framework.ExpectEqual(err == nil || apierrors.IsAlreadyExists(err), true)
12131213

12141214
hard := v1.ResourceList{}
12151215
hard[v1.ResourcePods] = resource.MustParse("2")
@@ -1261,7 +1261,7 @@ var _ = SIGDescribe("ResourceQuota [Feature:PodPriority]", func() {
12611261
ginkgo.It("should verify ResourceQuota's priority class scope (quota set to pod count: 1) against a pod with different priority class (ScopeSelectorOpNotIn).", func() {
12621262

12631263
_, err := f.ClientSet.SchedulingV1().PriorityClasses().Create(&schedulingv1.PriorityClass{ObjectMeta: metav1.ObjectMeta{Name: "pclass7"}, Value: int32(1000)})
1264-
framework.ExpectEqual(err == nil || errors.IsAlreadyExists(err), true)
1264+
framework.ExpectEqual(err == nil || apierrors.IsAlreadyExists(err), true)
12651265

12661266
hard := v1.ResourceList{}
12671267
hard[v1.ResourcePods] = resource.MustParse("1")
@@ -1295,7 +1295,7 @@ var _ = SIGDescribe("ResourceQuota [Feature:PodPriority]", func() {
12951295
ginkgo.It("should verify ResourceQuota's priority class scope (quota set to pod count: 1) against a pod with different priority class (ScopeSelectorOpExists).", func() {
12961296

12971297
_, err := f.ClientSet.SchedulingV1().PriorityClasses().Create(&schedulingv1.PriorityClass{ObjectMeta: metav1.ObjectMeta{Name: "pclass8"}, Value: int32(1000)})
1298-
framework.ExpectEqual(err == nil || errors.IsAlreadyExists(err), true)
1298+
framework.ExpectEqual(err == nil || apierrors.IsAlreadyExists(err), true)
12991299

13001300
hard := v1.ResourceList{}
13011301
hard[v1.ResourcePods] = resource.MustParse("1")
@@ -1334,7 +1334,7 @@ var _ = SIGDescribe("ResourceQuota [Feature:PodPriority]", func() {
13341334
ginkgo.It("should verify ResourceQuota's priority class scope (cpu, memory quota set) against a pod with same priority class.", func() {
13351335

13361336
_, err := f.ClientSet.SchedulingV1().PriorityClasses().Create(&schedulingv1.PriorityClass{ObjectMeta: metav1.ObjectMeta{Name: "pclass9"}, Value: int32(1000)})
1337-
framework.ExpectEqual(err == nil || errors.IsAlreadyExists(err), true)
1337+
framework.ExpectEqual(err == nil || apierrors.IsAlreadyExists(err), true)
13381338

13391339
hard := v1.ResourceList{}
13401340
hard[v1.ResourcePods] = resource.MustParse("1")
@@ -1714,7 +1714,7 @@ func updateResourceQuotaUntilUsageAppears(c clientset.Interface, ns, quotaName s
17141714
resourceQuota.Spec.Hard[resourceName] = current
17151715
_, err = c.CoreV1().ResourceQuotas(ns).Update(resourceQuota)
17161716
// ignoring conflicts since someone else may already updated it.
1717-
if errors.IsConflict(err) {
1717+
if apierrors.IsConflict(err) {
17181718
return false, nil
17191719
}
17201720
return false, err

‎test/e2e/apimachinery/table_conversion.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import (
2727

2828
authorizationv1 "k8s.io/api/authorization/v1"
2929
"k8s.io/api/core/v1"
30-
"k8s.io/apimachinery/pkg/api/errors"
30+
apierrors "k8s.io/apimachinery/pkg/api/errors"
3131
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3232
metav1beta1 "k8s.io/apimachinery/pkg/apis/meta/v1beta1"
3333
"k8s.io/client-go/util/workqueue"
@@ -164,7 +164,7 @@ var _ = SIGDescribe("Servers with support for Table transformation", func() {
164164
}
165165
err := c.AuthorizationV1().RESTClient().Post().Resource("selfsubjectaccessreviews").SetHeader("Accept", "application/json;as=Table;v=v1;g=meta.k8s.io").Body(sar).Do().Into(table)
166166
framework.ExpectError(err, "failed to return error when posting self subject access review: %+v, to a backend that does not implement metadata", sar)
167-
framework.ExpectEqual(err.(errors.APIStatus).Status().Code, int32(406))
167+
framework.ExpectEqual(err.(apierrors.APIStatus).Status().Code, int32(406))
168168
})
169169
})
170170

‎test/e2e/apimachinery/webhook.go‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import (
3030
rbacv1 "k8s.io/api/rbac/v1"
3131
apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
3232
crdclientset "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
33-
"k8s.io/apimachinery/pkg/api/errors"
33+
apierrors "k8s.io/apimachinery/pkg/api/errors"
3434
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3535
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
3636
"k8s.io/apimachinery/pkg/types"
@@ -739,7 +739,7 @@ func createAuthReaderRoleBinding(f *framework.Framework, namespace string) {
739739
},
740740
},
741741
})
742-
if err != nil && errors.IsAlreadyExists(err) {
742+
if err != nil && apierrors.IsAlreadyExists(err) {
743743
framework.Logf("role binding %s already exists", roleBindingName)
744744
} else {
745745
framework.ExpectNoError(err, "creating role binding %s:webhook to access configMap", namespace)
@@ -1120,7 +1120,7 @@ func testWebhook(f *framework.Framework) {
11201120
framework.Failf("expect error %q, got %q", "deadline", err.Error())
11211121
}
11221122
// ensure the pod was not actually created
1123-
if _, err := client.CoreV1().Pods(f.Namespace.Name).Get(pod.Name, metav1.GetOptions{}); !errors.IsNotFound(err) {
1123+
if _, err := client.CoreV1().Pods(f.Namespace.Name).Get(pod.Name, metav1.GetOptions{}); !apierrors.IsNotFound(err) {
11241124
framework.Failf("expect notfound error looking for rejected pod, got %v", err)
11251125
}
11261126

@@ -1296,7 +1296,7 @@ func testFailClosedWebhook(f *framework.Framework) {
12961296
}
12971297
_, err = client.CoreV1().ConfigMaps(failNamespaceName).Create(configmap)
12981298
framework.ExpectError(err, "create configmap in namespace: %s should be unconditionally rejected by the webhook", failNamespaceName)
1299-
if !errors.IsInternalError(err) {
1299+
if !apierrors.IsInternalError(err) {
13001300
framework.Failf("expect an internal error, got %#v", err)
13011301
}
13021302
}
@@ -1661,7 +1661,7 @@ func updateConfigMap(c clientset.Interface, ns, name string, update updateConfig
16611661
return true, nil
16621662
}
16631663
// Only retry update on conflict
1664-
if !errors.IsConflict(err) {
1664+
if !apierrors.IsConflict(err) {
16651665
return false, err
16661666
}
16671667
return false, nil
@@ -1683,7 +1683,7 @@ func updateCustomResource(c dynamic.ResourceInterface, ns, name string, update u
16831683
return true, nil
16841684
}
16851685
// Only retry update on conflict
1686-
if !errors.IsConflict(err) {
1686+
if !apierrors.IsConflict(err) {
16871687
return false, err
16881688
}
16891689
return false, nil

‎test/e2e/apps/cronjob.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import (
2626
batchv1 "k8s.io/api/batch/v1"
2727
batchv1beta1 "k8s.io/api/batch/v1beta1"
2828
v1 "k8s.io/api/core/v1"
29-
"k8s.io/apimachinery/pkg/api/errors"
29+
apierrors "k8s.io/apimachinery/pkg/api/errors"
3030
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3131
"k8s.io/apimachinery/pkg/util/wait"
3232
clientset "k8s.io/client-go/kubernetes"
@@ -214,7 +214,7 @@ var _ = SIGDescribe("CronJob", func() {
214214
ginkgo.By("Ensuring job was deleted")
215215
_, err = jobutil.GetJob(f.ClientSet, f.Namespace.Name, job.Name)
216216
framework.ExpectError(err)
217-
framework.ExpectEqual(errors.IsNotFound(err), true)
217+
framework.ExpectEqual(apierrors.IsNotFound(err), true)
218218

219219
ginkgo.By("Ensuring the job is not in the cronjob active list")
220220
err = waitForJobNotActive(f.ClientSet, f.Namespace.Name, cronJob.Name, job.Name)

0 commit comments

Comments
 (0)