Move util.UID to pkg/types

pkg/api/types.go

@@ -19,6 +19,7 @@ package api
 import (
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/api/resource"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/runtime"
+	"github.com/GoogleCloudPlatform/kubernetes/pkg/types"
 	"github.com/GoogleCloudPlatform/kubernetes/pkg/util"
 )
 
@@ -93,7 +94,7 @@ type ObjectMeta struct {
 	// UID is the unique in time and space value for this object. It is typically generated by
 	// the server on successful creation of a resource and is not allowed to change on PUT
 	// operations.
-	UID util.UID `json:"uid,omitempty"`
+	UID types.UID `json:"uid,omitempty"`
 
 	// An opaque value that represents the version of this resource. May be used for optimistic
 	// concurrency, change detection, and the watch operation on a resource or set of resources.
@@ -1004,12 +1005,12 @@ type OperationList struct {
 
 // ObjectReference contains enough information to let you inspect or modify the referred object.
 type ObjectReference struct {
-	Kind            string   `json:"kind,omitempty"`
-	Namespace       string   `json:"namespace,omitempty"`
-	Name            string   `json:"name,omitempty"`
-	UID             util.UID `json:"uid,omitempty"`
-	APIVersion      string   `json:"apiVersion,omitempty"`
-	ResourceVersion string   `json:"resourceVersion,omitempty"`
+	Kind            string    `json:"kind,omitempty"`
+	Namespace       string    `json:"namespace,omitempty"`
+	Name            string    `json:"name,omitempty"`
+	UID             types.UID `json:"uid,omitempty"`
+	APIVersion      string    `json:"apiVersion,omitempty"`
+	ResourceVersion string    `json:"resourceVersion,omitempty"`
 
 	// Optional. If referring to a piece of an object instead of an entire object, this string
 	// should contain information to identify the sub-object. For example, if the object
@@ -1076,7 +1077,7 @@ type ContainerManifest struct {
 	// TODO: UUID on Manifest is deprecated in the future once we are done
 	// with the API refactoring. It is required for now to determine the instance
 	// of a Pod.
-	UUID          util.UID      `json:"uuid,omitempty"`
+	UUID          types.UID     `json:"uuid,omitempty"`
 	Volumes       []Volume      `json:"volumes"`
 	Containers    []Container   `json:"containers"`
 	RestartPolicy RestartPolicy `json:"restartPolicy,omitempty"`