Remove vestiges of defaulting from conversion path, switch to top-level default registration only

pkg/api/BUILD

@@ -12,7 +12,6 @@ go_library(
     name = "go_default_library",
     srcs = [
         "annotation_key_constants.go",
-        "defaults.go",
         "doc.go",
         "field_constants.go",
         "json.go",

pkg/api/defaulting_test.go

@@ -83,6 +83,8 @@ func TestDefaulting(t *testing.T) {
 		{Group: "apps", Version: "v1beta1", Kind: "StatefulSetList"}:                              {},
 		{Group: "autoscaling", Version: "v1", Kind: "HorizontalPodAutoscaler"}:                    {},
 		{Group: "autoscaling", Version: "v1", Kind: "HorizontalPodAutoscalerList"}:                {},
+		{Group: "autoscaling", Version: "v2alpha1", Kind: "HorizontalPodAutoscaler"}:              {},
+		{Group: "autoscaling", Version: "v2alpha1", Kind: "HorizontalPodAutoscalerList"}:          {},
 		{Group: "batch", Version: "v1", Kind: "Job"}:                                              {},
 		{Group: "batch", Version: "v1", Kind: "JobList"}:                                          {},
 		{Group: "batch", Version: "v2alpha1", Kind: "CronJob"}:                                    {},
@@ -117,6 +119,8 @@ func TestDefaulting(t *testing.T) {
 		{Group: "rbac.authorization.k8s.io", Version: "v1beta1", Kind: "ClusterRoleBindingList"}:  {},
 		{Group: "rbac.authorization.k8s.io", Version: "v1beta1", Kind: "RoleBinding"}:             {},
 		{Group: "rbac.authorization.k8s.io", Version: "v1beta1", Kind: "RoleBindingList"}:         {},
+		{Group: "settings.k8s.io", Version: "v1alpha1", Kind: "PodPreset"}:                        {},
+		{Group: "settings.k8s.io", Version: "v1alpha1", Kind: "PodPresetList"}:                    {},
 	}
 
 	f := fuzz.New().NilChance(.5).NumElements(1, 1).RandSource(rand.NewSource(1))

pkg/api/register.go

@@ -68,7 +68,7 @@ func Resource(resource string) schema.GroupResource {
 }
 
 var (
-	SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes, addDefaultingFuncs)
+	SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes)
 	AddToScheme   = SchemeBuilder.AddToScheme
 )
 

pkg/api/v1/conversion_test.go

@@ -207,12 +207,17 @@ func TestResourceListConversion(t *testing.T) {
 
 	for i, test := range tests {
 		output := api.ResourceList{}
+
+		// defaulting is a separate step from conversion that is applied when reading from the API or from etcd.
+		// perform that step explicitly.
+		v1.SetDefaults_ResourceList(&test.input)
+
 		err := api.Scheme.Convert(&test.input, &output, nil)
 		if err != nil {
 			t.Fatalf("unexpected error for case %d: %v", i, err)
 		}
 		if !apiequality.Semantic.DeepEqual(test.expected, output) {
-			t.Errorf("unexpected conversion for case %d: Expected %+v; Got %+v", i, test.expected, output)
+			t.Errorf("unexpected conversion for case %d: Expected\n%+v;\nGot\n%+v", i, test.expected, output)
 		}
 	}
 }

pkg/api/v1/defaults.go

@@ -24,37 +24,7 @@ import (
 )
 
 func addDefaultingFuncs(scheme *runtime.Scheme) error {
-	RegisterDefaults(scheme)
-	return scheme.AddDefaultingFuncs(
-		SetDefaults_PodExecOptions,
-		SetDefaults_PodAttachOptions,
-		SetDefaults_ReplicationController,
-		SetDefaults_Volume,
-		SetDefaults_ContainerPort,
-		SetDefaults_Container,
-		SetDefaults_ServiceSpec,
-		SetDefaults_Pod,
-		SetDefaults_PodSpec,
-		SetDefaults_Probe,
-		SetDefaults_SecretVolumeSource,
-		SetDefaults_ConfigMapVolumeSource,
-		SetDefaults_DownwardAPIVolumeSource,
-		SetDefaults_ProjectedVolumeSource,
-		SetDefaults_Secret,
-		SetDefaults_PersistentVolume,
-		SetDefaults_PersistentVolumeClaim,
-		SetDefaults_ISCSIVolumeSource,
-		SetDefaults_Endpoints,
-		SetDefaults_HTTPGetAction,
-		SetDefaults_NamespaceStatus,
-		SetDefaults_Node,
-		SetDefaults_NodeStatus,
-		SetDefaults_ObjectFieldSelector,
-		SetDefaults_LimitRangeItem,
-		SetDefaults_ConfigMap,
-		SetDefaults_RBDVolumeSource,
-		SetDefaults_ResourceList,
-	)
+	return RegisterDefaults(scheme)
 }
 
 func SetDefaults_ResourceList(obj *ResourceList) {

pkg/apis/abac/v1beta1/register.go

@@ -40,7 +40,7 @@ func init() {
 }
 
 var (
-	SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes, addConversionFuncs)
+	SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes, addConversionFuncs, RegisterDefaults)
 	AddToScheme   = SchemeBuilder.AddToScheme
 )
 

pkg/apis/apps/v1beta1/defaults.go

@@ -23,11 +23,7 @@ import (
 )
 
 func addDefaultingFuncs(scheme *runtime.Scheme) error {
-	RegisterDefaults(scheme)
-	return scheme.AddDefaultingFuncs(
-		SetDefaults_StatefulSet,
-		SetDefaults_Deployment,
-	)
+	return RegisterDefaults(scheme)
 }
 
 func SetDefaults_StatefulSet(obj *StatefulSet) {

pkg/apis/authentication/v1/defaults.go

@@ -21,5 +21,5 @@ import (
 )
 
 func addDefaultingFuncs(scheme *runtime.Scheme) error {
-	return scheme.AddDefaultingFuncs()
+	return RegisterDefaults(scheme)
 }

pkg/apis/authentication/v1beta1/defaults.go

@@ -21,5 +21,5 @@ import (
 )
 
 func addDefaultingFuncs(scheme *runtime.Scheme) error {
-	return scheme.AddDefaultingFuncs()
+	return RegisterDefaults(scheme)
 }

pkg/apis/authorization/v1/defaults.go

@@ -21,5 +21,5 @@ import (
 )
 
 func addDefaultingFuncs(scheme *runtime.Scheme) error {
-	return scheme.AddDefaultingFuncs()
+	return RegisterDefaults(scheme)
 }

pkg/apis/authorization/v1beta1/defaults.go

@@ -21,5 +21,5 @@ import (
 )
 
 func addDefaultingFuncs(scheme *runtime.Scheme) error {
-	return scheme.AddDefaultingFuncs()
+	return RegisterDefaults(scheme)
 }

pkg/apis/autoscaling/v1/defaults.go

@@ -21,10 +21,7 @@ import (
 )
 
 func addDefaultingFuncs(scheme *runtime.Scheme) error {
-	RegisterDefaults(scheme)
-	return scheme.AddDefaultingFuncs(
-		SetDefaults_HorizontalPodAutoscaler,
-	)
+	return RegisterDefaults(scheme)
 }
 
 func SetDefaults_HorizontalPodAutoscaler(obj *HorizontalPodAutoscaler) {

pkg/apis/autoscaling/v2alpha1/BUILD

@@ -19,6 +19,7 @@ go_library(
         "types_swagger_doc_generated.go",
         "zz_generated.conversion.go",
         "zz_generated.deepcopy.go",
+        "zz_generated.defaults.go",
     ],
     tags = ["automanaged"],
     deps = [

pkg/apis/autoscaling/v2alpha1/defaults.go

@@ -23,9 +23,7 @@ import (
 )
 
 func addDefaultingFuncs(scheme *runtime.Scheme) error {
-	return scheme.AddDefaultingFuncs(
-		SetDefaults_HorizontalPodAutoscaler,
-	)
+	return RegisterDefaults(scheme)
 }
 
 func SetDefaults_HorizontalPodAutoscaler(obj *HorizontalPodAutoscaler) {

pkg/apis/autoscaling/v2alpha1/doc.go

@@ -17,5 +17,6 @@ limitations under the License.
 // +k8s:deepcopy-gen=package,register
 // +k8s:conversion-gen=k8s.io/kubernetes/pkg/apis/autoscaling
 // +k8s:openapi-gen=true
+// +k8s:defaulter-gen=TypeMeta
 
 package v2alpha1 // import "k8s.io/kubernetes/pkg/apis/autoscaling/v2alpha1"

pkg/apis/autoscaling/v2alpha1/zz_generated.defaults.go

@@ -0,0 +1,47 @@
+// +build !ignore_autogenerated
+
+/*
+Copyright 2017 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// This file was autogenerated by defaulter-gen. Do not edit it manually!
+
+package v2alpha1
+
+import (
+	runtime "k8s.io/apimachinery/pkg/runtime"
+)
+
+// RegisterDefaults adds defaulters functions to the given scheme.
+// Public to allow building arbitrary schemes.
+// All generated defaulters are covering - they call all nested defaulters.
+func RegisterDefaults(scheme *runtime.Scheme) error {
+	scheme.AddTypeDefaultingFunc(&HorizontalPodAutoscaler{}, func(obj interface{}) { SetObjectDefaults_HorizontalPodAutoscaler(obj.(*HorizontalPodAutoscaler)) })
+	scheme.AddTypeDefaultingFunc(&HorizontalPodAutoscalerList{}, func(obj interface{}) {
+		SetObjectDefaults_HorizontalPodAutoscalerList(obj.(*HorizontalPodAutoscalerList))
+	})
+	return nil
+}
+
+func SetObjectDefaults_HorizontalPodAutoscaler(in *HorizontalPodAutoscaler) {
+	SetDefaults_HorizontalPodAutoscaler(in)
+}
+
+func SetObjectDefaults_HorizontalPodAutoscalerList(in *HorizontalPodAutoscalerList) {
+	for i := range in.Items {
+		a := &in.Items[i]
+		SetObjectDefaults_HorizontalPodAutoscaler(a)
+	}
+}

pkg/apis/batch/v1/defaults.go

@@ -21,10 +21,7 @@ import (
 )
 
 func addDefaultingFuncs(scheme *runtime.Scheme) error {
-	RegisterDefaults(scheme)
-	return scheme.AddDefaultingFuncs(
-		SetDefaults_Job,
-	)
+	return RegisterDefaults(scheme)
 }
 
 func SetDefaults_Job(obj *Job) {

pkg/apis/batch/v2alpha1/defaults.go

@@ -21,10 +21,7 @@ import (
 )
 
 func addDefaultingFuncs(scheme *runtime.Scheme) error {
-	RegisterDefaults(scheme)
-	return scheme.AddDefaultingFuncs(
-		SetDefaults_CronJob,
-	)
+	return RegisterDefaults(scheme)
 }
 
 func SetDefaults_CronJob(obj *CronJob) {

pkg/apis/certificates/v1beta1/defaults.go

@@ -19,10 +19,7 @@ package v1beta1
 import "k8s.io/apimachinery/pkg/runtime"
 
 func addDefaultingFuncs(scheme *runtime.Scheme) error {
-	RegisterDefaults(scheme)
-	return scheme.AddDefaultingFuncs(
-		SetDefaults_CertificateSigningRequestSpec,
-	)
+	return RegisterDefaults(scheme)
 }
 func SetDefaults_CertificateSigningRequestSpec(obj *CertificateSigningRequestSpec) {
 	if obj.Usages == nil {

pkg/apis/componentconfig/v1alpha1/defaults.go

@@ -55,13 +55,7 @@ var (
 )
 
 func addDefaultingFuncs(scheme *kruntime.Scheme) error {
-	RegisterDefaults(scheme)
-	return scheme.AddDefaultingFuncs(
-		SetDefaults_KubeProxyConfiguration,
-		SetDefaults_KubeSchedulerConfiguration,
-		SetDefaults_LeaderElectionConfiguration,
-		SetDefaults_KubeletConfiguration,
-	)
+	return RegisterDefaults(scheme)
 }
 
 func SetDefaults_KubeProxyConfiguration(obj *KubeProxyConfiguration) {

pkg/apis/extensions/v1beta1/defaults.go

@@ -24,13 +24,7 @@ import (
 )
 
 func addDefaultingFuncs(scheme *runtime.Scheme) error {
-	RegisterDefaults(scheme)
-	return scheme.AddDefaultingFuncs(
-		SetDefaults_DaemonSet,
-		SetDefaults_Deployment,
-		SetDefaults_ReplicaSet,
-		SetDefaults_NetworkPolicy,
-	)
+	return RegisterDefaults(scheme)
 }
 
 func SetDefaults_DaemonSet(obj *DaemonSet) {

pkg/apis/imagepolicy/v1alpha1/register.go

@@ -34,7 +34,7 @@ func Resource(resource string) schema.GroupResource {
 }
 
 var (
-	SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes)
+	SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes, RegisterDefaults)
 	AddToScheme   = SchemeBuilder.AddToScheme
 )
 

pkg/apis/policy/v1alpha1/BUILD

@@ -13,6 +13,7 @@ go_library(
         "doc.go",
         "register.go",
         "types.go",
+        "zz_generated.defaults.go",
     ],
     tags = ["automanaged"],
     deps = [

pkg/apis/policy/v1alpha1/doc.go

@@ -14,6 +14,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+// +k8s:defaulter-gen=TypeMeta
+
 // Package policy is for any kind of policy object.  Suitable examples, even if
 // they aren't all here, are PodDisruptionBudget, PodSecurityPolicy,
 // NetworkPolicy, etc.

pkg/apis/policy/v1alpha1/register.go

@@ -34,7 +34,7 @@ func Resource(resource string) schema.GroupResource {
 }
 
 var (
-	SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes)
+	SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes, RegisterDefaults)
 	AddToScheme   = SchemeBuilder.AddToScheme
 )
 

pkg/apis/policy/v1alpha1/zz_generated.defaults.go

@@ -0,0 +1,32 @@
+// +build !ignore_autogenerated
+
+/*
+Copyright 2017 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// This file was autogenerated by defaulter-gen. Do not edit it manually!
+
+package v1alpha1
+
+import (
+	runtime "k8s.io/apimachinery/pkg/runtime"
+)
+
+// RegisterDefaults adds defaulters functions to the given scheme.
+// Public to allow building arbitrary schemes.
+// All generated defaulters are covering - they call all nested defaulters.
+func RegisterDefaults(scheme *runtime.Scheme) error {
+	return nil
+}

pkg/apis/policy/v1beta1/BUILD

@@ -18,6 +18,7 @@ go_library(
         "types_swagger_doc_generated.go",
         "zz_generated.conversion.go",
         "zz_generated.deepcopy.go",
+        "zz_generated.defaults.go",
     ],
     tags = ["automanaged"],
     deps = [

pkg/apis/policy/v1beta1/doc.go

@@ -16,6 +16,7 @@ limitations under the License.
 
 // +k8s:deepcopy-gen=package,register
 // +k8s:conversion-gen=k8s.io/kubernetes/pkg/apis/policy
+// +k8s:defaulter-gen=TypeMeta
 
 // Package policy is for any kind of policy object.  Suitable examples, even if
 // they aren't all here, are PodDisruptionBudget, PodSecurityPolicy,

pkg/apis/policy/v1beta1/register.go

@@ -34,7 +34,7 @@ func Resource(resource string) schema.GroupResource {
 }
 
 var (
-	SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes)
+	SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes, RegisterDefaults)
 	AddToScheme   = SchemeBuilder.AddToScheme
 )
 

pkg/apis/policy/v1beta1/zz_generated.defaults.go

@@ -1,5 +1,7 @@
+// +build !ignore_autogenerated
+
 /*
-Copyright 2016 The Kubernetes Authors.
+Copyright 2017 The Kubernetes Authors.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -14,23 +16,17 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package api
+// This file was autogenerated by defaulter-gen. Do not edit it manually!
+
+package v1beta1
 
 import (
-	"k8s.io/apimachinery/pkg/fields"
-	"k8s.io/apimachinery/pkg/labels"
-	"k8s.io/apimachinery/pkg/runtime"
+	runtime "k8s.io/apimachinery/pkg/runtime"
 )
 
-func addDefaultingFuncs(scheme *runtime.Scheme) error {
-	return scheme.AddDefaultingFuncs(
-		func(obj *ListOptions) {
-			if obj.LabelSelector == nil {
-				obj.LabelSelector = labels.Everything()
-			}
-			if obj.FieldSelector == nil {
-				obj.FieldSelector = fields.Everything()
-			}
-		},
-	)
+// RegisterDefaults adds defaulters functions to the given scheme.
+// Public to allow building arbitrary schemes.
+// All generated defaulters are covering - they call all nested defaulters.
+func RegisterDefaults(scheme *runtime.Scheme) error {
+	return nil
 }

pkg/apis/rbac/v1alpha1/defaults.go

@@ -21,12 +21,7 @@ import (
 )
 
 func addDefaultingFuncs(scheme *runtime.Scheme) error {
-	RegisterDefaults(scheme)
-	return scheme.AddDefaultingFuncs(
-		SetDefaults_ClusterRoleBinding,
-		SetDefaults_RoleBinding,
-		SetDefaults_Subject,
-	)
+	return RegisterDefaults(scheme)
 }
 
 func SetDefaults_ClusterRoleBinding(obj *ClusterRoleBinding) {

pkg/apis/rbac/v1beta1/defaults.go

@@ -21,12 +21,7 @@ import (
 )
 
 func addDefaultingFuncs(scheme *runtime.Scheme) error {
-	RegisterDefaults(scheme)
-	return scheme.AddDefaultingFuncs(
-		SetDefaults_ClusterRoleBinding,
-		SetDefaults_RoleBinding,
-		SetDefaults_Subject,
-	)
+	return RegisterDefaults(scheme)
 }
 
 func SetDefaults_ClusterRoleBinding(obj *ClusterRoleBinding) {

pkg/apis/settings/v1alpha1/register.go

@@ -34,7 +34,7 @@ func Resource(resource string) schema.GroupResource {
 }
 
 var (
-	SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes)
+	SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes, RegisterDefaults)
 	AddToScheme   = SchemeBuilder.AddToScheme
 )
 

pkg/apis/storage/v1/register.go

@@ -34,7 +34,7 @@ func Resource(resource string) schema.GroupResource {
 }
 
 var (
-	SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes)
+	SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes, RegisterDefaults)
 	AddToScheme   = SchemeBuilder.AddToScheme
 )
 

pkg/apis/storage/v1beta1/register.go

@@ -34,7 +34,7 @@ func Resource(resource string) schema.GroupResource {
 }
 
 var (
-	SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes)
+	SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes, RegisterDefaults)
 	AddToScheme   = SchemeBuilder.AddToScheme
 )