Merge pull request kubernetes#75270 from justincormack/uuid4

Use UUIDv4 not UUIDv1

Author: k8s-ci-robot

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

@@ -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/Godeps/Godeps.json

@@ -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())
 }