Move APIs and core code to use metav1.ObjectMeta

pkg/api/types.go

@@ -57,7 +57,7 @@ import (
 
 // ObjectMeta is metadata that all persisted resources must have, which includes all objects
 // users must create.
-// DEPRECATED: Use k8s.io/kubernetes/pkg/apis/meta/v1.ObjectMeta instead - this type will be removed soon.
+// DEPRECATED: Use k8s.io/apimachinery/pkg/apis/meta/v1.ObjectMeta instead - this type will be removed soon.
 type ObjectMeta struct {
 	// Name is unique within a namespace.  Name is required when creating resources, although
 	// some resources may allow a client to request the generation of an appropriate name
@@ -371,7 +371,7 @@ type PersistentVolumeClaimVolumeSource struct {
 type PersistentVolume struct {
 	metav1.TypeMeta
 	// +optional
-	ObjectMeta
+	metav1.ObjectMeta
 
 	//Spec defines a persistent volume owned by the cluster
 	// +optional
@@ -442,7 +442,7 @@ type PersistentVolumeList struct {
 type PersistentVolumeClaim struct {
 	metav1.TypeMeta
 	// +optional
-	ObjectMeta
+	metav1.ObjectMeta
 
 	// Spec defines the volume requested by a pod author
 	// +optional
@@ -1982,7 +1982,7 @@ type PodStatus struct {
 type PodStatusResult struct {
 	metav1.TypeMeta
 	// +optional
-	ObjectMeta
+	metav1.ObjectMeta
 	// Status represents the current information about a pod. This data may not be up
 	// to date.
 	// +optional
@@ -1995,7 +1995,7 @@ type PodStatusResult struct {
 type Pod struct {
 	metav1.TypeMeta
 	// +optional
-	ObjectMeta
+	metav1.ObjectMeta
 
 	// Spec defines the behavior of a pod.
 	// +optional
@@ -2011,7 +2011,7 @@ type Pod struct {
 type PodTemplateSpec struct {
 	// Metadata of the pods created from this template.
 	// +optional
-	ObjectMeta
+	metav1.ObjectMeta
 
 	// Spec defines the behavior of a pod.
 	// +optional
@@ -2024,7 +2024,7 @@ type PodTemplateSpec struct {
 type PodTemplate struct {
 	metav1.TypeMeta
 	// +optional
-	ObjectMeta
+	metav1.ObjectMeta
 
 	// Template defines the pods that will be created from this pod template
 	// +optional
@@ -2129,7 +2129,7 @@ type ReplicationControllerCondition struct {
 type ReplicationController struct {
 	metav1.TypeMeta
 	// +optional
-	ObjectMeta
+	metav1.ObjectMeta
 
 	// Spec defines the desired behavior of this replication controller.
 	// +optional
@@ -2334,7 +2334,7 @@ type ServicePort struct {
 type Service struct {
 	metav1.TypeMeta
 	// +optional
-	ObjectMeta
+	metav1.ObjectMeta
 
 	// Spec defines the behavior of a service.
 	// +optional
@@ -2354,7 +2354,7 @@ type Service struct {
 type ServiceAccount struct {
 	metav1.TypeMeta
 	// +optional
-	ObjectMeta
+	metav1.ObjectMeta
 
 	// Secrets is the list of secrets allowed to be used by pods running using this ServiceAccount
 	Secrets []ObjectReference
@@ -2392,7 +2392,7 @@ type ServiceAccountList struct {
 type Endpoints struct {
 	metav1.TypeMeta
 	// +optional
-	ObjectMeta
+	metav1.ObjectMeta
 
 	// The set of all endpoints is the union of all subsets.
 	Subsets []EndpointSubset
@@ -2714,7 +2714,7 @@ type ResourceList map[ResourceName]resource.Quantity
 type Node struct {
 	metav1.TypeMeta
 	// +optional
-	ObjectMeta
+	metav1.ObjectMeta
 
 	// Spec defines the behavior of a node.
 	// +optional
@@ -2774,7 +2774,7 @@ const (
 type Namespace struct {
 	metav1.TypeMeta
 	// +optional
-	ObjectMeta
+	metav1.ObjectMeta
 
 	// Spec defines the behavior of the Namespace.
 	// +optional
@@ -2799,7 +2799,7 @@ type Binding struct {
 	metav1.TypeMeta
 	// ObjectMeta describes the object that is being bound.
 	// +optional
-	ObjectMeta
+	metav1.ObjectMeta
 
 	// Target is the object to bind to.
 	Target ObjectReference
@@ -3027,7 +3027,7 @@ const (
 type Event struct {
 	metav1.TypeMeta
 	// +optional
-	ObjectMeta
+	metav1.ObjectMeta
 
 	// Required. The object that this event is about.
 	// +optional
@@ -3130,7 +3130,7 @@ type LimitRangeSpec struct {
 type LimitRange struct {
 	metav1.TypeMeta
 	// +optional
-	ObjectMeta
+	metav1.ObjectMeta
 
 	// Spec defines the limits enforced
 	// +optional
@@ -3220,7 +3220,7 @@ type ResourceQuotaStatus struct {
 type ResourceQuota struct {
 	metav1.TypeMeta
 	// +optional
-	ObjectMeta
+	metav1.ObjectMeta
 
 	// Spec defines the desired quota
 	// +optional
@@ -3248,7 +3248,7 @@ type ResourceQuotaList struct {
 type Secret struct {
 	metav1.TypeMeta
 	// +optional
-	ObjectMeta
+	metav1.ObjectMeta
 
 	// Data contains the secret data.  Each key must be a valid DNS_SUBDOMAIN
 	// or leading dot followed by valid DNS_SUBDOMAIN.
@@ -3363,7 +3363,7 @@ type SecretList struct {
 type ConfigMap struct {
 	metav1.TypeMeta
 	// +optional
-	ObjectMeta
+	metav1.ObjectMeta
 
 	// Data contains the configuration data.
 	// Each key must be a valid DNS_SUBDOMAIN with an optional leading dot.
@@ -3446,7 +3446,7 @@ type ComponentCondition struct {
 type ComponentStatus struct {
 	metav1.TypeMeta
 	// +optional
-	ObjectMeta
+	metav1.ObjectMeta
 
 	// +optional
 	Conditions []ComponentCondition
@@ -3525,7 +3525,7 @@ type SELinuxOptions struct {
 type RangeAllocation struct {
 	metav1.TypeMeta
 	// +optional
-	ObjectMeta
+	metav1.ObjectMeta
 	// A string representing a unique label for a range of resources, such as a CIDR "10.0.0.0/8" or
 	// port range "10000-30000". Range is not strongly schema'd here. The Range is expected to define
 	// a start and end unless there is an implicit end.