Skip to content

Commit

Permalink
Use the system errors package instead of github.com/pkg/errors
Browse files Browse the repository at this point in the history
... where appropriate.

Signed-off-by: Stephen Kitt <skitt@redhat.com>
  • Loading branch information
skitt committed Nov 3, 2023
1 parent a5750ac commit f4f0af9
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 7 deletions.
2 changes: 1 addition & 1 deletion pkg/fake/conflict_reactor.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ limitations under the License.
package fake

import (
"errors"
"sync"

"github.com/pkg/errors"
apierrors "k8s.io/apimachinery/pkg/api/errors"
"k8s.io/apimachinery/pkg/api/meta"
"k8s.io/apimachinery/pkg/runtime"
Expand Down
2 changes: 1 addition & 1 deletion pkg/fake/delete_colection_reactor.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@ limitations under the License.
package fake

import (
"errors"
"fmt"
"strings"

. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
"github.com/pkg/errors"
"github.com/submariner-io/admiral/pkg/syncer/test"
"k8s.io/apimachinery/pkg/api/meta"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down
2 changes: 1 addition & 1 deletion pkg/fake/dynamic_client.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@ package fake

import (
"context"
"errors"
"fmt"
"strconv"
"sync"
"sync/atomic"
"time"

. "github.com/onsi/gomega"
"github.com/pkg/errors"
apierrors "k8s.io/apimachinery/pkg/api/errors"
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
Expand Down
2 changes: 1 addition & 1 deletion pkg/fake/fail_on_action_reactor.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ limitations under the License.
package fake

import (
"errors"
"sync/atomic"

"github.com/pkg/errors"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/client-go/testing"
)
Expand Down
3 changes: 2 additions & 1 deletion pkg/fake/filtering_watch_reactor.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ limitations under the License.
package fake

import (
"github.com/pkg/errors"
"errors"

"github.com/submariner-io/admiral/pkg/resource"
"k8s.io/apimachinery/pkg/labels"
"k8s.io/apimachinery/pkg/watch"
Expand Down
2 changes: 1 addition & 1 deletion pkg/resource/rest_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ package resource_test
import (
"crypto/x509"
"encoding/base64"
"errors"

. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
"github.com/pkg/errors"
"github.com/submariner-io/admiral/pkg/fake"
"github.com/submariner-io/admiral/pkg/resource"
corev1 "k8s.io/api/core/v1"
Expand Down
2 changes: 1 addition & 1 deletion pkg/util/create_or_update_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ package util_test

import (
"context"
"errors"
"time"

. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
"github.com/pkg/errors"
"github.com/submariner-io/admiral/pkg/fake"
. "github.com/submariner-io/admiral/pkg/gomega"
"github.com/submariner-io/admiral/pkg/resource"
Expand Down

0 comments on commit f4f0af9

Please sign in to comment.