Skip to content

Commit aeb7ff2

Browse files
authored
Merge pull request #566 from yanggangtony/clean-error-package
Delete redundance package k8s.io/apimachinery/pkg/api/errors
2 parents 549c61d + 462a228 commit aeb7ff2

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

test/integration/utils.go

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

2525
v1 "k8s.io/api/core/v1"
26-
"k8s.io/apimachinery/pkg/api/errors"
2726
apierrors "k8s.io/apimachinery/pkg/api/errors"
2827
"k8s.io/apimachinery/pkg/api/resource"
2928
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -261,7 +260,7 @@ func createNamespace(t *testing.T, testCtx *testContext, ns string) {
261260
func createAppGroups(ctx context.Context, client agversioned.Interface, appGroups []*agv1alpha1.AppGroup) error {
262261
for _, ag := range appGroups {
263262
_, err := client.AppgroupV1alpha1().AppGroups(ag.Namespace).Create(ctx, ag, metav1.CreateOptions{})
264-
if err != nil && !errors.IsAlreadyExists(err) {
263+
if err != nil && !apierrors.IsAlreadyExists(err) {
265264
return err
266265
}
267266
}
@@ -277,7 +276,7 @@ func cleanupAppGroups(ctx context.Context, client agversioned.Interface, appGrou
277276
func createNetworkTopologies(ctx context.Context, client ntversioned.Interface, networkTopologies []*ntv1alpha1.NetworkTopology) error {
278277
for _, nt := range networkTopologies {
279278
_, err := client.NetworktopologyV1alpha1().NetworkTopologies(nt.Namespace).Create(ctx, nt, metav1.CreateOptions{})
280-
if err != nil && !errors.IsAlreadyExists(err) {
279+
if err != nil && !apierrors.IsAlreadyExists(err) {
281280
return err
282281
}
283282
}

0 commit comments

Comments
 (0)