Merge pull request #75270 from justincormack/uuid4

staging/src/k8s.io/apiextensions-apiserver/Godeps/Godeps.json

@@ -471,6 +471,10 @@
 			"Rev": "24818f796faf91cd76ec7bddd72458fbced7a6c1"
 		},
 		{
+			"ImportPath": "github.com/google/uuid",
+			"Rev": "8c31c18f31ede9fc8eae72290a7e7a8064e9b3e3"
+		},
+		{
 			"ImportPath": "github.com/googleapis/gnostic/OpenAPIv2",
 			"Rev": "0c5108395e2debce0d731cf0287ddf7242066aba"
 		},

staging/src/k8s.io/apimachinery/Godeps/Godeps.json

@@ -63,6 +63,10 @@
 			"Rev": "24818f796faf91cd76ec7bddd72458fbced7a6c1"
 		},
 		{
+			"ImportPath": "github.com/google/uuid",
+			"Rev": "8c31c18f31ede9fc8eae72290a7e7a8064e9b3e3"
+		},
+		{
 			"ImportPath": "github.com/googleapis/gnostic/OpenAPIv2",
 			"Rev": "0c5108395e2debce0d731cf0287ddf7242066aba"
 		},
@@ -99,10 +103,6 @@
 			"Rev": "cca7078d478f8520f85629ad7c68962d31ed7682"
 		},
 		{
-			"ImportPath": "github.com/pborman/uuid",
-			"Rev": "ca53cad383cad2479bbba7f7a1a05797ec1386e4"
-		},
-		{
 			"ImportPath": "github.com/pmezard/go-difflib/difflib",
 			"Rev": "5d4384ee4fb2527b0a1256a821ebfc92f91efefc"
 		},

staging/src/k8s.io/apimachinery/pkg/util/uuid/BUILD

@@ -12,7 +12,7 @@ go_library(
     importpath = "k8s.io/apimachinery/pkg/util/uuid",
     deps = [
         "//staging/src/k8s.io/apimachinery/pkg/types:go_default_library",
-        "//vendor/github.com/pborman/uuid:go_default_library",
+        "//vendor/github.com/google/uuid:go_default_library",
     ],
 )
 

staging/src/k8s.io/apimachinery/pkg/util/uuid/uuid.go

@@ -17,27 +17,11 @@ limitations under the License.
 package uuid
 
 import (
-	"sync"
-
-	"github.com/pborman/uuid"
+	"github.com/google/uuid"
 
 	"k8s.io/apimachinery/pkg/types"
 )
 
-var uuidLock sync.Mutex
-var lastUUID uuid.UUID
-
 func NewUUID() types.UID {
-	uuidLock.Lock()
-	defer uuidLock.Unlock()
-	result := uuid.NewUUID()
-	// The UUID package is naive and can generate identical UUIDs if the
-	// time interval is quick enough.
-	// The UUID uses 100 ns increments so it's short enough to actively
-	// wait for a new value.
-	for uuid.Equal(lastUUID, result) == true {
-		result = uuid.NewUUID()
-	}
-	lastUUID = result
-	return types.UID(result.String())
+	return types.UID(uuid.New().String())
 }

staging/src/k8s.io/apiserver/Godeps/Godeps.json

@@ -451,6 +451,10 @@
 			"Rev": "24818f796faf91cd76ec7bddd72458fbced7a6c1"
 		},
 		{
+			"ImportPath": "github.com/google/uuid",
+			"Rev": "8c31c18f31ede9fc8eae72290a7e7a8064e9b3e3"
+		},
+		{
 			"ImportPath": "github.com/googleapis/gnostic/OpenAPIv2",
 			"Rev": "0c5108395e2debce0d731cf0287ddf7242066aba"
 		},

staging/src/k8s.io/kube-aggregator/Godeps/Godeps.json

@@ -143,6 +143,10 @@
 			"Rev": "24818f796faf91cd76ec7bddd72458fbced7a6c1"
 		},
 		{
+			"ImportPath": "github.com/google/uuid",
+			"Rev": "8c31c18f31ede9fc8eae72290a7e7a8064e9b3e3"
+		},
+		{
 			"ImportPath": "github.com/googleapis/gnostic/OpenAPIv2",
 			"Rev": "0c5108395e2debce0d731cf0287ddf7242066aba"
 		},

staging/src/k8s.io/sample-apiserver/Godeps/Godeps.json

@@ -135,6 +135,10 @@
 			"Rev": "24818f796faf91cd76ec7bddd72458fbced7a6c1"
 		},
 		{
+			"ImportPath": "github.com/google/uuid",
+			"Rev": "8c31c18f31ede9fc8eae72290a7e7a8064e9b3e3"
+		},
+		{
 			"ImportPath": "github.com/googleapis/gnostic/OpenAPIv2",
 			"Rev": "0c5108395e2debce0d731cf0287ddf7242066aba"
 		},