Remove extra github.com/pborman/uuid dependency

Currently we are using two UUID packages: 1. github.com/pborman/uuid 2. github.com/google/uuid `github.com/pborman/uuid` is no longer being actively maintained (last release was 2019). In addition, `github.com/pborman/uuid` uses `github.com/google/uuid` internally, so it is safe to replace. Signed-off-by: Eng Zer Jun <[email protected]>
kubernetes · Feb 1, 2024 · a8ce9d3 · a8ce9d3
1 parent 5896cc2
commit a8ce9d3
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 5 deletions.
diff --git a/go.mod b/go.mod
@@ -48,7 +48,6 @@ require (
 	github.com/opencontainers/go-digest v1.0.0
 	github.com/opencontainers/runc v1.1.11
 	github.com/otiai10/copy v1.14.0
-	github.com/pborman/uuid v1.2.1
 	github.com/phayes/freeport v0.0.0-20180830031419-95f893ade6f2
 	github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8
 	github.com/pkg/errors v0.9.1

diff --git a/go.sum b/go.sum
@@ -1348,8 +1348,6 @@ github.com/otiai10/mint v1.5.1 h1:XaPLeE+9vGbuyEHem1JNk3bYc7KKqyI/na0/mLd/Kks=
 github.com/otiai10/mint v1.5.1/go.mod h1:MJm72SBthJjz8qhefc4z1PYEieWmy8Bku7CjcAqyUSM=
 github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
 github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
-github.com/pborman/uuid v1.2.1 h1:+ZZIw58t/ozdjRaXh/3awHfmWRbzYxJoAdNJxe/3pvw=
-github.com/pborman/uuid v1.2.1/go.mod h1:X/NO0urCmaxf9VXbdlT7C2Yzkj2IKimNn4k+gtPdI/k=
 github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
 github.com/pelletier/go-toml v1.7.0/go.mod h1:vwGMzjaWMwyfHwgIBhI2YUM4fB6nL6lVAvS1LBMMhTE=
 github.com/pelletier/go-toml v1.8.1/go.mod h1:T2/BmBdy8dvIRq1a/8aqjN41wvWlN4lrapLU/GW4pbc=

diff --git a/pkg/minikube/registry/drvs/hyperkit/hyperkit.go b/pkg/minikube/registry/drvs/hyperkit/hyperkit.go
@@ -28,7 +28,7 @@ import (
 	"github.com/pkg/errors"
 
 	"github.com/docker/machine/libmachine/drivers"
-	"github.com/pborman/uuid"
+	"github.com/google/uuid"
 
 	"k8s.io/minikube/pkg/drivers/hyperkit"
 	"k8s.io/minikube/pkg/minikube/config"
@@ -62,7 +62,7 @@ func init() {
 func configure(cfg config.ClusterConfig, n config.Node) (interface{}, error) {
 	u := cfg.UUID
 	if u == "" {
-		u = uuid.NewUUID().String()
+		u = uuid.NewString()
 	}
 
 	return &hyperkit.Driver{