Skip to content

Commit

Permalink
Merge pull request #17911 from Juneezee/remove-extra-uuid-dep
Browse files Browse the repository at this point in the history
Remove extra `github.com/pborman/uuid` dependency
  • Loading branch information
spowelljr authored Feb 2, 2024
2 parents 25e2a1c + a8ce9d3 commit 9113ab5
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 5 deletions.
1 change: 0 additions & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ require (
github.com/opencontainers/go-digest v1.0.0
github.com/opencontainers/runc v1.1.12
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
Expand Down
2 changes: 0 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand Down
4 changes: 2 additions & 2 deletions pkg/minikube/registry/drvs/hyperkit/hyperkit.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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{
Expand Down

0 comments on commit 9113ab5

Please sign in to comment.