switch error packages

cmd/kind/build/baseimage/baseimage.go

@@ -17,10 +17,10 @@ limitations under the License.
 package baseimage
 
 import (
-	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 
 	"sigs.k8s.io/kind/pkg/build/base"
+	"sigs.k8s.io/kind/pkg/errors"
 )
 
 type flagpole struct {

cmd/kind/build/nodeimage/nodeimage.go

@@ -17,10 +17,10 @@ limitations under the License.
 package nodeimage
 
 import (
-	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 
 	"sigs.k8s.io/kind/pkg/build/node"
+	"sigs.k8s.io/kind/pkg/errors"
 )
 
 type flagpole struct {

cmd/kind/create/cluster/createcluster.go

@@ -21,13 +21,12 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 
 	"sigs.k8s.io/kind/pkg/cluster"
 	"sigs.k8s.io/kind/pkg/cluster/create"
+	"sigs.k8s.io/kind/pkg/errors"
 	"sigs.k8s.io/kind/pkg/globals"
-	"sigs.k8s.io/kind/pkg/util"
 )
 
 type flagpole struct {
@@ -77,8 +76,8 @@ func runE(flags *flagpole) error {
 		create.Retain(flags.Retain),
 		create.WaitForReady(flags.Wait),
 	); err != nil {
-		if utilErrors, ok := err.(util.Errors); ok {
-			for _, problem := range utilErrors.Errors() {
+		if errs := errors.Errors(err); errs != nil {
+			for _, problem := range errs {
 				globals.GetLogger().Errorf("%v", problem)
 			}
 			return errors.New("aborting due to invalid configuration")

cmd/kind/delete/cluster/deletecluster.go

@@ -20,8 +20,8 @@ package cluster
 import (
 	"fmt"
 
-	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
+	"sigs.k8s.io/kind/pkg/errors"
 
 	"sigs.k8s.io/kind/pkg/cluster"
 )

cmd/kind/get/kubeconfig/kubeconfig.go

@@ -22,8 +22,8 @@ import (
 	"io"
 	"os"
 
-	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
+	"sigs.k8s.io/kind/pkg/errors"
 
 	"sigs.k8s.io/kind/pkg/cluster"
 	clusternodes "sigs.k8s.io/kind/pkg/cluster/nodes"

cmd/kind/load/docker-image/docker-image.go

@@ -22,8 +22,8 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
+	"sigs.k8s.io/kind/pkg/errors"
 
 	"sigs.k8s.io/kind/pkg/cluster"
 	clusternodes "sigs.k8s.io/kind/pkg/cluster/nodes"

cmd/kind/load/image-archive/image-archive.go

@@ -21,8 +21,8 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
+	"sigs.k8s.io/kind/pkg/errors"
 
 	"sigs.k8s.io/kind/pkg/cluster"
 	clusternodes "sigs.k8s.io/kind/pkg/cluster/nodes"

pkg/build/base/base.go

@@ -22,8 +22,7 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/pkg/errors"
-
+	"sigs.k8s.io/kind/pkg/errors"
 	"sigs.k8s.io/kind/pkg/exec"
 	"sigs.k8s.io/kind/pkg/fs"
 	"sigs.k8s.io/kind/pkg/globals"

pkg/build/node/node.go

@@ -26,12 +26,12 @@ import (
 	"time"
 
 	"github.com/google/uuid"
-	"github.com/pkg/errors"
 
 	"k8s.io/apimachinery/pkg/util/sets"
 	"k8s.io/apimachinery/pkg/util/version"
 
 	"sigs.k8s.io/kind/pkg/container/docker"
+	"sigs.k8s.io/kind/pkg/errors"
 	"sigs.k8s.io/kind/pkg/exec"
 	"sigs.k8s.io/kind/pkg/fs"
 	"sigs.k8s.io/kind/pkg/globals"

pkg/cluster/clusters.go

@@ -17,9 +17,8 @@ limitations under the License.
 package cluster
 
 import (
-	"github.com/pkg/errors"
-
 	"sigs.k8s.io/kind/pkg/cluster/nodes"
+	"sigs.k8s.io/kind/pkg/errors"
 )
 
 // List returns a list of clusters for which node containers exist

pkg/cluster/nodes/create.go

@@ -20,10 +20,10 @@ import (
 	"fmt"
 	"net"
 
-	"github.com/pkg/errors"
 	"sigs.k8s.io/kind/pkg/cluster/constants"
 	"sigs.k8s.io/kind/pkg/container/cri"
 	"sigs.k8s.io/kind/pkg/container/docker"
+	"sigs.k8s.io/kind/pkg/errors"
 	"sigs.k8s.io/kind/pkg/internal/cluster/kubeadm"
 	"sigs.k8s.io/kind/pkg/internal/cluster/loadbalancer"
 )

pkg/cluster/nodes/node.go

@@ -27,11 +27,9 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/pkg/errors"
-
 	"sigs.k8s.io/kind/pkg/cluster/constants"
-
 	"sigs.k8s.io/kind/pkg/container/docker"
+	"sigs.k8s.io/kind/pkg/errors"
 	"sigs.k8s.io/kind/pkg/exec"
 )
 

pkg/cluster/nodes/nodes.go

@@ -21,9 +21,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/pkg/errors"
 	"sigs.k8s.io/kind/pkg/cluster/constants"
-
+	"sigs.k8s.io/kind/pkg/errors"
 	"sigs.k8s.io/kind/pkg/exec"
 )
 

pkg/cluster/nodes/roles.go

@@ -20,9 +20,8 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/pkg/errors"
-
 	"sigs.k8s.io/kind/pkg/cluster/constants"
+	"sigs.k8s.io/kind/pkg/errors"
 )
 
 // SelectNodesByRole returns a list of nodes with the matching role

pkg/cluster/nodes/util.go

@@ -19,9 +19,9 @@ package nodes
 import (
 	"fmt"
 
-	"sigs.k8s.io/kind/pkg/internal/cluster/kubeadm"
+	"sigs.k8s.io/kind/pkg/errors"
 
-	"github.com/pkg/errors"
+	"sigs.k8s.io/kind/pkg/internal/cluster/kubeadm"
 	"sigs.k8s.io/kind/pkg/internal/cluster/loadbalancer"
 )
 

pkg/container/docker/archive.go

@@ -27,7 +27,7 @@ import (
 	"os"
 	"strings"
 
-	"github.com/pkg/errors"
+	"sigs.k8s.io/kind/pkg/errors"
 )
 
 // GetArchiveTags obtains a list of "repo:tag" docker image tags from a

pkg/container/docker/image.go

@@ -20,7 +20,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/pkg/errors"
+	"sigs.k8s.io/kind/pkg/errors"
 	"sigs.k8s.io/kind/pkg/exec"
 )
 

pkg/errors/aggregate.go

@@ -26,7 +26,6 @@ func NewAggregate(errlist []error) error {
 	return WithStack(k8serrors.NewAggregate(errlist))
 }
 
-
 // Errors returns the deepest Aggregate.Errors() in a Cause chain
 // https://github.com/pkg/errors/issues/173
 func Errors(err error) []error {

pkg/exec/local.go

@@ -21,8 +21,7 @@ import (
 	"io"
 	osexec "os/exec"
 
-	"github.com/pkg/errors"
-
+	"sigs.k8s.io/kind/pkg/errors"
 	"sigs.k8s.io/kind/pkg/globals"
 )
 

pkg/internal/apis/config/encoding/scheme.go

@@ -20,13 +20,13 @@ import (
 	"io/ioutil"
 	"os"
 
-	"github.com/pkg/errors"
-
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/serializer"
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 
 	"sigs.k8s.io/kind/pkg/apis/config/v1alpha3"
+	"sigs.k8s.io/kind/pkg/errors"
+
 	"sigs.k8s.io/kind/pkg/internal/apis/config"
 
 	// import conversions

pkg/internal/apis/config/validate.go

@@ -19,9 +19,7 @@ package config
 import (
 	"net"
 
-	"github.com/pkg/errors"
-
-	"sigs.k8s.io/kind/pkg/util"
+	"sigs.k8s.io/kind/pkg/errors"
 )
 
 // Validate returns a ConfigErrors with an entry for each problem
@@ -70,7 +68,7 @@ func (c *Cluster) Validate() error {
 	}
 
 	if len(errs) > 0 {
-		return util.NewErrors(errs)
+		return errors.NewAggregate(errs)
 	}
 	return nil
 }
@@ -104,7 +102,7 @@ func (n *Node) Validate() error {
 	}
 
 	if len(errs) > 0 {
-		return util.NewErrors(errs)
+		return errors.NewAggregate(errs)
 	}
 
 	return nil

pkg/internal/apis/config/validate_test.go

@@ -19,7 +19,7 @@ package config
 import (
 	"testing"
 
-	"sigs.k8s.io/kind/pkg/util"
+	"sigs.k8s.io/kind/pkg/errors"
 )
 
 func TestClusterValidate(t *testing.T) {
@@ -85,16 +85,15 @@ func TestClusterValidate(t *testing.T) {
 				}
 				return
 			}
-			// - not castable to *Errors, in which case we have the wrong error type ...
-			configErrors, ok := err.(util.Errors)
-			if !ok {
+			// - doesn't container errors, in which case we have the wrong error type ...
+			errs := errors.Errors(err)
+			if errs == nil {
 				t.Errorf("config.Validate should only return nil or ConfigErrors{...}, got: %v", err)
 				return
 			}
-			// - ConfigErrors, in which case expect a certain number of errors
-			errors := configErrors.Errors()
-			if len(errors) != tc.ExpectErrors {
-				t.Errorf("expected %d errors but got len(%v) = %d", tc.ExpectErrors, errors, len(errors))
+			// - errors, in which case expect a certain number of errors
+			if len(errs) != tc.ExpectErrors {
+				t.Errorf("expected %d errors but got len(%v) = %d", tc.ExpectErrors, errs, len(errs))
 			}
 		})
 	}
@@ -167,16 +166,15 @@ func TestNodeValidate(t *testing.T) {
 				}
 				return
 			}
-			// - not castable to *Errors, in which case we have the wrong error type ...
-			configErrors, ok := err.(util.Errors)
-			if !ok {
+			// - doesn't container errors, in which case we have the wrong error type ...
+			errs := errors.Errors(err)
+			if errs == nil {
 				t.Errorf("config.Validate should only return nil or ConfigErrors{...}, got: %v", err)
 				return
 			}
-			// - ConfigErrors, in which case expect a certain number of errors
-			errors := configErrors.Errors()
-			if len(errors) != tc.ExpectErrors {
-				t.Errorf("expected %d errors but got len(%v) = %d", tc.ExpectErrors, errors, len(errors))
+			// - errors, in which case expect a certain number of errors
+			if len(errs) != tc.ExpectErrors {
+				t.Errorf("expected %d errors but got len(%v) = %d", tc.ExpectErrors, errs, len(errs))
 			}
 		})
 	}

pkg/internal/build/kube/bazelbuildbits.go

@@ -22,7 +22,7 @@ import (
 	"path"
 	"path/filepath"
 
-	"github.com/pkg/errors"
+	"sigs.k8s.io/kind/pkg/errors"
 	"sigs.k8s.io/kind/pkg/exec"
 	"sigs.k8s.io/kind/pkg/internal/util/env"
 )

pkg/internal/build/kube/bits.go

@@ -17,7 +17,7 @@ limitations under the License.
 package kube
 
 import (
-	"github.com/pkg/errors"
+	"sigs.k8s.io/kind/pkg/errors"
 )
 
 // Bits provides the locations of Kubernetes Binaries / Images

pkg/internal/build/kube/dockerbuildbits.go

@@ -23,8 +23,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/pkg/errors"
-
+	"sigs.k8s.io/kind/pkg/errors"
 	"sigs.k8s.io/kind/pkg/exec"
 	"sigs.k8s.io/kind/pkg/internal/util/env"
 )

pkg/internal/build/kube/source.go

@@ -19,7 +19,7 @@ package kube
 import (
 	"go/build"
 
-	"github.com/pkg/errors"
+	"sigs.k8s.io/kind/pkg/errors"
 )
 
 // ImportPath is the canonical import path for the kubernetes root package

pkg/internal/build/kube/version.go

@@ -22,8 +22,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/pkg/errors"
-
+	"sigs.k8s.io/kind/pkg/errors"
 	"sigs.k8s.io/kind/pkg/exec"
 	"sigs.k8s.io/kind/pkg/globals"
 )

pkg/internal/cluster/context/context.go

@@ -23,10 +23,9 @@ import (
 	"path/filepath"
 	"regexp"
 
-	"github.com/pkg/errors"
-
 	"sigs.k8s.io/kind/pkg/cluster/constants"
 	"sigs.k8s.io/kind/pkg/cluster/nodes"
+	"sigs.k8s.io/kind/pkg/errors"
 	"sigs.k8s.io/kind/pkg/internal/util/env"
 )
 

pkg/internal/cluster/create/actions/config/config.go

@@ -21,10 +21,9 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/pkg/errors"
-
 	"sigs.k8s.io/kind/pkg/cluster/constants"
 	"sigs.k8s.io/kind/pkg/cluster/nodes"
+	"sigs.k8s.io/kind/pkg/errors"
 	"sigs.k8s.io/kind/pkg/globals"
 	"sigs.k8s.io/kind/pkg/internal/apis/config"
 	"sigs.k8s.io/kind/pkg/internal/cluster/create/actions"

pkg/internal/cluster/create/actions/installcni/cni.go

@@ -22,9 +22,9 @@ import (
 	"html/template"
 	"strings"
 
-	"github.com/pkg/errors"
-
 	"sigs.k8s.io/kind/pkg/cluster/nodes"
+	"sigs.k8s.io/kind/pkg/errors"
+
 	"sigs.k8s.io/kind/pkg/internal/cluster/create/actions"
 )
 

pkg/internal/cluster/create/actions/installstorage/storage.go

@@ -21,9 +21,9 @@ package installstorage
 import (
 	"strings"
 
-	"github.com/pkg/errors"
-
 	"sigs.k8s.io/kind/pkg/cluster/nodes"
+	"sigs.k8s.io/kind/pkg/errors"
+
 	"sigs.k8s.io/kind/pkg/internal/cluster/create/actions"
 )
 

pkg/internal/cluster/create/actions/kubeadminit/init.go

@@ -27,11 +27,11 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/pkg/errors"
-
 	"sigs.k8s.io/kind/pkg/cluster/nodes"
+	"sigs.k8s.io/kind/pkg/errors"
 	"sigs.k8s.io/kind/pkg/exec"
 	"sigs.k8s.io/kind/pkg/globals"
+
 	"sigs.k8s.io/kind/pkg/internal/cluster/create/actions"
 	"sigs.k8s.io/kind/pkg/internal/cluster/kubeadm"
 	"sigs.k8s.io/kind/pkg/internal/cluster/loadbalancer"

pkg/internal/cluster/create/actions/kubeadmjoin/join.go

@@ -23,15 +23,15 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/pkg/errors"
-
 	"sigs.k8s.io/kind/pkg/cluster/constants"
 	"sigs.k8s.io/kind/pkg/cluster/nodes"
+	"sigs.k8s.io/kind/pkg/errors"
 	"sigs.k8s.io/kind/pkg/exec"
 	"sigs.k8s.io/kind/pkg/fs"
 	"sigs.k8s.io/kind/pkg/globals"
-	"sigs.k8s.io/kind/pkg/internal/cluster/create/actions"
 	"sigs.k8s.io/kind/pkg/util/concurrent"
+
+	"sigs.k8s.io/kind/pkg/internal/cluster/create/actions"
 )
 
 // Action implements action for creating the kubeadm join

pkg/internal/cluster/create/actions/loadbalancer/loadbalancer.go

@@ -20,11 +20,11 @@ package loadbalancer
 import (
 	"fmt"
 
-	"github.com/pkg/errors"
-
 	"sigs.k8s.io/kind/pkg/cluster/constants"
 	"sigs.k8s.io/kind/pkg/cluster/nodes"
 	"sigs.k8s.io/kind/pkg/container/docker"
+	"sigs.k8s.io/kind/pkg/errors"
+
 	"sigs.k8s.io/kind/pkg/internal/cluster/create/actions"
 	"sigs.k8s.io/kind/pkg/internal/cluster/kubeadm"
 	"sigs.k8s.io/kind/pkg/internal/cluster/loadbalancer"

pkg/internal/cluster/create/nodes.go

@@ -21,15 +21,15 @@ import (
 	"sort"
 	"strings"
 
-	"github.com/pkg/errors"
-
 	"sigs.k8s.io/kind/pkg/cluster/constants"
 	"sigs.k8s.io/kind/pkg/cluster/nodes"
 	"sigs.k8s.io/kind/pkg/container/cri"
+	"sigs.k8s.io/kind/pkg/errors"
+	"sigs.k8s.io/kind/pkg/util/concurrent"
+
 	"sigs.k8s.io/kind/pkg/internal/apis/config"
 	"sigs.k8s.io/kind/pkg/internal/cluster/loadbalancer"
 	"sigs.k8s.io/kind/pkg/internal/util/cli"
-	"sigs.k8s.io/kind/pkg/util/concurrent"
 )
 
 // provisioning order for nodes by role

pkg/internal/cluster/delete/delete.go

@@ -21,10 +21,10 @@ import (
 	"os"
 	"strings"
 
-	"github.com/pkg/errors"
-
 	"sigs.k8s.io/kind/pkg/cluster/nodes"
+	"sigs.k8s.io/kind/pkg/errors"
 	"sigs.k8s.io/kind/pkg/globals"
+
 	"sigs.k8s.io/kind/pkg/internal/cluster/context"
 )
 

pkg/internal/cluster/kubeadm/config.go

@@ -21,8 +21,8 @@ import (
 	"strings"
 	"text/template"
 
-	"github.com/pkg/errors"
 	"k8s.io/apimachinery/pkg/util/version"
+	"sigs.k8s.io/kind/pkg/errors"
 
 	"sigs.k8s.io/kind/pkg/globals"
 )

pkg/internal/cluster/loadbalancer/config.go

@@ -20,7 +20,7 @@ import (
 	"bytes"
 	"text/template"
 
-	"github.com/pkg/errors"
+	"sigs.k8s.io/kind/pkg/errors"
 )
 
 // ConfigData is supplied to the loadbalancer config template

pkg/internal/cluster/logs/logs.go

@@ -22,9 +22,8 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/pkg/errors"
-
 	"sigs.k8s.io/kind/pkg/cluster/nodes"
+	"sigs.k8s.io/kind/pkg/errors"
 	"sigs.k8s.io/kind/pkg/exec"
 	"sigs.k8s.io/kind/pkg/globals"
 	"sigs.k8s.io/kind/pkg/util/concurrent"

pkg/util/concurrent/concurrent.go

@@ -21,7 +21,7 @@ package concurrent
 import (
 	"sync"
 
-	"sigs.k8s.io/kind/pkg/util"
+	"sigs.k8s.io/kind/pkg/errors"
 )
 
 // UntilError runs all funcs in separate goroutines, returning the
@@ -64,7 +64,7 @@ func Coalesce(fns ...func() error) error {
 		}
 	}
 	if len(errs) > 1 {
-		return util.Flatten(errs)
+		return errors.NewAggregate(errs)
 	} else if len(errs) == 1 {
 		return errs[0]
 	}