Skip to content

Commit 0c29a4c

Browse files
negzluebken
authored andcommitted
Switch to the crossplane-runtime pkg/errors library
See crossplane/crossplane-runtime#291 for context. Signed-off-by: Nic Cope <[email protected]>
1 parent 0af785d commit 0c29a4c

Some content is hidden

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

76 files changed

+90
-76
lines changed

cmd/crank/build.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,10 @@ import (
2121
"path/filepath"
2222

2323
"github.com/google/go-containerregistry/pkg/v1/tarball"
24-
"github.com/pkg/errors"
2524
"github.com/spf13/afero"
2625

26+
"github.com/crossplane/crossplane-runtime/pkg/errors"
27+
2728
"github.com/crossplane/crossplane-runtime/pkg/logging"
2829
"github.com/crossplane/crossplane-runtime/pkg/parser"
2930

cmd/crank/build_test.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,10 @@ import (
2121
"testing"
2222

2323
"github.com/google/go-cmp/cmp"
24-
"github.com/pkg/errors"
2524
"github.com/spf13/afero"
2625

26+
"github.com/crossplane/crossplane-runtime/pkg/errors"
27+
2728
"github.com/crossplane/crossplane-runtime/pkg/logging"
2829
"github.com/crossplane/crossplane-runtime/pkg/parser"
2930
"github.com/crossplane/crossplane-runtime/pkg/test"

cmd/crank/install.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,15 @@ import (
2525

2626
"github.com/alecthomas/kong"
2727
"github.com/google/go-containerregistry/pkg/name"
28-
"github.com/pkg/errors"
2928
corev1 "k8s.io/api/core/v1"
3029
apierrors "k8s.io/apimachinery/pkg/api/errors"
3130
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3231
"k8s.io/apimachinery/pkg/fields"
3332
"k8s.io/client-go/tools/cache"
3433
ctrl "sigs.k8s.io/controller-runtime"
3534

35+
"github.com/crossplane/crossplane-runtime/pkg/errors"
36+
3637
xpv1 "github.com/crossplane/crossplane-runtime/apis/common/v1"
3738
"github.com/crossplane/crossplane-runtime/pkg/logging"
3839
v1 "github.com/crossplane/crossplane/apis/pkg/v1"

cmd/crank/push.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,10 @@ import (
2323
"github.com/google/go-containerregistry/pkg/name"
2424
"github.com/google/go-containerregistry/pkg/v1/remote"
2525
"github.com/google/go-containerregistry/pkg/v1/tarball"
26-
"github.com/pkg/errors"
2726
"github.com/spf13/afero"
2827

28+
"github.com/crossplane/crossplane-runtime/pkg/errors"
29+
2930
"github.com/crossplane/crossplane-runtime/pkg/logging"
3031
"github.com/crossplane/crossplane/internal/xpkg"
3132
)

cmd/crank/update.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,12 @@ import (
88

99
"github.com/alecthomas/kong"
1010
"github.com/google/go-containerregistry/pkg/name"
11-
"github.com/pkg/errors"
1211
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1312
"k8s.io/apimachinery/pkg/types"
1413
ctrl "sigs.k8s.io/controller-runtime"
1514

15+
"github.com/crossplane/crossplane-runtime/pkg/errors"
16+
1617
"github.com/crossplane/crossplane-runtime/pkg/logging"
1718
v1 "github.com/crossplane/crossplane/apis/pkg/v1"
1819
typedclient "github.com/crossplane/crossplane/internal/client/clientset/versioned/typed/pkg/v1"

cmd/crossplane/core/core.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,12 @@ import (
2121

2222
"github.com/alecthomas/kong"
2323
"github.com/google/go-containerregistry/pkg/name"
24-
"github.com/pkg/errors"
2524
"github.com/spf13/afero"
2625
"k8s.io/apimachinery/pkg/runtime"
2726
ctrl "sigs.k8s.io/controller-runtime"
2827

28+
"github.com/crossplane/crossplane-runtime/pkg/errors"
29+
2930
"github.com/crossplane/crossplane-runtime/pkg/logging"
3031

3132
"github.com/crossplane/crossplane/internal/controller/apiextensions"

cmd/crossplane/core/init.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,12 @@ package core
1919
import (
2020
"context"
2121

22-
"github.com/pkg/errors"
2322
"k8s.io/apimachinery/pkg/runtime"
2423
ctrl "sigs.k8s.io/controller-runtime"
2524
"sigs.k8s.io/controller-runtime/pkg/client"
2625

26+
"github.com/crossplane/crossplane-runtime/pkg/errors"
27+
2728
"github.com/crossplane/crossplane-runtime/pkg/logging"
2829

2930
"github.com/crossplane/crossplane/internal/initializer"

cmd/crossplane/rbac/init.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,12 @@ import (
2121
"fmt"
2222
"time"
2323

24-
"github.com/pkg/errors"
2524
"k8s.io/apimachinery/pkg/runtime"
2625
ctrl "sigs.k8s.io/controller-runtime"
2726
"sigs.k8s.io/controller-runtime/pkg/client"
2827

28+
"github.com/crossplane/crossplane-runtime/pkg/errors"
29+
2930
"github.com/crossplane/crossplane-runtime/pkg/logging"
3031

3132
v1 "github.com/crossplane/crossplane/apis/apiextensions/v1"

cmd/crossplane/rbac/rbac.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,11 @@ import (
2121
"time"
2222

2323
"github.com/alecthomas/kong"
24-
"github.com/pkg/errors"
2524
"k8s.io/apimachinery/pkg/runtime"
2625
ctrl "sigs.k8s.io/controller-runtime"
2726

27+
"github.com/crossplane/crossplane-runtime/pkg/errors"
28+
2829
"github.com/crossplane/crossplane-runtime/pkg/logging"
2930

3031
"github.com/crossplane/crossplane/internal/controller/rbac"

internal/controller/apiextensions/claim/api.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@ import (
2121

2222
"github.com/google/go-cmp/cmp"
2323
"github.com/google/go-cmp/cmp/cmpopts"
24-
"github.com/pkg/errors"
2524
corev1 "k8s.io/api/core/v1"
2625
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2726
"k8s.io/apimachinery/pkg/runtime"
2827
"k8s.io/apimachinery/pkg/types"
2928
"sigs.k8s.io/controller-runtime/pkg/client"
3029

30+
"github.com/crossplane/crossplane-runtime/pkg/errors"
3131
"github.com/crossplane/crossplane-runtime/pkg/meta"
3232
"github.com/crossplane/crossplane-runtime/pkg/resource"
3333
)

internal/controller/apiextensions/claim/api_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@ import (
2121
"testing"
2222

2323
"github.com/google/go-cmp/cmp"
24-
"github.com/pkg/errors"
2524
corev1 "k8s.io/api/core/v1"
2625
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2726
"k8s.io/apimachinery/pkg/runtime"
2827
"k8s.io/apimachinery/pkg/runtime/schema"
2928
"sigs.k8s.io/controller-runtime/pkg/client"
3029

3130
xpv1 "github.com/crossplane/crossplane-runtime/apis/common/v1"
31+
"github.com/crossplane/crossplane-runtime/pkg/errors"
3232
"github.com/crossplane/crossplane-runtime/pkg/resource"
3333
"github.com/crossplane/crossplane-runtime/pkg/resource/fake"
3434
"github.com/crossplane/crossplane-runtime/pkg/test"

internal/controller/apiextensions/claim/configurator.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ import (
2323
"github.com/google/go-cmp/cmp"
2424
"github.com/google/go-cmp/cmp/cmpopts"
2525
"github.com/imdario/mergo"
26-
"github.com/pkg/errors"
2726
corev1 "k8s.io/api/core/v1"
2827
"sigs.k8s.io/controller-runtime/pkg/client"
2928

29+
"github.com/crossplane/crossplane-runtime/pkg/errors"
3030
"github.com/crossplane/crossplane-runtime/pkg/meta"
3131
"github.com/crossplane/crossplane-runtime/pkg/resource"
3232
"github.com/crossplane/crossplane-runtime/pkg/resource/unstructured/claim"

internal/controller/apiextensions/claim/configurator_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@ import (
2222
"testing"
2323

2424
"github.com/google/go-cmp/cmp"
25-
"github.com/pkg/errors"
2625
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2726
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
2827
"sigs.k8s.io/controller-runtime/pkg/client"
2928

29+
"github.com/crossplane/crossplane-runtime/pkg/errors"
3030
"github.com/crossplane/crossplane-runtime/pkg/meta"
3131
"github.com/crossplane/crossplane-runtime/pkg/resource"
3232
"github.com/crossplane/crossplane-runtime/pkg/resource/fake"

internal/controller/apiextensions/claim/reconciler.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import (
2222

2323
"github.com/google/go-cmp/cmp"
2424
"github.com/google/go-cmp/cmp/cmpopts"
25-
"github.com/pkg/errors"
2625
corev1 "k8s.io/api/core/v1"
2726
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2827
"k8s.io/apimachinery/pkg/runtime/schema"
@@ -31,6 +30,7 @@ import (
3130
"sigs.k8s.io/controller-runtime/pkg/reconcile"
3231

3332
xpv1 "github.com/crossplane/crossplane-runtime/apis/common/v1"
33+
"github.com/crossplane/crossplane-runtime/pkg/errors"
3434
"github.com/crossplane/crossplane-runtime/pkg/event"
3535
"github.com/crossplane/crossplane-runtime/pkg/logging"
3636
"github.com/crossplane/crossplane-runtime/pkg/meta"

internal/controller/apiextensions/claim/reconciler_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import (
2121
"testing"
2222

2323
"github.com/google/go-cmp/cmp"
24-
"github.com/pkg/errors"
2524
corev1 "k8s.io/api/core/v1"
2625
kerrors "k8s.io/apimachinery/pkg/api/errors"
2726
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -31,6 +30,7 @@ import (
3130
"sigs.k8s.io/controller-runtime/pkg/reconcile"
3231

3332
xpv1 "github.com/crossplane/crossplane-runtime/apis/common/v1"
33+
"github.com/crossplane/crossplane-runtime/pkg/errors"
3434
"github.com/crossplane/crossplane-runtime/pkg/resource"
3535
"github.com/crossplane/crossplane-runtime/pkg/resource/fake"
3636
"github.com/crossplane/crossplane-runtime/pkg/resource/unstructured/claim"

internal/controller/apiextensions/composite/api.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@ import (
2323

2424
"github.com/google/go-cmp/cmp"
2525
"github.com/google/go-cmp/cmp/cmpopts"
26-
"github.com/pkg/errors"
2726
corev1 "k8s.io/api/core/v1"
2827
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2928
"k8s.io/apimachinery/pkg/runtime"
3029
"sigs.k8s.io/controller-runtime/pkg/client"
3130

3231
xpv1 "github.com/crossplane/crossplane-runtime/apis/common/v1"
32+
"github.com/crossplane/crossplane-runtime/pkg/errors"
3333
"github.com/crossplane/crossplane-runtime/pkg/event"
3434
"github.com/crossplane/crossplane-runtime/pkg/meta"
3535
"github.com/crossplane/crossplane-runtime/pkg/reconciler/managed"

internal/controller/apiextensions/composite/api_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import (
2020
"testing"
2121

2222
"github.com/google/go-cmp/cmp"
23-
"github.com/pkg/errors"
2423
corev1 "k8s.io/api/core/v1"
2524
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2625
"k8s.io/apimachinery/pkg/runtime"
@@ -29,6 +28,7 @@ import (
2928
"sigs.k8s.io/controller-runtime/pkg/client"
3029

3130
xpv1 "github.com/crossplane/crossplane-runtime/apis/common/v1"
31+
"github.com/crossplane/crossplane-runtime/pkg/errors"
3232
"github.com/crossplane/crossplane-runtime/pkg/event"
3333
"github.com/crossplane/crossplane-runtime/pkg/reconciler/managed"
3434
"github.com/crossplane/crossplane-runtime/pkg/resource"

internal/controller/apiextensions/composite/composed.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import (
2020
"context"
2121
"fmt"
2222

23-
"github.com/pkg/errors"
2423
corev1 "k8s.io/api/core/v1"
2524
kerrors "k8s.io/apimachinery/pkg/api/errors"
2625
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -30,6 +29,7 @@ import (
3029
"sigs.k8s.io/controller-runtime/pkg/client"
3130

3231
xpv1 "github.com/crossplane/crossplane-runtime/apis/common/v1"
32+
"github.com/crossplane/crossplane-runtime/pkg/errors"
3333
"github.com/crossplane/crossplane-runtime/pkg/fieldpath"
3434
"github.com/crossplane/crossplane-runtime/pkg/meta"
3535
"github.com/crossplane/crossplane-runtime/pkg/reconciler/managed"

internal/controller/apiextensions/composite/composed_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import (
2121
"testing"
2222

2323
"github.com/google/go-cmp/cmp"
24-
"github.com/pkg/errors"
2524
corev1 "k8s.io/api/core/v1"
2625
kerrors "k8s.io/apimachinery/pkg/api/errors"
2726
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -33,6 +32,7 @@ import (
3332
"sigs.k8s.io/controller-runtime/pkg/client"
3433

3534
xpv1 "github.com/crossplane/crossplane-runtime/apis/common/v1"
35+
"github.com/crossplane/crossplane-runtime/pkg/errors"
3636
"github.com/crossplane/crossplane-runtime/pkg/reconciler/managed"
3737
"github.com/crossplane/crossplane-runtime/pkg/resource"
3838
"github.com/crossplane/crossplane-runtime/pkg/resource/fake"

internal/controller/apiextensions/composite/merge_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ import (
2020
"testing"
2121

2222
"github.com/google/go-cmp/cmp"
23-
"github.com/pkg/errors"
2423
corev1 "k8s.io/api/core/v1"
2524
k8s "k8s.io/apimachinery/pkg/runtime"
2625
"k8s.io/apimachinery/pkg/runtime/schema"
2726

2827
xpv1 "github.com/crossplane/crossplane-runtime/apis/common/v1"
28+
"github.com/crossplane/crossplane-runtime/pkg/errors"
2929
"github.com/crossplane/crossplane-runtime/pkg/test"
3030

3131
v1 "github.com/crossplane/crossplane/apis/apiextensions/v1"

internal/controller/apiextensions/composite/reconciler.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import (
2020
"context"
2121
"time"
2222

23-
"github.com/pkg/errors"
2423
corev1 "k8s.io/api/core/v1"
2524
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2625
"k8s.io/apimachinery/pkg/runtime/schema"
@@ -29,6 +28,7 @@ import (
2928
"sigs.k8s.io/controller-runtime/pkg/reconcile"
3029

3130
xpv1 "github.com/crossplane/crossplane-runtime/apis/common/v1"
31+
"github.com/crossplane/crossplane-runtime/pkg/errors"
3232
"github.com/crossplane/crossplane-runtime/pkg/event"
3333
"github.com/crossplane/crossplane-runtime/pkg/logging"
3434
"github.com/crossplane/crossplane-runtime/pkg/meta"

internal/controller/apiextensions/composite/reconciler_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import (
2121
"testing"
2222

2323
"github.com/google/go-cmp/cmp"
24-
"github.com/pkg/errors"
2524
corev1 "k8s.io/api/core/v1"
2625
kerrors "k8s.io/apimachinery/pkg/api/errors"
2726
"k8s.io/apimachinery/pkg/runtime/schema"
@@ -30,6 +29,7 @@ import (
3029
"sigs.k8s.io/controller-runtime/pkg/manager"
3130
"sigs.k8s.io/controller-runtime/pkg/reconcile"
3231

32+
"github.com/crossplane/crossplane-runtime/pkg/errors"
3333
"github.com/crossplane/crossplane-runtime/pkg/reconciler/managed"
3434
"github.com/crossplane/crossplane-runtime/pkg/resource"
3535
"github.com/crossplane/crossplane-runtime/pkg/resource/fake"

internal/controller/apiextensions/composition/reconciler.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@ import (
2222
"strings"
2323
"time"
2424

25-
"github.com/pkg/errors"
2625
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2726
ctrl "sigs.k8s.io/controller-runtime"
2827
"sigs.k8s.io/controller-runtime/pkg/client"
2928
"sigs.k8s.io/controller-runtime/pkg/manager"
3029
"sigs.k8s.io/controller-runtime/pkg/reconcile"
3130

31+
"github.com/crossplane/crossplane-runtime/pkg/errors"
3232
"github.com/crossplane/crossplane-runtime/pkg/event"
3333
"github.com/crossplane/crossplane-runtime/pkg/logging"
3434
"github.com/crossplane/crossplane-runtime/pkg/meta"

internal/controller/apiextensions/composition/reconciler_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import (
2121
"testing"
2222

2323
"github.com/google/go-cmp/cmp"
24-
"github.com/pkg/errors"
2524
kerrors "k8s.io/apimachinery/pkg/api/errors"
2625
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2726
"k8s.io/apimachinery/pkg/runtime/schema"
@@ -31,6 +30,7 @@ import (
3130
"sigs.k8s.io/controller-runtime/pkg/reconcile"
3231

3332
xpv1 "github.com/crossplane/crossplane-runtime/apis/common/v1"
33+
"github.com/crossplane/crossplane-runtime/pkg/errors"
3434
"github.com/crossplane/crossplane-runtime/pkg/resource/fake"
3535
"github.com/crossplane/crossplane-runtime/pkg/test"
3636
v1 "github.com/crossplane/crossplane/apis/apiextensions/v1"

internal/controller/apiextensions/definition/reconciler.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import (
2121
"strings"
2222
"time"
2323

24-
"github.com/pkg/errors"
2524
extv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
2625
kerrors "k8s.io/apimachinery/pkg/api/errors"
2726
kmeta "k8s.io/apimachinery/pkg/api/meta"
@@ -35,6 +34,7 @@ import (
3534
"sigs.k8s.io/controller-runtime/pkg/reconcile"
3635

3736
"github.com/crossplane/crossplane-runtime/pkg/controller"
37+
"github.com/crossplane/crossplane-runtime/pkg/errors"
3838
"github.com/crossplane/crossplane-runtime/pkg/event"
3939
"github.com/crossplane/crossplane-runtime/pkg/logging"
4040
"github.com/crossplane/crossplane-runtime/pkg/meta"

internal/controller/apiextensions/definition/reconciler_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import (
2121
"testing"
2222

2323
"github.com/google/go-cmp/cmp"
24-
"github.com/pkg/errors"
2524
extv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
2625
kerrors "k8s.io/apimachinery/pkg/api/errors"
2726
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -34,6 +33,7 @@ import (
3433
"sigs.k8s.io/controller-runtime/pkg/reconcile"
3534

3635
"github.com/crossplane/crossplane-runtime/pkg/controller"
36+
"github.com/crossplane/crossplane-runtime/pkg/errors"
3737
"github.com/crossplane/crossplane-runtime/pkg/resource"
3838
"github.com/crossplane/crossplane-runtime/pkg/resource/fake"
3939
"github.com/crossplane/crossplane-runtime/pkg/test"

internal/controller/apiextensions/offered/reconciler.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import (
2121
"strings"
2222
"time"
2323

24-
"github.com/pkg/errors"
2524
extv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
2625
kmeta "k8s.io/apimachinery/pkg/api/meta"
2726
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -34,6 +33,7 @@ import (
3433
"sigs.k8s.io/controller-runtime/pkg/reconcile"
3534

3635
"github.com/crossplane/crossplane-runtime/pkg/controller"
36+
"github.com/crossplane/crossplane-runtime/pkg/errors"
3737
"github.com/crossplane/crossplane-runtime/pkg/event"
3838
"github.com/crossplane/crossplane-runtime/pkg/logging"
3939
"github.com/crossplane/crossplane-runtime/pkg/meta"

0 commit comments

Comments
 (0)