Merge pull request #38406 from liggitt/remove-internal-json-annotations

cmd/kubeadm/app/apis/kubeadm/types.go

@@ -85,6 +85,6 @@ type NodeConfiguration struct {
 type ClusterInfo struct {
 	metav1.TypeMeta
 	// TODO(phase1+) this may become simply `api.Config`
-	CertificateAuthorities []string `json:"certificateAuthorities"`
-	Endpoints              []string `json:"endpoints"`
+	CertificateAuthorities []string
+	Endpoints              []string
 }

cmd/libs/go2idl/client-gen/test_apis/testgroup/BUILD

@@ -15,7 +15,6 @@ go_library(
     srcs = [
         "doc.go",
         "register.go",
-        "types.generated.go",
         "types.go",
     ],
     tags = ["automanaged"],
@@ -24,7 +23,5 @@ go_library(
         "//pkg/apis/meta/v1:go_default_library",
         "//pkg/runtime:go_default_library",
         "//pkg/runtime/schema:go_default_library",
-        "//pkg/types:go_default_library",
-        "//vendor:github.com/ugorji/go/codec",
     ],
 )

cmd/libs/go2idl/client-gen/test_apis/testgroup/types.go

@@ -24,16 +24,16 @@ import (
 // +genclient=true
 
 type TestType struct {
-	metav1.TypeMeta `json:",inline"`
-	api.ObjectMeta  `json:"metadata,omitempty"`
-	Status          TestTypeStatus `json:"status,omitempty"`
+	metav1.TypeMeta
+	api.ObjectMeta
+	Status TestTypeStatus
 }
 
 type TestTypeList struct {
-	metav1.TypeMeta `json:",inline"`
-	metav1.ListMeta `json:"metadata,omitempty"`
+	metav1.TypeMeta
+	metav1.ListMeta
 
-	Items []TestType `json:"items"`
+	Items []TestType
 }
 
 type TestTypeStatus struct {

cmd/libs/go2idl/client-gen/test_apis/testgroup/v1/BUILD

@@ -20,7 +20,6 @@ go_library(
     ],
     tags = ["automanaged"],
     deps = [
-        "//pkg/api:go_default_library",
         "//pkg/api/v1:go_default_library",
         "//pkg/apis/meta/v1:go_default_library",
         "//pkg/runtime:go_default_library",

cmd/libs/go2idl/client-gen/test_apis/testgroup/v1/types.generated.go

@@ -25,7 +25,7 @@ import (
 	"errors"
 	"fmt"
 	codec1978 "github.com/ugorji/go/codec"
-	pkg2_api "k8s.io/kubernetes/pkg/api"
+	pkg2_v1 "k8s.io/kubernetes/pkg/api/v1"
 	pkg1_v1 "k8s.io/kubernetes/pkg/apis/meta/v1"
 	pkg3_types "k8s.io/kubernetes/pkg/types"
 	"reflect"
@@ -63,7 +63,7 @@ func init() {
 		panic(err)
 	}
 	if false { // reference the types, but skip this branch at build/run time
-		var v0 pkg2_api.ObjectMeta
+		var v0 pkg2_v1.ObjectMeta
 		var v1 pkg1_v1.TypeMeta
 		var v2 pkg3_types.UID
 		var v3 time.Time
@@ -264,7 +264,7 @@ func (x *TestType) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
 			}
 		case "metadata":
 			if r.TryDecodeAsNil() {
-				x.ObjectMeta = pkg2_api.ObjectMeta{}
+				x.ObjectMeta = pkg2_v1.ObjectMeta{}
 			} else {
 				yyv20 := &x.ObjectMeta
 				yyv20.CodecDecodeSelf(d)
@@ -334,7 +334,7 @@ func (x *TestType) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
 	}
 	z.DecSendContainerState(codecSelfer_containerArrayElem1234)
 	if r.TryDecodeAsNil() {
-		x.ObjectMeta = pkg2_api.ObjectMeta{}
+		x.ObjectMeta = pkg2_v1.ObjectMeta{}
 	} else {
 		yyv25 := &x.ObjectMeta
 		yyv25.CodecDecodeSelf(d)

cmd/libs/go2idl/client-gen/test_apis/testgroup/v1/types.go

@@ -17,7 +17,7 @@ limitations under the License.
 package v1
 
 import (
-	"k8s.io/kubernetes/pkg/api"
+	apiv1 "k8s.io/kubernetes/pkg/api/v1"
 	metav1 "k8s.io/kubernetes/pkg/apis/meta/v1"
 )
 
@@ -30,7 +30,7 @@ type TestType struct {
 	// unversioned objects in the generate file that is not used anywhere other than this test type.
 	// +k8s:openapi-gen=false
 	// +optional
-	api.ObjectMeta `json:"metadata,omitempty"`
+	apiv1.ObjectMeta `json:"metadata,omitempty"`
 	// +optional
 	Status TestTypeStatus `json:"status,omitempty"`
 }

federation/apis/federation/BUILD

@@ -15,7 +15,6 @@ go_library(
     srcs = [
         "doc.go",
         "register.go",
-        "types.generated.go",
         "types.go",
         "zz_generated.deepcopy.go",
     ],
@@ -26,7 +25,5 @@ go_library(
         "//pkg/conversion:go_default_library",
         "//pkg/runtime:go_default_library",
         "//pkg/runtime/schema:go_default_library",
-        "//pkg/types:go_default_library",
-        "//vendor:github.com/ugorji/go/codec",
     ],
 )

federation/apis/federation/types.go

@@ -24,10 +24,10 @@ import (
 // ServerAddressByClientCIDR helps the client to determine the server address that they should use, depending on the clientCIDR that they match.
 type ServerAddressByClientCIDR struct {
 	// The CIDR with which clients can match their IP to figure out the server address that they should use.
-	ClientCIDR string `json:"clientCIDR" protobuf:"bytes,1,opt,name=clientCIDR"`
+	ClientCIDR string
 	// Address of this server, suitable for a client that matches the above CIDR.
 	// This can be a hostname, hostname:port, IP or IP:port.
-	ServerAddress string `json:"serverAddress" protobuf:"bytes,2,opt,name=serverAddress"`
+	ServerAddress string
 }
 
 // ClusterSpec describes the attributes of a kubernetes cluster.
@@ -36,14 +36,14 @@ type ClusterSpec struct {
 	// This is to help clients reach servers in the most network-efficient way possible.
 	// Clients can use the appropriate server address as per the CIDR that they match.
 	// In case of multiple matches, clients should use the longest matching CIDR.
-	ServerAddressByClientCIDRs []ServerAddressByClientCIDR `json:"serverAddressByClientCIDRs" patchStrategy:"merge" patchMergeKey:"clientCIDR"`
+	ServerAddressByClientCIDRs []ServerAddressByClientCIDR
 	// Name of the secret containing kubeconfig to access this cluster.
 	// The secret is read from the kubernetes cluster that is hosting federation control plane.
 	// Admin needs to ensure that the required secret exists. Secret should be in the same namespace where federation control plane is hosted and it should have kubeconfig in its data with key "kubeconfig".
 	// This will later be changed to a reference to secret in federation control plane when the federation control plane supports secrets.
 	// This can be left empty if the cluster allows insecure access.
 	// +optional
-	SecretRef *api.LocalObjectReference `json:"secretRef,omitempty"`
+	SecretRef *api.LocalObjectReference
 }
 
 type ClusterConditionType string
@@ -59,35 +59,35 @@ const (
 // ClusterCondition describes current state of a cluster.
 type ClusterCondition struct {
 	// Type of cluster condition, Complete or Failed.
-	Type ClusterConditionType `json:"type"`
+	Type ClusterConditionType
 	// Status of the condition, one of True, False, Unknown.
-	Status api.ConditionStatus `json:"status"`
+	Status api.ConditionStatus
 	// Last time the condition was checked.
 	// +optional
-	LastProbeTime metav1.Time `json:"lastProbeTime,omitempty"`
+	LastProbeTime metav1.Time
 	// Last time the condition transit from one status to another.
 	// +optional
-	LastTransitionTime metav1.Time `json:"lastTransitionTime,omitempty"`
+	LastTransitionTime metav1.Time
 	// (brief) reason for the condition's last transition.
 	// +optional
-	Reason string `json:"reason,omitempty"`
+	Reason string
 	// Human readable message indicating details about last transition.
 	// +optional
-	Message string `json:"message,omitempty"`
+	Message string
 }
 
 // ClusterStatus is information about the current status of a cluster updated by cluster controller peridocally.
 type ClusterStatus struct {
 	// Conditions is an array of current cluster conditions.
 	// +optional
-	Conditions []ClusterCondition `json:"conditions,omitempty"`
+	Conditions []ClusterCondition
 	// Zones is the list of availability zones in which the nodes of the cluster exist, e.g. 'us-east1-a'.
 	// These will always be in the same region.
 	// +optional
-	Zones []string `json:"zones,omitempty"`
+	Zones []string
 	// Region is the name of the region in which all of the nodes in the cluster exist.  e.g. 'us-east1'.
 	// +optional
-	Region string `json:"region,omitempty"`
+	Region string
 }
 
 // +genclient=true
@@ -95,30 +95,30 @@ type ClusterStatus struct {
 
 // Information about a registered cluster in a federated kubernetes setup. Clusters are not namespaced and have unique names in the federation.
 type Cluster struct {
-	metav1.TypeMeta `json:",inline"`
+	metav1.TypeMeta
 	// Standard object's metadata.
 	// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
 	// +optional
-	api.ObjectMeta `json:"metadata,omitempty"`
+	api.ObjectMeta
 
 	// Spec defines the behavior of the Cluster.
 	// +optional
-	Spec ClusterSpec `json:"spec,omitempty"`
+	Spec ClusterSpec
 	// Status describes the current status of a Cluster
 	// +optional
-	Status ClusterStatus `json:"status,omitempty"`
+	Status ClusterStatus
 }
 
 // A list of all the kubernetes clusters registered to the federation
 type ClusterList struct {
-	metav1.TypeMeta `json:",inline"`
+	metav1.TypeMeta
 	// Standard list metadata.
 	// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds
 	// +optional
-	metav1.ListMeta `json:"metadata,omitempty"`
+	metav1.ListMeta
 
 	// List of Cluster objects.
-	Items []Cluster `json:"items"`
+	Items []Cluster
 }
 
 // Temporary/alpha structures to support custom replica assignments within FederatedReplicaSet.
@@ -131,24 +131,24 @@ type FederatedReplicaSetPreferences struct {
 	// in order to bring cluster replicasets towards a desired state. Otherwise, if set to false,
 	// up and running replicas will not be moved.
 	// +optional
-	Rebalance bool `json:"rebalance,omitempty"`
+	Rebalance bool
 
 	// A mapping between cluster names and preferences regarding local ReplicaSet in these clusters.
 	// "*" (if provided) applies to all clusters if an explicit mapping is not provided. If there is no
 	// "*" that clusters without explicit preferences should not have any replicas scheduled.
 	// +optional
-	Clusters map[string]ClusterReplicaSetPreferences `json:"clusters,omitempty"`
+	Clusters map[string]ClusterReplicaSetPreferences
 }
 
 // Preferences regarding number of replicas assigned to a cluster replicaset within a federated replicaset.
 type ClusterReplicaSetPreferences struct {
 	// Minimum number of replicas that should be assigned to this Local ReplicaSet. 0 by default.
 	// +optional
-	MinReplicas int64 `json:"minReplicas,omitempty"`
+	MinReplicas int64
 
 	// Maximum number of replicas that should be assigned to this Local ReplicaSet. Unbounded if no value provided (default).
 	// +optional
-	MaxReplicas *int64 `json:"maxReplicas,omitempty"`
+	MaxReplicas *int64
 
 	// A number expressing the preference to put an additional replica to this LocalReplicaSet. 0 by default.
 	Weight int64

pkg/api/BUILD

@@ -26,7 +26,6 @@ go_library(
         "register.go",
         "requestcontext.go",
         "resource_helpers.go",
-        "types.generated.go",
         "types.go",
         "zz_generated.deepcopy.go",
     ],
@@ -53,7 +52,6 @@ go_library(
         "//pkg/util/validation/field:go_default_library",
         "//vendor:github.com/davecgh/go-spew/spew",
         "//vendor:github.com/golang/glog",
-        "//vendor:github.com/ugorji/go/codec",
         "//vendor:golang.org/x/net/context",
     ],
 )

pkg/api/validation/BUILD

@@ -73,8 +73,9 @@ go_test(
         "//pkg/api/service:go_default_library",
         "//pkg/api/testapi:go_default_library",
         "//pkg/api/testing:go_default_library",
+        "//pkg/api/v1:go_default_library",
         "//pkg/apimachinery/registered:go_default_library",
-        "//pkg/apis/extensions:go_default_library",
+        "//pkg/apis/extensions/v1beta1:go_default_library",
         "//pkg/apis/meta/v1:go_default_library",
         "//pkg/apis/storage/util:go_default_library",
         "//pkg/capabilities:go_default_library",

pkg/api/validation/schema_test.go

@@ -27,8 +27,9 @@ import (
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/api/testapi"
 	apitesting "k8s.io/kubernetes/pkg/api/testing"
+	"k8s.io/kubernetes/pkg/api/v1"
 	"k8s.io/kubernetes/pkg/apimachinery/registered"
-	"k8s.io/kubernetes/pkg/apis/extensions"
+	"k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
 	"k8s.io/kubernetes/pkg/runtime"
 	k8syaml "k8s.io/kubernetes/pkg/util/yaml"
 
@@ -171,18 +172,18 @@ func TestValidateDifferentApiVersions(t *testing.T) {
 		t.Fatalf("Failed to load: %v", err)
 	}
 
-	pod := &api.Pod{}
+	pod := &v1.Pod{}
 	pod.APIVersion = "v1"
 	pod.Kind = "Pod"
 
-	deployment := &extensions.Deployment{}
+	deployment := &v1beta1.Deployment{}
 	deployment.APIVersion = "extensions/v1beta1"
 	deployment.Kind = "Deployment"
 
-	list := &api.List{}
+	list := &v1.List{}
 	list.APIVersion = "v1"
 	list.Kind = "List"
-	list.Items = []runtime.Object{pod, deployment}
+	list.Items = []runtime.RawExtension{{Object: pod}, {Object: deployment}}
 	bytes, err := json.Marshal(list)
 	if err != nil {
 		t.Error(err)
@@ -295,7 +296,7 @@ func TestTypeAny(t *testing.T) {
 			t.Errorf("could not read file: %s, err: %v", test, err)
 		}
 		// Verify that pod has at least one label (labels are type "any")
-		var pod api.Pod
+		var pod v1.Pod
 		err = yaml.Unmarshal(podBytes, &pod)
 		if err != nil {
 			t.Errorf("error in unmarshalling pod: %v", err)

pkg/apis/apps/BUILD

@@ -15,20 +15,15 @@ go_library(
     srcs = [
         "doc.go",
         "register.go",
-        "types.generated.go",
         "types.go",
         "zz_generated.deepcopy.go",
     ],
     tags = ["automanaged"],
     deps = [
         "//pkg/api:go_default_library",
-        "//pkg/api/resource:go_default_library",
         "//pkg/apis/meta/v1:go_default_library",
         "//pkg/conversion:go_default_library",
         "//pkg/runtime:go_default_library",
         "//pkg/runtime/schema:go_default_library",
-        "//pkg/types:go_default_library",
-        "//pkg/util/intstr:go_default_library",
-        "//vendor:github.com/ugorji/go/codec",
     ],
 )

pkg/apis/apps/types.go

@@ -30,18 +30,18 @@ import (
 // The StatefulSet guarantees that a given network identity will always
 // map to the same storage identity.
 type StatefulSet struct {
-	metav1.TypeMeta `json:",inline"`
+	metav1.TypeMeta
 	// +optional
-	api.ObjectMeta `json:"metadata,omitempty"`
+	api.ObjectMeta
 
 	// Spec defines the desired identities of pods in this set.
 	// +optional
-	Spec StatefulSetSpec `json:"spec,omitempty"`
+	Spec StatefulSetSpec
 
 	// Status is the current status of Pods in this StatefulSet. This data
 	// may be out of date by some window of time.
 	// +optional
-	Status StatefulSetStatus `json:"status,omitempty"`
+	Status StatefulSetStatus
 }
 
 // A StatefulSetSpec is the specification of a StatefulSet.
@@ -52,19 +52,19 @@ type StatefulSetSpec struct {
 	// If unspecified, defaults to 1.
 	// TODO: Consider a rename of this field.
 	// +optional
-	Replicas int32 `json:"replicas,omitempty"`
+	Replicas int32
 
 	// Selector is a label query over pods that should match the replica count.
 	// If empty, defaulted to labels on the pod template.
 	// More info: http://kubernetes.io/docs/user-guide/labels#label-selectors
 	// +optional
-	Selector *metav1.LabelSelector `json:"selector,omitempty"`
+	Selector *metav1.LabelSelector
 
 	// Template is the object that describes the pod that will be created if
 	// insufficient replicas are detected. Each pod stamped out by the StatefulSet
 	// will fulfill this Template, but have a unique identity from the rest
 	// of the StatefulSet.
-	Template api.PodTemplateSpec `json:"template"`
+	Template api.PodTemplateSpec
 
 	// VolumeClaimTemplates is a list of claims that pods are allowed to reference.
 	// The StatefulSet controller is responsible for mapping network identities to
@@ -74,30 +74,30 @@ type StatefulSetSpec struct {
 	// any volumes in the template, with the same name.
 	// TODO: Define the behavior if a claim already exists with the same name.
 	// +optional
-	VolumeClaimTemplates []api.PersistentVolumeClaim `json:"volumeClaimTemplates,omitempty"`
+	VolumeClaimTemplates []api.PersistentVolumeClaim
 
 	// ServiceName is the name of the service that governs this StatefulSet.
 	// This service must exist before the StatefulSet, and is responsible for
 	// the network identity of the set. Pods get DNS/hostnames that follow the
 	// pattern: pod-specific-string.serviceName.default.svc.cluster.local
 	// where "pod-specific-string" is managed by the StatefulSet controller.
-	ServiceName string `json:"serviceName"`
+	ServiceName string
 }
 
 // StatefulSetStatus represents the current state of a StatefulSet.
 type StatefulSetStatus struct {
 	// most recent generation observed by this autoscaler.
 	// +optional
-	ObservedGeneration *int64 `json:"observedGeneration,omitempty"`
+	ObservedGeneration *int64
 
 	// Replicas is the number of actual replicas.
-	Replicas int32 `json:"replicas"`
+	Replicas int32
 }
 
 // StatefulSetList is a collection of StatefulSets.
 type StatefulSetList struct {
-	metav1.TypeMeta `json:",inline"`
+	metav1.TypeMeta
 	// +optional
-	metav1.ListMeta `json:"metadata,omitempty"`
-	Items           []StatefulSet `json:"items"`
+	metav1.ListMeta
+	Items []StatefulSet
 }

pkg/apis/authentication/BUILD

@@ -15,7 +15,6 @@ go_library(
     srcs = [
         "doc.go",
         "register.go",
-        "types.generated.go",
         "types.go",
         "zz_generated.deepcopy.go",
     ],
@@ -26,7 +25,5 @@ go_library(
         "//pkg/conversion:go_default_library",
         "//pkg/runtime:go_default_library",
         "//pkg/runtime/schema:go_default_library",
-        "//pkg/types:go_default_library",
-        "//vendor:github.com/ugorji/go/codec",
     ],
 )

pkg/apis/authorization/BUILD

@@ -15,7 +15,6 @@ go_library(
     srcs = [
         "doc.go",
         "register.go",
-        "types.generated.go",
         "types.go",
         "zz_generated.deepcopy.go",
     ],
@@ -26,7 +25,5 @@ go_library(
         "//pkg/conversion:go_default_library",
         "//pkg/runtime:go_default_library",
         "//pkg/runtime/schema:go_default_library",
-        "//pkg/types:go_default_library",
-        "//vendor:github.com/ugorji/go/codec",
     ],
 )

pkg/apis/autoscaling/BUILD

@@ -15,7 +15,6 @@ go_library(
     srcs = [
         "doc.go",
         "register.go",
-        "types.generated.go",
         "types.go",
         "zz_generated.deepcopy.go",
     ],
@@ -26,7 +25,5 @@ go_library(
         "//pkg/conversion:go_default_library",
         "//pkg/runtime:go_default_library",
         "//pkg/runtime/schema:go_default_library",
-        "//pkg/types:go_default_library",
-        "//vendor:github.com/ugorji/go/codec",
     ],
 )

pkg/apis/autoscaling/types.go

@@ -23,113 +23,113 @@ import (
 
 // Scale represents a scaling request for a resource.
 type Scale struct {
-	metav1.TypeMeta `json:",inline"`
+	metav1.TypeMeta
 	// Standard object metadata; More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata.
 	// +optional
-	api.ObjectMeta `json:"metadata,omitempty"`
+	api.ObjectMeta
 
 	// defines the behavior of the scale. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status.
 	// +optional
-	Spec ScaleSpec `json:"spec,omitempty"`
+	Spec ScaleSpec
 
 	// current status of the scale. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status. Read-only.
 	// +optional
-	Status ScaleStatus `json:"status,omitempty"`
+	Status ScaleStatus
 }
 
 // ScaleSpec describes the attributes of a scale subresource.
 type ScaleSpec struct {
 	// desired number of instances for the scaled object.
 	// +optional
-	Replicas int32 `json:"replicas,omitempty"`
+	Replicas int32
 }
 
 // ScaleStatus represents the current status of a scale subresource.
 type ScaleStatus struct {
 	// actual number of observed instances of the scaled object.
-	Replicas int32 `json:"replicas"`
+	Replicas int32
 
 	// label query over pods that should match the replicas count. This is same
 	// as the label selector but in the string format to avoid introspection
 	// by clients. The string will be in the same format as the query-param syntax.
 	// More info: http://kubernetes.io/docs/user-guide/labels#label-selectors
 	// +optional
-	Selector string `json:"selector,omitempty"`
+	Selector string
 }
 
 // CrossVersionObjectReference contains enough information to let you identify the referred resource.
 type CrossVersionObjectReference struct {
 	// Kind of the referent; More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#types-kinds"
-	Kind string `json:"kind" protobuf:"bytes,1,opt,name=kind"`
+	Kind string
 	// Name of the referent; More info: http://kubernetes.io/docs/user-guide/identifiers#names
-	Name string `json:"name" protobuf:"bytes,2,opt,name=name"`
+	Name string
 	// API version of the referent
 	// +optional
-	APIVersion string `json:"apiVersion,omitempty" protobuf:"bytes,3,opt,name=apiVersion"`
+	APIVersion string
 }
 
 // specification of a horizontal pod autoscaler.
 type HorizontalPodAutoscalerSpec struct {
 	// reference to scaled resource; horizontal pod autoscaler will learn the current resource consumption
 	// and will set the desired number of pods by using its Scale subresource.
-	ScaleTargetRef CrossVersionObjectReference `json:"scaleTargetRef"`
+	ScaleTargetRef CrossVersionObjectReference
 	// lower limit for the number of pods that can be set by the autoscaler, default 1.
 	// +optional
-	MinReplicas *int32 `json:"minReplicas,omitempty"`
+	MinReplicas *int32
 	// upper limit for the number of pods that can be set by the autoscaler. It cannot be smaller than MinReplicas.
-	MaxReplicas int32 `json:"maxReplicas"`
+	MaxReplicas int32
 	// target average CPU utilization (represented as a percentage of requested CPU) over all the pods;
 	// if not specified the default autoscaling policy will be used.
 	// +optional
-	TargetCPUUtilizationPercentage *int32 `json:"targetCPUUtilizationPercentage,omitempty"`
+	TargetCPUUtilizationPercentage *int32
 }
 
 // current status of a horizontal pod autoscaler
 type HorizontalPodAutoscalerStatus struct {
 	// most recent generation observed by this autoscaler.
 	// +optional
-	ObservedGeneration *int64 `json:"observedGeneration,omitempty"`
+	ObservedGeneration *int64
 
 	// last time the HorizontalPodAutoscaler scaled the number of pods;
 	// used by the autoscaler to control how often the number of pods is changed.
 	// +optional
-	LastScaleTime *metav1.Time `json:"lastScaleTime,omitempty"`
+	LastScaleTime *metav1.Time
 
 	// current number of replicas of pods managed by this autoscaler.
-	CurrentReplicas int32 `json:"currentReplicas"`
+	CurrentReplicas int32
 
 	// desired number of replicas of pods managed by this autoscaler.
-	DesiredReplicas int32 `json:"desiredReplicas"`
+	DesiredReplicas int32
 
 	// current average CPU utilization over all pods, represented as a percentage of requested CPU,
 	// e.g. 70 means that an average pod is using now 70% of its requested CPU.
 	// +optional
-	CurrentCPUUtilizationPercentage *int32 `json:"currentCPUUtilizationPercentage,omitempty"`
+	CurrentCPUUtilizationPercentage *int32
 }
 
 // +genclient=true
 
 // configuration of a horizontal pod autoscaler.
 type HorizontalPodAutoscaler struct {
-	metav1.TypeMeta `json:",inline"`
+	metav1.TypeMeta
 	// +optional
-	api.ObjectMeta `json:"metadata,omitempty"`
+	api.ObjectMeta
 
 	// behaviour of autoscaler. More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status.
 	// +optional
-	Spec HorizontalPodAutoscalerSpec `json:"spec,omitempty"`
+	Spec HorizontalPodAutoscalerSpec
 
 	// current information about the autoscaler.
 	// +optional
-	Status HorizontalPodAutoscalerStatus `json:"status,omitempty"`
+	Status HorizontalPodAutoscalerStatus
 }
 
 // list of horizontal pod autoscaler objects.
 type HorizontalPodAutoscalerList struct {
-	metav1.TypeMeta `json:",inline"`
+	metav1.TypeMeta
 	// +optional
-	metav1.ListMeta `json:"metadata,omitempty"`
+	metav1.ListMeta
 
 	// list of horizontal pod autoscaler objects.
-	Items []HorizontalPodAutoscaler `json:"items"`
+	Items []HorizontalPodAutoscaler
 }

pkg/apis/autoscaling/validation/BUILD

@@ -18,7 +18,7 @@ go_library(
         "//pkg/api/validation:go_default_library",
         "//pkg/api/validation/path:go_default_library",
         "//pkg/apis/autoscaling:go_default_library",
-        "//pkg/apis/extensions:go_default_library",
+        "//pkg/apis/extensions/v1beta1:go_default_library",
         "//pkg/controller/podautoscaler:go_default_library",
         "//pkg/util/validation/field:go_default_library",
     ],

pkg/apis/autoscaling/validation/validation.go

@@ -22,7 +22,7 @@ import (
 	apivalidation "k8s.io/kubernetes/pkg/api/validation"
 	pathvalidation "k8s.io/kubernetes/pkg/api/validation/path"
 	"k8s.io/kubernetes/pkg/apis/autoscaling"
-	"k8s.io/kubernetes/pkg/apis/extensions"
+	"k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
 	"k8s.io/kubernetes/pkg/controller/podautoscaler"
 	"k8s.io/kubernetes/pkg/util/validation/field"
 )
@@ -87,7 +87,7 @@ func validateHorizontalPodAutoscalerAnnotations(annotations map[string]string, f
 	allErrs := field.ErrorList{}
 	if annotationValue, found := annotations[podautoscaler.HpaCustomMetricsTargetAnnotationName]; found {
 		// Try to parse the annotation
-		var targetList extensions.CustomMetricTargetList
+		var targetList v1beta1.CustomMetricTargetList
 		if err := json.Unmarshal([]byte(annotationValue), &targetList); err != nil {
 			allErrs = append(allErrs, field.Invalid(fldPath.Child("annotations"), annotations, "failed to parse custom metrics target annotation"))
 		} else {

pkg/apis/batch/BUILD

@@ -15,20 +15,15 @@ go_library(
     srcs = [
         "doc.go",
         "register.go",
-        "types.generated.go",
         "types.go",
         "zz_generated.deepcopy.go",
     ],
     tags = ["automanaged"],
     deps = [
         "//pkg/api:go_default_library",
-        "//pkg/api/resource:go_default_library",
         "//pkg/apis/meta/v1:go_default_library",
         "//pkg/conversion:go_default_library",
         "//pkg/runtime:go_default_library",
         "//pkg/runtime/schema:go_default_library",
-        "//pkg/types:go_default_library",
-        "//pkg/util/intstr:go_default_library",
-        "//vendor:github.com/ugorji/go/codec",
     ],
 )

pkg/apis/batch/types.go

@@ -25,47 +25,47 @@ import (
 
 // Job represents the configuration of a single job.
 type Job struct {
-	metav1.TypeMeta `json:",inline"`
+	metav1.TypeMeta
 	// Standard object's metadata.
 	// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
 	// +optional
-	api.ObjectMeta `json:"metadata,omitempty"`
+	api.ObjectMeta
 
 	// Spec is a structure defining the expected behavior of a job.
 	// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status
 	// +optional
-	Spec JobSpec `json:"spec,omitempty"`
+	Spec JobSpec
 
 	// Status is a structure describing current status of a job.
 	// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status
 	// +optional
-	Status JobStatus `json:"status,omitempty"`
+	Status JobStatus
 }
 
 // JobList is a collection of jobs.
 type JobList struct {
-	metav1.TypeMeta `json:",inline"`
+	metav1.TypeMeta
 	// Standard list metadata
 	// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
 	// +optional
-	metav1.ListMeta `json:"metadata,omitempty"`
+	metav1.ListMeta
 
 	// Items is the list of Job.
-	Items []Job `json:"items"`
+	Items []Job
 }
 
 // JobTemplate describes a template for creating copies of a predefined pod.
 type JobTemplate struct {
-	metav1.TypeMeta `json:",inline"`
+	metav1.TypeMeta
 	// Standard object's metadata.
 	// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
 	// +optional
-	api.ObjectMeta `json:"metadata,omitempty"`
+	api.ObjectMeta
 
 	// Template defines jobs that will be created from this template
 	// http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status
 	// +optional
-	Template JobTemplateSpec `json:"template,omitempty"`
+	Template JobTemplateSpec
 }
 
 // JobTemplateSpec describes the data a Job should have when created from a template
@@ -73,12 +73,12 @@ type JobTemplateSpec struct {
 	// Standard object's metadata of the jobs created from this template.
 	// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
 	// +optional
-	api.ObjectMeta `json:"metadata,omitempty"`
+	api.ObjectMeta
 
 	// Specification of the desired behavior of the job.
 	// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status
 	// +optional
-	Spec JobSpec `json:"spec,omitempty"`
+	Spec JobSpec
 }
 
 // JobSpec describes how the job execution will look like.
@@ -89,7 +89,7 @@ type JobSpec struct {
 	// be less than this number when ((.spec.completions - .status.successful) < .spec.parallelism),
 	// i.e. when the work left to do is less than max parallelism.
 	// +optional
-	Parallelism *int32 `json:"parallelism,omitempty"`
+	Parallelism *int32
 
 	// Completions specifies the desired number of successfully finished pods the
 	// job should be run with.  Setting to nil means that the success of any
@@ -97,17 +97,17 @@ type JobSpec struct {
 	// value.  Setting to 1 means that parallelism is limited to 1 and the success of that
 	// pod signals the success of the job.
 	// +optional
-	Completions *int32 `json:"completions,omitempty"`
+	Completions *int32
 
 	// Optional duration in seconds relative to the startTime that the job may be active
 	// before the system tries to terminate it; value must be positive integer
 	// +optional
-	ActiveDeadlineSeconds *int64 `json:"activeDeadlineSeconds,omitempty"`
+	ActiveDeadlineSeconds *int64
 
 	// Selector is a label query over pods that should match the pod count.
 	// Normally, the system sets this field for you.
 	// +optional
-	Selector *metav1.LabelSelector `json:"selector,omitempty"`
+	Selector *metav1.LabelSelector
 
 	// ManualSelector controls generation of pod labels and pod selectors.
 	// Leave `manualSelector` unset unless you are certain what you are doing.
@@ -119,11 +119,11 @@ type JobSpec struct {
 	// `manualSelector=true` in jobs that were created with the old `extensions/v1beta1`
 	// API.
 	// +optional
-	ManualSelector *bool `json:"manualSelector,omitempty"`
+	ManualSelector *bool
 
 	// Template is the object that describes the pod that will be created when
 	// executing a job.
-	Template api.PodTemplateSpec `json:"template"`
+	Template api.PodTemplateSpec
 }
 
 // JobStatus represents the current state of a Job.
@@ -131,31 +131,31 @@ type JobStatus struct {
 
 	// Conditions represent the latest available observations of an object's current state.
 	// +optional
-	Conditions []JobCondition `json:"conditions,omitempty" patchStrategy:"merge" patchMergeKey:"type"`
+	Conditions []JobCondition
 
 	// StartTime represents time when the job was acknowledged by the Job Manager.
 	// It is not guaranteed to be set in happens-before order across separate operations.
 	// It is represented in RFC3339 form and is in UTC.
 	// +optional
-	StartTime *metav1.Time `json:"startTime,omitempty"`
+	StartTime *metav1.Time
 
 	// CompletionTime represents time when the job was completed. It is not guaranteed to
 	// be set in happens-before order across separate operations.
 	// It is represented in RFC3339 form and is in UTC.
 	// +optional
-	CompletionTime *metav1.Time `json:"completionTime,omitempty"`
+	CompletionTime *metav1.Time
 
 	// Active is the number of actively running pods.
 	// +optional
-	Active int32 `json:"active,omitempty"`
+	Active int32
 
 	// Succeeded is the number of pods which reached Phase Succeeded.
 	// +optional
-	Succeeded int32 `json:"succeeded,omitempty"`
+	Succeeded int32
 
 	// Failed is the number of pods which reached Phase Failed.
 	// +optional
-	Failed int32 `json:"failed,omitempty"`
+	Failed int32
 }
 
 type JobConditionType string
@@ -171,79 +171,79 @@ const (
 // JobCondition describes current state of a job.
 type JobCondition struct {
 	// Type of job condition, Complete or Failed.
-	Type JobConditionType `json:"type"`
+	Type JobConditionType
 	// Status of the condition, one of True, False, Unknown.
-	Status api.ConditionStatus `json:"status"`
+	Status api.ConditionStatus
 	// Last time the condition was checked.
 	// +optional
-	LastProbeTime metav1.Time `json:"lastProbeTime,omitempty"`
+	LastProbeTime metav1.Time
 	// Last time the condition transit from one status to another.
 	// +optional
-	LastTransitionTime metav1.Time `json:"lastTransitionTime,omitempty"`
+	LastTransitionTime metav1.Time
 	// (brief) reason for the condition's last transition.
 	// +optional
-	Reason string `json:"reason,omitempty"`
+	Reason string
 	// Human readable message indicating details about last transition.
 	// +optional
-	Message string `json:"message,omitempty"`
+	Message string
 }
 
 // +genclient=true
 
 // CronJob represents the configuration of a single cron job.
 type CronJob struct {
-	metav1.TypeMeta `json:",inline"`
+	metav1.TypeMeta
 	// Standard object's metadata.
 	// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
 	// +optional
-	api.ObjectMeta `json:"metadata,omitempty"`
+	api.ObjectMeta
 
 	// Spec is a structure defining the expected behavior of a job, including the schedule.
 	// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status
 	// +optional
-	Spec CronJobSpec `json:"spec,omitempty"`
+	Spec CronJobSpec
 
 	// Status is a structure describing current status of a job.
 	// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#spec-and-status
 	// +optional
-	Status CronJobStatus `json:"status,omitempty"`
+	Status CronJobStatus
 }
 
 // CronJobList is a collection of cron jobs.
 type CronJobList struct {
-	metav1.TypeMeta `json:",inline"`
+	metav1.TypeMeta
 	// Standard list metadata
 	// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
 	// +optional
-	metav1.ListMeta `json:"metadata,omitempty"`
+	metav1.ListMeta
 
 	// Items is the list of CronJob.
-	Items []CronJob `json:"items"`
+	Items []CronJob
 }
 
 // CronJobSpec describes how the job execution will look like and when it will actually run.
 type CronJobSpec struct {
 
 	// Schedule contains the schedule in Cron format, see https://en.wikipedia.org/wiki/Cron.
-	Schedule string `json:"schedule"`
+	Schedule string
 
 	// Optional deadline in seconds for starting the job if it misses scheduled
 	// time for any reason.  Missed jobs executions will be counted as failed ones.
 	// +optional
-	StartingDeadlineSeconds *int64 `json:"startingDeadlineSeconds,omitempty"`
+	StartingDeadlineSeconds *int64
 
 	// ConcurrencyPolicy specifies how to treat concurrent executions of a Job.
 	// +optional
-	ConcurrencyPolicy ConcurrencyPolicy `json:"concurrencyPolicy,omitempty"`
+	ConcurrencyPolicy ConcurrencyPolicy
 
 	// Suspend flag tells the controller to suspend subsequent executions, it does
 	// not apply to already started executions.  Defaults to false.
 	// +optional
-	Suspend *bool `json:"suspend,omitempty"`
+	Suspend *bool
 
 	// JobTemplate is the object that describes the job that will be created when
 	// executing a CronJob.
-	JobTemplate JobTemplateSpec `json:"jobTemplate"`
+	JobTemplate JobTemplateSpec
 }
 
 // ConcurrencyPolicy describes how the job will be handled.
@@ -268,9 +268,9 @@ const (
 type CronJobStatus struct {
 	// Active holds pointers to currently running jobs.
 	// +optional
-	Active []api.ObjectReference `json:"active,omitempty"`
+	Active []api.ObjectReference
 
 	// LastScheduleTime keeps information of when was the last time the job was successfully scheduled.
 	// +optional
-	LastScheduleTime *metav1.Time `json:"lastScheduleTime,omitempty"`
+	LastScheduleTime *metav1.Time
 }

pkg/apis/certificates/BUILD

@@ -15,7 +15,6 @@ go_library(
     srcs = [
         "doc.go",
         "register.go",
-        "types.generated.go",
         "types.go",
         "zz_generated.deepcopy.go",
     ],
@@ -26,7 +25,5 @@ go_library(
         "//pkg/conversion:go_default_library",
         "//pkg/runtime:go_default_library",
         "//pkg/runtime/schema:go_default_library",
-        "//pkg/types:go_default_library",
-        "//vendor:github.com/ugorji/go/codec",
     ],
 )

pkg/apis/certificates/types.go

@@ -26,17 +26,17 @@ import (
 
 // Describes a certificate signing request
 type CertificateSigningRequest struct {
-	metav1.TypeMeta `json:",inline"`
+	metav1.TypeMeta
 	// +optional
-	api.ObjectMeta `json:"metadata,omitempty"`
+	api.ObjectMeta
 
 	// The certificate request itself and any additional information.
 	// +optional
-	Spec CertificateSigningRequestSpec `json:"spec,omitempty"`
+	Spec CertificateSigningRequestSpec
 
 	// Derived information about the request.
 	// +optional
-	Status CertificateSigningRequestStatus `json:"status,omitempty"`
+	Status CertificateSigningRequestStatus
 }
 
 // This information is immutable after the request is created. Only the Request
@@ -44,26 +44,26 @@ type CertificateSigningRequest struct {
 // Kubernetes and cannot be modified by users.
 type CertificateSigningRequestSpec struct {
 	// Base64-encoded PKCS#10 CSR data
-	Request []byte `json:"request"`
+	Request []byte
 
 	// Information about the requesting user (if relevant)
 	// See user.Info interface for details
 	// +optional
-	Username string `json:"username,omitempty"`
+	Username string
 	// +optional
-	UID string `json:"uid,omitempty"`
+	UID string
 	// +optional
-	Groups []string `json:"groups,omitempty"`
+	Groups []string
 }
 
 type CertificateSigningRequestStatus struct {
 	// Conditions applied to the request, such as approval or denial.
 	// +optional
-	Conditions []CertificateSigningRequestCondition `json:"conditions,omitempty"`
+	Conditions []CertificateSigningRequestCondition
 
 	// If request was approved, the controller will place the issued certificate here.
 	// +optional
-	Certificate []byte `json:"certificate,omitempty"`
+	Certificate []byte
 }
 
 type RequestConditionType string
@@ -76,23 +76,23 @@ const (
 
 type CertificateSigningRequestCondition struct {
 	// request approval state, currently Approved or Denied.
-	Type RequestConditionType `json:"type"`
+	Type RequestConditionType
 	// brief reason for the request state
 	// +optional
-	Reason string `json:"reason,omitempty"`
+	Reason string
 	// human readable message with details about the request state
 	// +optional
-	Message string `json:"message,omitempty"`
+	Message string
 	// timestamp for the last update to this condition
 	// +optional
-	LastUpdateTime metav1.Time `json:"lastUpdateTime,omitempty"`
+	LastUpdateTime metav1.Time
 }
 
 type CertificateSigningRequestList struct {
-	metav1.TypeMeta `json:",inline"`
+	metav1.TypeMeta
 	// +optional
-	metav1.ListMeta `json:"metadata,omitempty"`
+	metav1.ListMeta
 
 	// +optional
-	Items []CertificateSigningRequest `json:"items,omitempty"`
+	Items []CertificateSigningRequest
 }

pkg/apis/componentconfig/BUILD

@@ -16,7 +16,6 @@ go_library(
         "doc.go",
         "helpers.go",
         "register.go",
-        "types.generated.go",
         "types.go",
         "zz_generated.deepcopy.go",
     ],
@@ -29,7 +28,6 @@ go_library(
         "//pkg/runtime/schema:go_default_library",
         "//pkg/util/config:go_default_library",
         "//pkg/util/net:go_default_library",
-        "//vendor:github.com/ugorji/go/codec",
     ],
 )
 

pkg/apis/extensions/BUILD

@@ -16,7 +16,6 @@ go_library(
         "doc.go",
         "helpers.go",
         "register.go",
-        "types.generated.go",
         "types.go",
         "zz_generated.deepcopy.go",
     ],
@@ -30,9 +29,7 @@ go_library(
         "//pkg/conversion:go_default_library",
         "//pkg/runtime:go_default_library",
         "//pkg/runtime/schema:go_default_library",
-        "//pkg/types:go_default_library",
         "//pkg/util/intstr:go_default_library",
-        "//vendor:github.com/ugorji/go/codec",
     ],
 )
 

pkg/apis/imagepolicy/BUILD

@@ -15,7 +15,6 @@ go_library(
     srcs = [
         "doc.go",
         "register.go",
-        "types.generated.go",
         "types.go",
         "zz_generated.deepcopy.go",
     ],
@@ -26,7 +25,5 @@ go_library(
         "//pkg/conversion:go_default_library",
         "//pkg/runtime:go_default_library",
         "//pkg/runtime/schema:go_default_library",
-        "//pkg/types:go_default_library",
-        "//vendor:github.com/ugorji/go/codec",
     ],
 )

pkg/apis/policy/BUILD

@@ -15,7 +15,6 @@ go_library(
     srcs = [
         "doc.go",
         "register.go",
-        "types.generated.go",
         "types.go",
         "zz_generated.deepcopy.go",
     ],
@@ -26,8 +25,6 @@ go_library(
         "//pkg/conversion:go_default_library",
         "//pkg/runtime:go_default_library",
         "//pkg/runtime/schema:go_default_library",
-        "//pkg/types:go_default_library",
         "//pkg/util/intstr:go_default_library",
-        "//vendor:github.com/ugorji/go/codec",
     ],
 )

pkg/apis/policy/types.go

@@ -29,12 +29,12 @@ type PodDisruptionBudgetSpec struct {
 	// absence of the evicted pod.  So for example you can prevent all voluntary
 	// evictions by specifying "100%".
 	// +optional
-	MinAvailable intstr.IntOrString `json:"minAvailable,omitempty"`
+	MinAvailable intstr.IntOrString
 
 	// Label query over pods whose evictions are managed by the disruption
 	// budget.
 	// +optional
-	Selector *metav1.LabelSelector `json:"selector,omitempty"`
+	Selector *metav1.LabelSelector
 }
 
 // PodDisruptionBudgetStatus represents information about the status of a
@@ -43,7 +43,7 @@ type PodDisruptionBudgetStatus struct {
 	// Most recent generation observed when updating this PDB status. PodDisruptionsAllowed and other
 	// status informatio is valid only if observedGeneration equals to PDB's object generation.
 	// +optional
-	ObservedGeneration int64 `json:"observedGeneration,omitempty"`
+	ObservedGeneration int64
 
 	// DisruptedPods contains information about pods whose eviction was
 	// processed by the API server eviction subresource handler but has not
@@ -56,43 +56,43 @@ type PodDisruptionBudgetStatus struct {
 	// the list automatically by PodDisruptionBudget controller after some time.
 	// If everything goes smooth this map should be empty for the most of the time.
 	// Large number of entries in the map may indicate problems with pod deletions.
-	DisruptedPods map[string]metav1.Time `json:"disruptedPods" protobuf:"bytes,5,rep,name=disruptedPods"`
+	DisruptedPods map[string]metav1.Time
 
 	// Number of pod disruptions that are currently allowed.
-	PodDisruptionsAllowed int32 `json:"disruptionsAllowed"`
+	PodDisruptionsAllowed int32
 
 	// current number of healthy pods
-	CurrentHealthy int32 `json:"currentHealthy"`
+	CurrentHealthy int32
 
 	// minimum desired number of healthy pods
-	DesiredHealthy int32 `json:"desiredHealthy"`
+	DesiredHealthy int32
 
 	// total number of pods counted by this disruption budget
-	ExpectedPods int32 `json:"expectedPods"`
+	ExpectedPods int32
 }
 
 // +genclient=true
 
 // PodDisruptionBudget is an object to define the max disruption that can be caused to a collection of pods
 type PodDisruptionBudget struct {
-	metav1.TypeMeta `json:",inline"`
+	metav1.TypeMeta
 	// +optional
-	api.ObjectMeta `json:"metadata,omitempty"`
+	api.ObjectMeta
 
 	// Specification of the desired behavior of the PodDisruptionBudget.
 	// +optional
-	Spec PodDisruptionBudgetSpec `json:"spec,omitempty"`
+	Spec PodDisruptionBudgetSpec
 	// Most recently observed status of the PodDisruptionBudget.
 	// +optional
-	Status PodDisruptionBudgetStatus `json:"status,omitempty"`
+	Status PodDisruptionBudgetStatus
 }
 
 // PodDisruptionBudgetList is a collection of PodDisruptionBudgets.
 type PodDisruptionBudgetList struct {
-	metav1.TypeMeta `json:",inline"`
+	metav1.TypeMeta
 	// +optional
-	metav1.ListMeta `json:"metadata,omitempty"`
-	Items           []PodDisruptionBudget `json:"items"`
+	metav1.ListMeta
+	Items []PodDisruptionBudget
 }
 
 // +genclient=true
@@ -102,13 +102,13 @@ type PodDisruptionBudgetList struct {
 // This is a subresource of Pod.  A request to cause such an eviction is
 // created by POSTing to .../pods/<pod name>/eviction.
 type Eviction struct {
-	metav1.TypeMeta `json:",inline"`
+	metav1.TypeMeta
 
 	// ObjectMeta describes the pod that is being evicted.
 	// +optional
-	api.ObjectMeta `json:"metadata,omitempty"`
+	api.ObjectMeta
 
 	// DeleteOptions may be provided
 	// +optional
-	DeleteOptions *api.DeleteOptions `json:"deleteOptions,omitempty"`
+	DeleteOptions *api.DeleteOptions
 }

pkg/apis/storage/BUILD

@@ -15,7 +15,6 @@ go_library(
     srcs = [
         "doc.go",
         "register.go",
-        "types.generated.go",
         "types.go",
         "zz_generated.deepcopy.go",
     ],
@@ -26,7 +25,5 @@ go_library(
         "//pkg/conversion:go_default_library",
         "//pkg/runtime:go_default_library",
         "//pkg/runtime/schema:go_default_library",
-        "//pkg/types:go_default_library",
-        "//vendor:github.com/ugorji/go/codec",
     ],
 )

pkg/apis/storage/types.go

@@ -31,15 +31,15 @@ import (
 // called "profiles" in other storage systems.
 // The name of a StorageClass object is significant, and is how users can request a particular class.
 type StorageClass struct {
-	metav1.TypeMeta `json:",inline"`
+	metav1.TypeMeta
 	// +optional
-	api.ObjectMeta `json:"metadata,omitempty"`
+	api.ObjectMeta
 
 	// provisioner is the driver expected to handle this StorageClass.
 	// This is an optionally-prefixed name, like a label key.
 	// For example: "kubernetes.io/gce-pd" or "kubernetes.io/aws-ebs".
 	// This value may not be empty.
-	Provisioner string `json:"provisioner"`
+	Provisioner string
 
 	// parameters holds parameters for the provisioner.
 	// These values are opaque to the  system and are passed directly
@@ -47,17 +47,17 @@ type StorageClass struct {
 	// not empty.  The maximum number of parameters is
 	// 512, with a cumulative max size of 256K
 	// +optional
-	Parameters map[string]string `json:"parameters,omitempty"`
+	Parameters map[string]string
 }
 
 // StorageClassList is a collection of storage classes.
 type StorageClassList struct {
-	metav1.TypeMeta `json:",inline"`
+	metav1.TypeMeta
 	// Standard list metadata
 	// More info: http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata
 	// +optional
-	metav1.ListMeta `json:"metadata,omitempty"`
+	metav1.ListMeta
 
 	// Items is the list of StorageClasses
-	Items []StorageClass `json:"items"`
+	Items []StorageClass
 }

pkg/apiserver/apiserver_test.go

@@ -39,6 +39,7 @@ import (
 	"k8s.io/kubernetes/pkg/api/meta"
 	"k8s.io/kubernetes/pkg/api/rest"
 	"k8s.io/kubernetes/pkg/api/v1"
+	apiv1 "k8s.io/kubernetes/pkg/api/v1"
 	metav1 "k8s.io/kubernetes/pkg/apis/meta/v1"
 	"k8s.io/kubernetes/pkg/apiserver/filters"
 	"k8s.io/kubernetes/pkg/apiserver/request"
@@ -132,7 +133,7 @@ func addGrouplessTypes() {
 	}
 	api.Scheme.AddKnownTypes(grouplessGroupVersion,
 		&apiservertesting.Simple{}, &apiservertesting.SimpleList{}, &ListOptions{}, &metav1.ExportOptions{},
-		&api.DeleteOptions{}, &apiservertesting.SimpleGetOptions{}, &apiservertesting.SimpleRoot{})
+		&v1.DeleteOptions{}, &apiservertesting.SimpleGetOptions{}, &apiservertesting.SimpleRoot{})
 	api.Scheme.AddKnownTypes(grouplessInternalGroupVersion,
 		&apiservertesting.Simple{}, &apiservertesting.SimpleList{}, &api.ListOptions{}, &metav1.ExportOptions{},
 		&apiservertesting.SimpleGetOptions{}, &apiservertesting.SimpleRoot{})
@@ -150,7 +151,7 @@ func addTestTypes() {
 	}
 	api.Scheme.AddKnownTypes(testGroupVersion,
 		&apiservertesting.Simple{}, &apiservertesting.SimpleList{}, &ListOptions{}, &metav1.ExportOptions{},
-		&api.DeleteOptions{}, &apiservertesting.SimpleGetOptions{}, &apiservertesting.SimpleRoot{},
+		&v1.DeleteOptions{}, &apiservertesting.SimpleGetOptions{}, &apiservertesting.SimpleRoot{},
 		&SimpleXGSubresource{})
 	api.Scheme.AddKnownTypes(testGroupVersion, &v1.Pod{})
 	api.Scheme.AddKnownTypes(testInternalGroupVersion,
@@ -317,7 +318,7 @@ func handleInternal(storage map[string]rest.Storage, admissionControl admission.
 }
 
 func TestSimpleSetupRight(t *testing.T) {
-	s := &apiservertesting.Simple{ObjectMeta: api.ObjectMeta{Name: "aName"}}
+	s := &apiservertesting.Simple{ObjectMeta: apiv1.ObjectMeta{Name: "aName"}}
 	wire, err := runtime.Encode(codec, s)
 	if err != nil {
 		t.Fatal(err)
@@ -470,7 +471,7 @@ func (storage *SimpleRESTStorage) Delete(ctx api.Context, id string, options *ap
 	var obj runtime.Object = &metav1.Status{Status: metav1.StatusSuccess}
 	var err error
 	if storage.injectedFunction != nil {
-		obj, err = storage.injectedFunction(&apiservertesting.Simple{ObjectMeta: api.ObjectMeta{Name: id}})
+		obj, err = storage.injectedFunction(&apiservertesting.Simple{ObjectMeta: apiv1.ObjectMeta{Name: id}})
 	}
 	return obj, err
 }
@@ -1119,7 +1120,7 @@ func TestNonEmptyList(t *testing.T) {
 	simpleStorage := SimpleRESTStorage{
 		list: []apiservertesting.Simple{
 			{
-				ObjectMeta: api.ObjectMeta{Name: "something", Namespace: "other"},
+				ObjectMeta: apiv1.ObjectMeta{Name: "something", Namespace: "other"},
 				Other:      "foo",
 			},
 		},
@@ -1170,7 +1171,7 @@ func TestSelfLinkSkipsEmptyName(t *testing.T) {
 	simpleStorage := SimpleRESTStorage{
 		list: []apiservertesting.Simple{
 			{
-				ObjectMeta: api.ObjectMeta{Namespace: "other"},
+				ObjectMeta: apiv1.ObjectMeta{Namespace: "other"},
 				Other:      "foo",
 			},
 		},
@@ -1244,7 +1245,7 @@ func TestExport(t *testing.T) {
 	storage := map[string]rest.Storage{}
 	simpleStorage := SimpleRESTStorage{
 		item: apiservertesting.Simple{
-			ObjectMeta: api.ObjectMeta{
+			ObjectMeta: apiv1.ObjectMeta{
 				ResourceVersion:   "1234",
 				CreationTimestamp: metav1.NewTime(time.Unix(10, 10)),
 			},
@@ -2177,7 +2178,7 @@ func TestPatch(t *testing.T) {
 	storage := map[string]rest.Storage{}
 	ID := "id"
 	item := &apiservertesting.Simple{
-		ObjectMeta: api.ObjectMeta{
+		ObjectMeta: apiv1.ObjectMeta{
 			Name:      ID,
 			Namespace: "", // update should allow the client to send an empty namespace
 			UID:       "uid",
@@ -2216,7 +2217,7 @@ func TestPatchRequiresMatchingName(t *testing.T) {
 	storage := map[string]rest.Storage{}
 	ID := "id"
 	item := &apiservertesting.Simple{
-		ObjectMeta: api.ObjectMeta{
+		ObjectMeta: apiv1.ObjectMeta{
 			Name:      ID,
 			Namespace: "", // update should allow the client to send an empty namespace
 			UID:       "uid",
@@ -2257,7 +2258,7 @@ func TestUpdate(t *testing.T) {
 	defer server.Close()
 
 	item := &apiservertesting.Simple{
-		ObjectMeta: api.ObjectMeta{
+		ObjectMeta: apiv1.ObjectMeta{
 			Name:      ID,
 			Namespace: "", // update should allow the client to send an empty namespace
 		},
@@ -2294,7 +2295,7 @@ func TestUpdateInvokesAdmissionControl(t *testing.T) {
 	defer server.Close()
 
 	item := &apiservertesting.Simple{
-		ObjectMeta: api.ObjectMeta{
+		ObjectMeta: apiv1.ObjectMeta{
 			Name:      ID,
 			Namespace: api.NamespaceDefault,
 		},
@@ -2356,7 +2357,7 @@ func TestUpdateAllowsMissingNamespace(t *testing.T) {
 	defer server.Close()
 
 	item := &apiservertesting.Simple{
-		ObjectMeta: api.ObjectMeta{
+		ObjectMeta: apiv1.ObjectMeta{
 			Name: ID,
 		},
 		Other: "bar",
@@ -2393,7 +2394,7 @@ func TestUpdateAllowsMismatchedNamespaceOnError(t *testing.T) {
 	defer server.Close()
 
 	item := &apiservertesting.Simple{
-		ObjectMeta: api.ObjectMeta{
+		ObjectMeta: apiv1.ObjectMeta{
 			Name:      ID,
 			Namespace: "other", // does not match request
 		},
@@ -2430,7 +2431,7 @@ func TestUpdatePreventsMismatchedNamespace(t *testing.T) {
 	defer server.Close()
 
 	item := &apiservertesting.Simple{
-		ObjectMeta: api.ObjectMeta{
+		ObjectMeta: apiv1.ObjectMeta{
 			Name:      ID,
 			Namespace: "other",
 		},
@@ -2465,7 +2466,7 @@ func TestUpdateMissing(t *testing.T) {
 	defer server.Close()
 
 	item := &apiservertesting.Simple{
-		ObjectMeta: api.ObjectMeta{
+		ObjectMeta: apiv1.ObjectMeta{
 			Name:      ID,
 			Namespace: api.NamespaceDefault,
 		},
@@ -3226,7 +3227,7 @@ func TestUpdateChecksAPIVersion(t *testing.T) {
 	defer server.Close()
 	client := http.Client{}
 
-	simple := &apiservertesting.Simple{ObjectMeta: api.ObjectMeta{Name: "bar"}}
+	simple := &apiservertesting.Simple{ObjectMeta: apiv1.ObjectMeta{Name: "bar"}}
 	data, err := runtime.Encode(newCodec, simple)
 	if err != nil {
 		t.Fatalf("unexpected error: %v", err)

pkg/apiserver/testing/BUILD

@@ -18,7 +18,7 @@ go_library(
     ],
     tags = ["automanaged"],
     deps = [
-        "//pkg/api:go_default_library",
+        "//pkg/api/v1:go_default_library",
         "//pkg/apis/meta/v1:go_default_library",
         "//pkg/runtime/schema:go_default_library",
         "//pkg/types:go_default_library",

pkg/apiserver/testing/types.generated.go

@@ -25,7 +25,7 @@ import (
 	"errors"
 	"fmt"
 	codec1978 "github.com/ugorji/go/codec"
-	pkg2_api "k8s.io/kubernetes/pkg/api"
+	pkg2_v1 "k8s.io/kubernetes/pkg/api/v1"
 	pkg1_v1 "k8s.io/kubernetes/pkg/apis/meta/v1"
 	pkg3_types "k8s.io/kubernetes/pkg/types"
 	"reflect"
@@ -63,7 +63,7 @@ func init() {
 		panic(err)
 	}
 	if false { // reference the types, but skip this branch at build/run time
-		var v0 pkg2_api.ObjectMeta
+		var v0 pkg2_v1.ObjectMeta
 		var v1 pkg1_v1.TypeMeta
 		var v2 pkg3_types.UID
 		var v3 time.Time
@@ -299,7 +299,7 @@ func (x *Simple) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
 			}
 		case "metadata":
 			if r.TryDecodeAsNil() {
-				x.ObjectMeta = pkg2_api.ObjectMeta{}
+				x.ObjectMeta = pkg2_v1.ObjectMeta{}
 			} else {
 				yyv23 := &x.ObjectMeta
 				yyv23.CodecDecodeSelf(d)
@@ -380,7 +380,7 @@ func (x *Simple) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
 	}
 	z.DecSendContainerState(codecSelfer_containerArrayElem1234)
 	if r.TryDecodeAsNil() {
-		x.ObjectMeta = pkg2_api.ObjectMeta{}
+		x.ObjectMeta = pkg2_v1.ObjectMeta{}
 	} else {
 		yyv30 := &x.ObjectMeta
 		yyv30.CodecDecodeSelf(d)
@@ -667,7 +667,7 @@ func (x *SimpleRoot) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
 			}
 		case "metadata":
 			if r.TryDecodeAsNil() {
-				x.ObjectMeta = pkg2_api.ObjectMeta{}
+				x.ObjectMeta = pkg2_v1.ObjectMeta{}
 			} else {
 				yyv56 := &x.ObjectMeta
 				yyv56.CodecDecodeSelf(d)
@@ -748,7 +748,7 @@ func (x *SimpleRoot) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
 	}
 	z.DecSendContainerState(codecSelfer_containerArrayElem1234)
 	if r.TryDecodeAsNil() {
-		x.ObjectMeta = pkg2_api.ObjectMeta{}
+		x.ObjectMeta = pkg2_v1.ObjectMeta{}
 	} else {
 		yyv63 := &x.ObjectMeta
 		yyv63.CodecDecodeSelf(d)

pkg/apiserver/testing/types.go

@@ -17,14 +17,14 @@ limitations under the License.
 package testing
 
 import (
-	"k8s.io/kubernetes/pkg/api"
+	apiv1 "k8s.io/kubernetes/pkg/api/v1"
 	metav1 "k8s.io/kubernetes/pkg/apis/meta/v1"
 	"k8s.io/kubernetes/pkg/runtime/schema"
 )
 
 type Simple struct {
 	metav1.TypeMeta  `json:",inline"`
-	api.ObjectMeta  `json:"metadata"`
+	apiv1.ObjectMeta `json:"metadata"`
 	// +optional
 	Other string `json:"other,omitempty"`
 	// +optional
@@ -35,7 +35,7 @@ func (obj *Simple) GetObjectKind() schema.ObjectKind { return &obj.TypeMeta }
 
 type SimpleRoot struct {
 	metav1.TypeMeta  `json:",inline"`
-	api.ObjectMeta  `json:"metadata"`
+	apiv1.ObjectMeta `json:"metadata"`
 	// +optional
 	Other string `json:"other,omitempty"`
 	// +optional

pkg/apiserver/watch_test.go

@@ -34,6 +34,7 @@ import (
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/api/rest"
 	apitesting "k8s.io/kubernetes/pkg/api/testing"
+	apiv1 "k8s.io/kubernetes/pkg/api/v1"
 	metav1 "k8s.io/kubernetes/pkg/apis/meta/v1"
 	apiservertesting "k8s.io/kubernetes/pkg/apiserver/testing"
 	"k8s.io/kubernetes/pkg/fields"
@@ -69,9 +70,9 @@ var watchTestTable = []struct {
 	t   watch.EventType
 	obj runtime.Object
 }{
-	{watch.Added, &apiservertesting.Simple{ObjectMeta: api.ObjectMeta{Name: "foo"}}},
-	{watch.Modified, &apiservertesting.Simple{ObjectMeta: api.ObjectMeta{Name: "bar"}}},
-	{watch.Deleted, &apiservertesting.Simple{ObjectMeta: api.ObjectMeta{Name: "bar"}}},
+	{watch.Added, &apiservertesting.Simple{ObjectMeta: apiv1.ObjectMeta{Name: "foo"}}},
+	{watch.Modified, &apiservertesting.Simple{ObjectMeta: apiv1.ObjectMeta{Name: "bar"}}},
+	{watch.Deleted, &apiservertesting.Simple{ObjectMeta: apiv1.ObjectMeta{Name: "bar"}}},
 }
 
 var podWatchTestTable = []struct {

pkg/controller/podautoscaler/horizontal.go

@@ -26,7 +26,7 @@ import (
 	"k8s.io/kubernetes/pkg/api/resource"
 	"k8s.io/kubernetes/pkg/api/v1"
 	autoscaling "k8s.io/kubernetes/pkg/apis/autoscaling/v1"
-	extensions "k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
+	extensionsv1beta1 "k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
 	metav1 "k8s.io/kubernetes/pkg/apis/meta/v1"
 	"k8s.io/kubernetes/pkg/client/cache"
 	unversionedautoscaling "k8s.io/kubernetes/pkg/client/clientset_generated/release_1_5/typed/autoscaling/v1"
@@ -144,7 +144,7 @@ func getLastScaleTime(hpa *autoscaling.HorizontalPodAutoscaler) time.Time {
 	return lastScaleTime.Time
 }
 
-func (a *HorizontalController) computeReplicasForCPUUtilization(hpa *autoscaling.HorizontalPodAutoscaler, scale *extensions.Scale) (int32, *int32, time.Time, error) {
+func (a *HorizontalController) computeReplicasForCPUUtilization(hpa *autoscaling.HorizontalPodAutoscaler, scale *extensionsv1beta1.Scale) (int32, *int32, time.Time, error) {
 	targetUtilization := int32(defaultTargetCPUUtilizationPercentage)
 	if hpa.Spec.TargetCPUUtilizationPercentage != nil {
 		targetUtilization = *hpa.Spec.TargetCPUUtilizationPercentage
@@ -190,7 +190,7 @@ func (a *HorizontalController) computeReplicasForCPUUtilization(hpa *autoscaling
 // Returns number of replicas, metric which required highest number of replicas,
 // status string (also json-serialized extensions.CustomMetricsCurrentStatusList),
 // last timestamp of the metrics involved in computations or error, if occurred.
-func (a *HorizontalController) computeReplicasForCustomMetrics(hpa *autoscaling.HorizontalPodAutoscaler, scale *extensions.Scale,
+func (a *HorizontalController) computeReplicasForCustomMetrics(hpa *autoscaling.HorizontalPodAutoscaler, scale *extensionsv1beta1.Scale,
 	cmAnnotation string) (replicas int32, metric string, status string, timestamp time.Time, err error) {
 
 	if cmAnnotation == "" {
@@ -199,7 +199,7 @@ func (a *HorizontalController) computeReplicasForCustomMetrics(hpa *autoscaling.
 
 	currentReplicas := scale.Status.Replicas
 
-	var targetList extensions.CustomMetricTargetList
+	var targetList extensionsv1beta1.CustomMetricTargetList
 	if err := json.Unmarshal([]byte(cmAnnotation), &targetList); err != nil {
 		a.eventRecorder.Event(hpa, v1.EventTypeWarning, "FailedParseCustomMetricsAnnotation", err.Error())
 		return 0, "", "", time.Time{}, fmt.Errorf("failed to parse custom metrics annotation: %v", err)
@@ -209,8 +209,8 @@ func (a *HorizontalController) computeReplicasForCustomMetrics(hpa *autoscaling.
 		return 0, "", "", time.Time{}, fmt.Errorf("no custom metrics in annotation")
 	}
 
-	statusList := extensions.CustomMetricCurrentStatusList{
-		Items: make([]extensions.CustomMetricCurrentStatus, 0),
+	statusList := extensionsv1beta1.CustomMetricCurrentStatusList{
+		Items: make([]extensionsv1beta1.CustomMetricCurrentStatus, 0),
 	}
 
 	for _, customMetricTarget := range targetList.Items {
@@ -249,7 +249,7 @@ func (a *HorizontalController) computeReplicasForCustomMetrics(hpa *autoscaling.
 			a.eventRecorder.Event(hpa, v1.EventTypeWarning, "FailedSetCustomMetrics", err.Error())
 			return 0, "", "", time.Time{}, fmt.Errorf("failed to set custom metric value: %v", err)
 		}
-		statusList.Items = append(statusList.Items, extensions.CustomMetricCurrentStatus{
+		statusList.Items = append(statusList.Items, extensionsv1beta1.CustomMetricCurrentStatus{
 			Name:         customMetricTarget.Name,
 			CurrentValue: quantity,
 		})

pkg/kubectl/apply.go

@@ -17,8 +17,6 @@ limitations under the License.
 package kubectl
 
 import (
-	"encoding/json"
-
 	"k8s.io/kubernetes/pkg/api/annotations"
 	"k8s.io/kubernetes/pkg/api/meta"
 	"k8s.io/kubernetes/pkg/kubectl/resource"
@@ -96,7 +94,7 @@ func GetModifiedConfiguration(info *resource.Info, annotate bool, codec runtime.
 		accessor.SetAnnotations(annots)
 		// TODO: this needs to be abstracted - there should be no assumption that versioned object
 		// can be marshalled to JSON.
-		modified, err = json.Marshal(info.VersionedObject)
+		modified, err = runtime.Encode(codec, info.VersionedObject)
 		if err != nil {
 			return nil, err
 		}
@@ -106,7 +104,7 @@ func GetModifiedConfiguration(info *resource.Info, annotate bool, codec runtime.
 			accessor.SetAnnotations(annots)
 			// TODO: this needs to be abstracted - there should be no assumption that versioned object
 			// can be marshalled to JSON.
-			modified, err = json.Marshal(info.VersionedObject)
+			modified, err = runtime.Encode(codec, info.VersionedObject)
 			if err != nil {
 				return nil, err
 			}

pkg/kubectl/cmd/BUILD

@@ -198,6 +198,7 @@ go_test(
         "//pkg/runtime/serializer/streaming:go_default_library",
         "//pkg/types:go_default_library",
         "//pkg/util/intstr:go_default_library",
+        "//pkg/util/strategicpatch:go_default_library",
         "//pkg/util/strings:go_default_library",
         "//pkg/util/term:go_default_library",
         "//pkg/util/wait:go_default_library",

pkg/kubectl/cmd/apply.go

@@ -527,14 +527,11 @@ func (p *patcher) patchSimple(obj runtime.Object, modified []byte, source, names
 		return nil, cmdutil.AddSourceToErr(fmt.Sprintf("retrieving original configuration from:\n%v\nfor:", obj), source, err)
 	}
 
-	// Create the versioned struct from the original from the server for
-	// strategic patch.
-	// TODO: Move all structs in apply to use raw data. Can be done once
-	// builder has a RawResult method which delivers raw data instead of
-	// internal objects.
-	versionedObject, _, err := p.decoder.Decode(current, nil, nil)
+	// Create the versioned struct from the type defined in the restmapping
+	// (which is the API version we'll be submitting the patch to)
+	versionedObject, err := api.Scheme.New(p.mapping.GroupVersionKind)
 	if err != nil {
-		return nil, cmdutil.AddSourceToErr(fmt.Sprintf("converting encoded server-side object back to versioned struct:\n%v\nfor:", obj), source, err)
+		return nil, cmdutil.AddSourceToErr(fmt.Sprintf("getting instance of versioned object for %v:", p.mapping.GroupVersionKind), source, err)
 	}
 
 	// Compute a three way strategic merge patch to send to server.

pkg/kubectl/cmd/taint_test.go

@@ -26,11 +26,13 @@ import (
 	"time"
 
 	"k8s.io/kubernetes/pkg/api"
+	"k8s.io/kubernetes/pkg/api/v1"
 	metav1 "k8s.io/kubernetes/pkg/apis/meta/v1"
 	"k8s.io/kubernetes/pkg/client/restclient/fake"
 	cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing"
 	cmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"
 	"k8s.io/kubernetes/pkg/runtime"
+	"k8s.io/kubernetes/pkg/util/strategicpatch"
 )
 
 func generateNodeAndTaintedNode(oldTaints []api.Taint, newTaints []api.Taint) (*api.Node, *api.Node) {
@@ -263,7 +265,33 @@ func TestTaint(t *testing.T) {
 				switch {
 				case m.isFor("GET", "/nodes/node-name"):
 					return &http.Response{StatusCode: 200, Header: defaultHeader(), Body: objBody(codec, oldNode)}, nil
-				case m.isFor("PATCH", "/nodes/node-name"), m.isFor("PUT", "/nodes/node-name"):
+				case m.isFor("PATCH", "/nodes/node-name"):
+					tainted = true
+					data, err := ioutil.ReadAll(req.Body)
+					if err != nil {
+						t.Fatalf("%s: unexpected error: %v", test.description, err)
+					}
+					defer req.Body.Close()
+
+					// apply the patch
+					oldJSON, err := runtime.Encode(codec, oldNode)
+					if err != nil {
+						t.Fatalf("%s: unexpected error: %v", test.description, err)
+					}
+					appliedPatch, err := strategicpatch.StrategicMergePatch(oldJSON, data, &v1.Node{})
+					if err != nil {
+						t.Fatalf("%s: unexpected error: %v", test.description, err)
+					}
+
+					// decode the patch
+					if err := runtime.DecodeInto(codec, appliedPatch, new_node); err != nil {
+						t.Fatalf("%s: unexpected error: %v", test.description, err)
+					}
+					if !AnnotationsHaveEqualTaints(expectNewNode.Annotations, new_node.Annotations) {
+						t.Fatalf("%s: expected:\n%v\nsaw:\n%v\n", test.description, expectNewNode.Annotations, new_node.Annotations)
+					}
+					return &http.Response{StatusCode: 200, Header: defaultHeader(), Body: objBody(codec, new_node)}, nil
+				case m.isFor("PUT", "/nodes/node-name"):
 					tainted = true
 					data, err := ioutil.ReadAll(req.Body)
 					if err != nil {

pkg/kubectl/cmd/util/factory.go

@@ -1252,11 +1252,13 @@ func (f *factory) PrintObject(cmd *cobra.Command, mapper meta.RESTMapper, obj ru
 }
 
 func (f *factory) PrinterForMapping(cmd *cobra.Command, mapping *meta.RESTMapping, withNamespace bool) (kubectl.ResourcePrinter, error) {
-	printer, ok, err := PrinterForCommand(cmd)
+	printer, generic, err := PrinterForCommand(cmd)
 	if err != nil {
 		return nil, err
 	}
-	if ok {
+
+	// Make sure we output versioned data for generic printers
+	if generic {
 		clientConfig, err := f.ClientConfig()
 		if err != nil {
 			return nil, err

pkg/kubectl/cmd/util/helpers.go

@@ -523,18 +523,24 @@ func RecordChangeCause(obj runtime.Object, changeCause string) error {
 // ChangeResourcePatch creates a strategic merge patch between the origin input resource info
 // and the annotated with change-cause input resource info.
 func ChangeResourcePatch(info *resource.Info, changeCause string) ([]byte, error) {
-	oldData, err := json.Marshal(info.Object)
+	// Get a versioned object
+	obj, err := info.Mapping.ConvertToVersion(info.Object, info.Mapping.GroupVersionKind.GroupVersion())
 	if err != nil {
 		return nil, err
 	}
-	if err := RecordChangeCause(info.Object, changeCause); err != nil {
+
+	oldData, err := json.Marshal(obj)
+	if err != nil {
+		return nil, err
+	}
+	if err := RecordChangeCause(obj, changeCause); err != nil {
 		return nil, err
 	}
-	newData, err := json.Marshal(info.Object)
+	newData, err := json.Marshal(obj)
 	if err != nil {
 		return nil, err
 	}
-	return strategicpatch.CreateTwoWayMergePatch(oldData, newData, info.Object)
+	return strategicpatch.CreateTwoWayMergePatch(oldData, newData, obj)
 }
 
 // containsChangeCause checks if input resource info contains change-cause annotation.

pkg/kubectl/resource/visitor.go

@@ -81,9 +81,9 @@ type Info struct {
 	// Optional, this is the provided object in a versioned type before defaulting
 	// and conversions into its corresponding internal type. This is useful for
 	// reflecting on user intent which may be lost after defaulting and conversions.
-	VersionedObject interface{}
+	VersionedObject runtime.Object
 	// Optional, this is the most recent value returned by the server if available
-	runtime.Object
+	Object runtime.Object
 	// Optional, this is the most recent resource version the server knows about for
 	// this type of resource. It may not match the resource version of the object,
 	// but if set it should be equal to or newer than the resource version of the

pkg/kubectl/resource_printer_test.go

@@ -118,24 +118,28 @@ func TestPrinter(t *testing.T) {
 		Format         string
 		FormatArgument string
 		Input          runtime.Object
+		OutputVersions []schema.GroupVersion
 		Expect         string
 	}{
-		{"test json", "json", "", simpleTest, "{\n    \"Data\": \"foo\"\n}\n"},
-		{"test yaml", "yaml", "", simpleTest, "Data: foo\n"},
+		{"test json", "json", "", simpleTest, nil, "{\n    \"Data\": \"foo\"\n}\n"},
+		{"test yaml", "yaml", "", simpleTest, nil, "Data: foo\n"},
 		{"test template", "template", "{{if .id}}{{.id}}{{end}}{{if .metadata.name}}{{.metadata.name}}{{end}}",
-			podTest, "foo"},
-		{"test jsonpath", "jsonpath", "{.metadata.name}", podTest, "foo"},
-		{"test jsonpath list", "jsonpath", "{.items[*].metadata.name}", podListTest, "foo bar"},
-		{"test jsonpath empty list", "jsonpath", "{.items[*].metadata.name}", emptyListTest, ""},
-		{"test name", "name", "", podTest, "pod/foo\n"},
-		{"emits versioned objects", "template", "{{.kind}}", testapi, "Pod"},
+			podTest, []schema.GroupVersion{v1.SchemeGroupVersion}, "foo"},
+		{"test jsonpath", "jsonpath", "{.metadata.name}", podTest, []schema.GroupVersion{v1.SchemeGroupVersion}, "foo"},
+		{"test jsonpath list", "jsonpath", "{.items[*].metadata.name}", podListTest, []schema.GroupVersion{v1.SchemeGroupVersion}, "foo bar"},
+		{"test jsonpath empty list", "jsonpath", "{.items[*].metadata.name}", emptyListTest, []schema.GroupVersion{v1.SchemeGroupVersion}, ""},
+		{"test name", "name", "", podTest, []schema.GroupVersion{v1.SchemeGroupVersion}, "pod/foo\n"},
+		{"emits versioned objects", "template", "{{.kind}}", testapi, []schema.GroupVersion{v1.SchemeGroupVersion}, "Pod"},
 	}
 	for _, test := range printerTests {
 		buf := bytes.NewBuffer([]byte{})
-		printer, found, err := GetPrinter(test.Format, test.FormatArgument, false)
-		if err != nil || !found {
+		printer, generic, err := GetPrinter(test.Format, test.FormatArgument, false)
+		if err != nil {
 			t.Errorf("in %s, unexpected error: %#v", test.Name, err)
 		}
+		if generic && len(test.OutputVersions) > 0 {
+			printer = NewVersionedPrinter(printer, api.Scheme, test.OutputVersions...)
+		}
 		if err := printer.PrintObj(test.Input, buf); err != nil {
 			t.Errorf("in %s, unexpected error: %#v", test.Name, err)
 		}
@@ -496,18 +500,32 @@ func TestTemplateStrings(t *testing.T) {
 
 func TestPrinters(t *testing.T) {
 	om := func(name string) api.ObjectMeta { return api.ObjectMeta{Name: name} }
-	templatePrinter, err := NewTemplatePrinter([]byte("{{.name}}"))
+
+	var (
+		err              error
+		templatePrinter  ResourcePrinter
+		templatePrinter2 ResourcePrinter
+		jsonpathPrinter  ResourcePrinter
+	)
+
+	templatePrinter, err = NewTemplatePrinter([]byte("{{.name}}"))
 	if err != nil {
 		t.Fatal(err)
 	}
-	templatePrinter2, err := NewTemplatePrinter([]byte("{{len .items}}"))
+	templatePrinter = NewVersionedPrinter(templatePrinter, api.Scheme, v1.SchemeGroupVersion)
+
+	templatePrinter2, err = NewTemplatePrinter([]byte("{{len .items}}"))
 	if err != nil {
 		t.Fatal(err)
 	}
-	jsonpathPrinter, err := NewJSONPathPrinter("{.metadata.name}")
+	templatePrinter2 = NewVersionedPrinter(templatePrinter2, api.Scheme, v1.SchemeGroupVersion)
+
+	jsonpathPrinter, err = NewJSONPathPrinter("{.metadata.name}")
 	if err != nil {
 		t.Fatal(err)
 	}
+	jsonpathPrinter = NewVersionedPrinter(jsonpathPrinter, api.Scheme, v1.SchemeGroupVersion)
+
 	printers := map[string]ResourcePrinter{
 		"humanReadable": NewHumanReadablePrinter(PrintOptions{
 			NoHeaders:    true,

pkg/kubectl/sorting_printer.go

@@ -103,7 +103,9 @@ func SortObjects(decoder runtime.Decoder, objs []runtime.Object, fieldInput stri
 		switch u := item.(type) {
 		case *runtime.Unknown:
 			var err error
-			if objs[ix], _, err = decoder.Decode(u.Raw, nil, nil); err != nil {
+			// decode runtime.Unknown to runtime.Unstructured for sorting.
+			// we don't actually want the internal versions of known types.
+			if objs[ix], _, err = decoder.Decode(u.Raw, nil, &runtime.Unstructured{}); err != nil {
 				return nil, err
 			}
 		}

pkg/kubectl/testing/BUILD

@@ -18,7 +18,7 @@ go_library(
     ],
     tags = ["automanaged"],
     deps = [
-        "//pkg/api:go_default_library",
+        "//pkg/api/v1:go_default_library",
         "//pkg/apis/meta/v1:go_default_library",
         "//pkg/runtime/schema:go_default_library",
         "//pkg/types:go_default_library",

pkg/kubectl/testing/types.generated.go

@@ -25,7 +25,7 @@ import (
 	"errors"
 	"fmt"
 	codec1978 "github.com/ugorji/go/codec"
-	pkg2_api "k8s.io/kubernetes/pkg/api"
+	pkg2_v1 "k8s.io/kubernetes/pkg/api/v1"
 	pkg1_v1 "k8s.io/kubernetes/pkg/apis/meta/v1"
 	pkg3_types "k8s.io/kubernetes/pkg/types"
 	"reflect"
@@ -63,7 +63,7 @@ func init() {
 		panic(err)
 	}
 	if false { // reference the types, but skip this branch at build/run time
-		var v0 pkg2_api.ObjectMeta
+		var v0 pkg2_v1.ObjectMeta
 		var v1 pkg1_v1.TypeMeta
 		var v2 pkg3_types.UID
 		var v3 time.Time
@@ -346,7 +346,7 @@ func (x *TestStruct) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
 			}
 		case "metadata":
 			if r.TryDecodeAsNil() {
-				x.ObjectMeta = pkg2_api.ObjectMeta{}
+				x.ObjectMeta = pkg2_v1.ObjectMeta{}
 			} else {
 				yyv29 := &x.ObjectMeta
 				yyv29.CodecDecodeSelf(d)
@@ -451,7 +451,7 @@ func (x *TestStruct) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
 	}
 	z.DecSendContainerState(codecSelfer_containerArrayElem1234)
 	if r.TryDecodeAsNil() {
-		x.ObjectMeta = pkg2_api.ObjectMeta{}
+		x.ObjectMeta = pkg2_v1.ObjectMeta{}
 	} else {
 		yyv40 := &x.ObjectMeta
 		yyv40.CodecDecodeSelf(d)

pkg/kubectl/testing/types.go

@@ -17,7 +17,7 @@ limitations under the License.
 package testing
 
 import (
-	"k8s.io/kubernetes/pkg/api"
+	apiv1 "k8s.io/kubernetes/pkg/api/v1"
 	metav1 "k8s.io/kubernetes/pkg/apis/meta/v1"
 	"k8s.io/kubernetes/pkg/runtime/schema"
 )
@@ -25,7 +25,7 @@ import (
 type TestStruct struct {
 	metav1.TypeMeta `json:",inline"`
 	// +optional
-	api.ObjectMeta `json:"metadata,omitempty"`
+	apiv1.ObjectMeta `json:"metadata,omitempty"`
 	Key              string         `json:"Key"`
 	Map              map[string]int `json:"Map"`
 	StringList       []string       `json:"StringList"`

pkg/registry/extensions/thirdpartyresourcedata/codec.go

@@ -480,7 +480,14 @@ func encodeToJSON(obj *extensions.ThirdPartyResourceData, stream io.Writer) erro
 	if !ok {
 		return fmt.Errorf("unexpected type: %v", objOut)
 	}
-	objMap["metadata"] = obj.ObjectMeta
+
+	// Convert to a serializable type
+	versionedObjectMeta := &v1.ObjectMeta{}
+	if err := v1.Convert_api_ObjectMeta_To_v1_ObjectMeta(&obj.ObjectMeta, versionedObjectMeta, nil); err != nil {
+		return err
+	}
+
+	objMap["metadata"] = versionedObjectMeta
 	encoder := json.NewEncoder(stream)
 	return encoder.Encode(objMap)
 }

pkg/storage/etcd/BUILD

@@ -51,6 +51,7 @@ go_test(
         "//pkg/api:go_default_library",
         "//pkg/api/testapi:go_default_library",
         "//pkg/api/testing:go_default_library",
+        "//pkg/api/v1:go_default_library",
         "//pkg/apimachinery/registered:go_default_library",
         "//pkg/conversion:go_default_library",
         "//pkg/fields:go_default_library",

pkg/storage/etcd/api_object_versioner_test.go

@@ -19,19 +19,19 @@ package etcd
 import (
 	"testing"
 
-	"k8s.io/kubernetes/pkg/api"
+	apiv1 "k8s.io/kubernetes/pkg/api/v1"
 	storagetesting "k8s.io/kubernetes/pkg/storage/testing"
 )
 
 func TestObjectVersioner(t *testing.T) {
 	v := APIObjectVersioner{}
-	if ver, err := v.ObjectResourceVersion(&storagetesting.TestResource{ObjectMeta: api.ObjectMeta{ResourceVersion: "5"}}); err != nil || ver != 5 {
+	if ver, err := v.ObjectResourceVersion(&storagetesting.TestResource{ObjectMeta: apiv1.ObjectMeta{ResourceVersion: "5"}}); err != nil || ver != 5 {
 		t.Errorf("unexpected version: %d %v", ver, err)
 	}
-	if ver, err := v.ObjectResourceVersion(&storagetesting.TestResource{ObjectMeta: api.ObjectMeta{ResourceVersion: "a"}}); err == nil || ver != 0 {
+	if ver, err := v.ObjectResourceVersion(&storagetesting.TestResource{ObjectMeta: apiv1.ObjectMeta{ResourceVersion: "a"}}); err == nil || ver != 0 {
 		t.Errorf("unexpected version: %d %v", ver, err)
 	}
-	obj := &storagetesting.TestResource{ObjectMeta: api.ObjectMeta{ResourceVersion: "a"}}
+	obj := &storagetesting.TestResource{ObjectMeta: apiv1.ObjectMeta{ResourceVersion: "a"}}
 	if err := v.UpdateObject(obj, 5); err != nil {
 		t.Fatalf("unexpected error: %v", err)
 	}
@@ -41,8 +41,8 @@ func TestObjectVersioner(t *testing.T) {
 }
 
 func TestCompareResourceVersion(t *testing.T) {
-	five := &storagetesting.TestResource{ObjectMeta: api.ObjectMeta{ResourceVersion: "5"}}
-	six := &storagetesting.TestResource{ObjectMeta: api.ObjectMeta{ResourceVersion: "6"}}
+	five := &storagetesting.TestResource{ObjectMeta: apiv1.ObjectMeta{ResourceVersion: "5"}}
+	six := &storagetesting.TestResource{ObjectMeta: apiv1.ObjectMeta{ResourceVersion: "6"}}
 
 	versioner := APIObjectVersioner{}
 

pkg/storage/etcd/etcd_helper_test.go

@@ -28,6 +28,7 @@ import (
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/api/testapi"
 	apitesting "k8s.io/kubernetes/pkg/api/testing"
+	apiv1 "k8s.io/kubernetes/pkg/api/v1"
 	"k8s.io/kubernetes/pkg/apimachinery/registered"
 	"k8s.io/kubernetes/pkg/conversion"
 	"k8s.io/kubernetes/pkg/fields"
@@ -300,7 +301,7 @@ func TestGuaranteedUpdate(t *testing.T) {
 	key := "/some/key"
 	helper := newEtcdHelper(server.Client, codec, etcdtest.PathPrefix())
 
-	obj := &storagetesting.TestResource{ObjectMeta: api.ObjectMeta{Name: "foo"}, Value: 1}
+	obj := &storagetesting.TestResource{ObjectMeta: apiv1.ObjectMeta{Name: "foo"}, Value: 1}
 	err := helper.GuaranteedUpdate(context.TODO(), key, &storagetesting.TestResource{}, true, nil, storage.SimpleUpdate(func(in runtime.Object) (runtime.Object, error) {
 		return obj, nil
 	}))
@@ -310,7 +311,7 @@ func TestGuaranteedUpdate(t *testing.T) {
 
 	// Update an existing node.
 	callbackCalled := false
-	objUpdate := &storagetesting.TestResource{ObjectMeta: api.ObjectMeta{Name: "foo"}, Value: 2}
+	objUpdate := &storagetesting.TestResource{ObjectMeta: apiv1.ObjectMeta{Name: "foo"}, Value: 2}
 	err = helper.GuaranteedUpdate(context.TODO(), key, &storagetesting.TestResource{}, true, nil, storage.SimpleUpdate(func(in runtime.Object) (runtime.Object, error) {
 		callbackCalled = true
 
@@ -345,7 +346,7 @@ func TestGuaranteedUpdateNoChange(t *testing.T) {
 	key := "/some/key"
 	helper := newEtcdHelper(server.Client, codec, etcdtest.PathPrefix())
 
-	obj := &storagetesting.TestResource{ObjectMeta: api.ObjectMeta{Name: "foo"}, Value: 1}
+	obj := &storagetesting.TestResource{ObjectMeta: apiv1.ObjectMeta{Name: "foo"}, Value: 1}
 	err := helper.GuaranteedUpdate(context.TODO(), key, &storagetesting.TestResource{}, true, nil, storage.SimpleUpdate(func(in runtime.Object) (runtime.Object, error) {
 		return obj, nil
 	}))
@@ -355,7 +356,7 @@ func TestGuaranteedUpdateNoChange(t *testing.T) {
 
 	// Update an existing node with the same data
 	callbackCalled := false
-	objUpdate := &storagetesting.TestResource{ObjectMeta: api.ObjectMeta{Name: "foo"}, Value: 1}
+	objUpdate := &storagetesting.TestResource{ObjectMeta: apiv1.ObjectMeta{Name: "foo"}, Value: 1}
 	err = helper.GuaranteedUpdate(context.TODO(), key, &storagetesting.TestResource{}, true, nil, storage.SimpleUpdate(func(in runtime.Object) (runtime.Object, error) {
 		callbackCalled = true
 		return objUpdate, nil
@@ -376,7 +377,7 @@ func TestGuaranteedUpdateKeyNotFound(t *testing.T) {
 	helper := newEtcdHelper(server.Client, codec, etcdtest.PathPrefix())
 
 	// Create a new node.
-	obj := &storagetesting.TestResource{ObjectMeta: api.ObjectMeta{Name: "foo"}, Value: 1}
+	obj := &storagetesting.TestResource{ObjectMeta: apiv1.ObjectMeta{Name: "foo"}, Value: 1}
 
 	f := storage.SimpleUpdate(func(in runtime.Object) (runtime.Object, error) {
 		return obj, nil
@@ -424,7 +425,7 @@ func TestGuaranteedUpdate_CreateCollision(t *testing.T) {
 				}
 
 				currValue := in.(*storagetesting.TestResource).Value
-				obj := &storagetesting.TestResource{ObjectMeta: api.ObjectMeta{Name: "foo"}, Value: currValue + 1}
+				obj := &storagetesting.TestResource{ObjectMeta: apiv1.ObjectMeta{Name: "foo"}, Value: currValue + 1}
 				return obj, nil
 			}))
 			if err != nil {

pkg/storage/testing/BUILD

@@ -19,8 +19,8 @@ go_library(
     ],
     tags = ["automanaged"],
     deps = [
-        "//pkg/api:go_default_library",
         "//pkg/api/meta:go_default_library",
+        "//pkg/api/v1:go_default_library",
         "//pkg/apis/meta/v1:go_default_library",
         "//pkg/runtime:go_default_library",
         "//pkg/runtime/schema:go_default_library",

pkg/storage/testing/types.generated.go

@@ -25,7 +25,7 @@ import (
 	"errors"
 	"fmt"
 	codec1978 "github.com/ugorji/go/codec"
-	pkg2_api "k8s.io/kubernetes/pkg/api"
+	pkg2_v1 "k8s.io/kubernetes/pkg/api/v1"
 	pkg1_v1 "k8s.io/kubernetes/pkg/apis/meta/v1"
 	pkg3_types "k8s.io/kubernetes/pkg/types"
 	"reflect"
@@ -63,7 +63,7 @@ func init() {
 		panic(err)
 	}
 	if false { // reference the types, but skip this branch at build/run time
-		var v0 pkg2_api.ObjectMeta
+		var v0 pkg2_v1.ObjectMeta
 		var v1 pkg1_v1.TypeMeta
 		var v2 pkg3_types.UID
 		var v3 time.Time
@@ -258,7 +258,7 @@ func (x *TestResource) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
 			}
 		case "metadata":
 			if r.TryDecodeAsNil() {
-				x.ObjectMeta = pkg2_api.ObjectMeta{}
+				x.ObjectMeta = pkg2_v1.ObjectMeta{}
 			} else {
 				yyv20 := &x.ObjectMeta
 				yyv20.CodecDecodeSelf(d)
@@ -327,7 +327,7 @@ func (x *TestResource) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
 	}
 	z.DecSendContainerState(codecSelfer_containerArrayElem1234)
 	if r.TryDecodeAsNil() {
-		x.ObjectMeta = pkg2_api.ObjectMeta{}
+		x.ObjectMeta = pkg2_v1.ObjectMeta{}
 	} else {
 		yyv25 := &x.ObjectMeta
 		yyv25.CodecDecodeSelf(d)

pkg/storage/testing/types.go

@@ -17,14 +17,14 @@ limitations under the License.
 package testing
 
 import (
-	"k8s.io/kubernetes/pkg/api"
+	apiv1 "k8s.io/kubernetes/pkg/api/v1"
 	metav1 "k8s.io/kubernetes/pkg/apis/meta/v1"
 	"k8s.io/kubernetes/pkg/runtime/schema"
 )
 
 type TestResource struct {
 	metav1.TypeMeta  `json:",inline"`
-	api.ObjectMeta  `json:"metadata"`
+	apiv1.ObjectMeta `json:"metadata"`
 	Value            int `json:"value"`
 }
 

plugin/pkg/scheduler/api/types.go

@@ -25,34 +25,34 @@ import (
 )
 
 type Policy struct {
-	metav1.TypeMeta `json:",inline"`
+	metav1.TypeMeta
 	// Holds the information to configure the fit predicate functions
-	Predicates []PredicatePolicy `json:"predicates"`
+	Predicates []PredicatePolicy
 	// Holds the information to configure the priority functions
-	Priorities []PriorityPolicy `json:"priorities"`
+	Priorities []PriorityPolicy
 	// Holds the information to communicate with the extender(s)
-	ExtenderConfigs []ExtenderConfig `json:"extenders"`
+	ExtenderConfigs []ExtenderConfig
 }
 
 type PredicatePolicy struct {
 	// Identifier of the predicate policy
 	// For a custom predicate, the name can be user-defined
 	// For the Kubernetes provided predicates, the name is the identifier of the pre-defined predicate
-	Name string `json:"name"`
+	Name string
 	// Holds the parameters to configure the given predicate
-	Argument *PredicateArgument `json:"argument"`
+	Argument *PredicateArgument
 }
 
 type PriorityPolicy struct {
 	// Identifier of the priority policy
 	// For a custom priority, the name can be user-defined
 	// For the Kubernetes provided priority functions, the name is the identifier of the pre-defined priority function
-	Name string `json:"name"`
+	Name string
 	// The numeric multiplier for the node scores that the priority function generates
 	// The weight should be a positive integer
-	Weight int `json:"weight"`
+	Weight int
 	// Holds the parameters to configure the given priority function
-	Argument *PriorityArgument `json:"argument"`
+	Argument *PriorityArgument
 }
 
 // Represents the arguments that the different types of predicates take
@@ -60,10 +60,10 @@ type PriorityPolicy struct {
 type PredicateArgument struct {
 	// The predicate that provides affinity for pods belonging to a service
 	// It uses a label to identify nodes that belong to the same "group"
-	ServiceAffinity *ServiceAffinity `json:"serviceAffinity"`
+	ServiceAffinity *ServiceAffinity
 	// The predicate that checks whether a particular node has a certain label
 	// defined or not, regardless of value
-	LabelsPresence *LabelsPresence `json:"labelsPresence"`
+	LabelsPresence *LabelsPresence
 }
 
 // Represents the arguments that the different types of priorities take.
@@ -71,72 +71,72 @@ type PredicateArgument struct {
 type PriorityArgument struct {
 	// The priority function that ensures a good spread (anti-affinity) for pods belonging to a service
 	// It uses a label to identify nodes that belong to the same "group"
-	ServiceAntiAffinity *ServiceAntiAffinity `json:"serviceAntiAffinity"`
+	ServiceAntiAffinity *ServiceAntiAffinity
 	// The priority function that checks whether a particular node has a certain label
 	// defined or not, regardless of value
-	LabelPreference *LabelPreference `json:"labelPreference"`
+	LabelPreference *LabelPreference
 }
 
 // Holds the parameters that are used to configure the corresponding predicate
 type ServiceAffinity struct {
 	// The list of labels that identify node "groups"
 	// All of the labels should match for the node to be considered a fit for hosting the pod
-	Labels []string `json:"labels"`
+	Labels []string
 }
 
 // Holds the parameters that are used to configure the corresponding predicate
 type LabelsPresence struct {
 	// The list of labels that identify node "groups"
 	// All of the labels should be either present (or absent) for the node to be considered a fit for hosting the pod
-	Labels []string `json:"labels"`
+	Labels []string
 	// The boolean flag that indicates whether the labels should be present or absent from the node
-	Presence bool `json:"presence"`
+	Presence bool
 }
 
 // Holds the parameters that are used to configure the corresponding priority function
 type ServiceAntiAffinity struct {
 	// Used to identify node "groups"
-	Label string `json:"label"`
+	Label string
 }
 
 // Holds the parameters that are used to configure the corresponding priority function
 type LabelPreference struct {
 	// Used to identify node "groups"
-	Label string `json:"label"`
+	Label string
 	// This is a boolean flag
 	// If true, higher priority is given to nodes that have the label
 	// If false, higher priority is given to nodes that do not have the label
-	Presence bool `json:"presence"`
+	Presence bool
 }
 
 // Holds the parameters used to communicate with the extender. If a verb is unspecified/empty,
 // it is assumed that the extender chose not to provide that extension.
 type ExtenderConfig struct {
 	// URLPrefix at which the extender is available
-	URLPrefix string `json:"urlPrefix"`
+	URLPrefix string
 	// Verb for the filter call, empty if not supported. This verb is appended to the URLPrefix when issuing the filter call to extender.
-	FilterVerb string `json:"filterVerb,omitempty"`
+	FilterVerb string
 	// Verb for the prioritize call, empty if not supported. This verb is appended to the URLPrefix when issuing the prioritize call to extender.
-	PrioritizeVerb string `json:"prioritizeVerb,omitempty"`
+	PrioritizeVerb string
 	// The numeric multiplier for the node scores that the prioritize call generates.
 	// The weight should be a positive integer
-	Weight int `json:"weight,omitempty"`
+	Weight int
 	// EnableHttps specifies whether https should be used to communicate with the extender
-	EnableHttps bool `json:"enableHttps,omitempty"`
+	EnableHttps bool
 	// TLSConfig specifies the transport layer security config
-	TLSConfig *restclient.TLSClientConfig `json:"tlsConfig,omitempty"`
+	TLSConfig *restclient.TLSClientConfig
 	// HTTPTimeout specifies the timeout duration for a call to the extender. Filter timeout fails the scheduling of the pod. Prioritize
 	// timeout is ignored, k8s/other extenders priorities are used to select the node.
-	HTTPTimeout time.Duration `json:"httpTimeout,omitempty"`
+	HTTPTimeout time.Duration
 }
 
 // ExtenderArgs represents the arguments needed by the extender to filter/prioritize
 // nodes for a pod.
 type ExtenderArgs struct {
 	// Pod being scheduled
-	Pod v1.Pod `json:"pod"`
+	Pod v1.Pod
 	// List of candidate nodes where the pod can be scheduled
-	Nodes v1.NodeList `json:"nodes"`
+	Nodes v1.NodeList
 }
 
 // FailedNodesMap represents the filtered out nodes, with node names and failure messages
@@ -145,19 +145,19 @@ type FailedNodesMap map[string]string
 // ExtenderFilterResult represents the results of a filter call to an extender
 type ExtenderFilterResult struct {
 	// Filtered set of nodes where the pod can be scheduled
-	Nodes v1.NodeList `json:"nodes,omitempty"`
+	Nodes v1.NodeList
 	// Filtered out nodes where the pod can't be scheduled and the failure messages
-	FailedNodes FailedNodesMap `json:"failedNodes,omitempty"`
+	FailedNodes FailedNodesMap
 	// Error message indicating failure
-	Error string `json:"error,omitempty"`
+	Error string
 }
 
 // HostPriority represents the priority of scheduling to a particular host, higher priority is better.
 type HostPriority struct {
 	// Name of the host
-	Host string `json:"host"`
+	Host string
 	// Score associated with the host
-	Score int `json:"score"`
+	Score int
 }
 
 type HostPriorityList []HostPriority