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

2017-03-10 16:03:07 -05:00
parent 06cdb02fca
commit ad116026d9
72 changed files with 273 additions and 318 deletions
--- a/federation/apis/core/v1/defaults.go
+++ b/federation/apis/core/v1/defaults.go
@@ -22,10 +22,5 @@ import (
 )

 func addDefaultingFuncs(scheme *runtime.Scheme) error {
-	v1.RegisterDefaults(scheme)
-	return scheme.AddDefaultingFuncs(
-		v1.SetDefaults_Secret,
-		v1.SetDefaults_ServiceSpec,
-		v1.SetDefaults_NamespaceStatus,
-	)
+	return v1.RegisterDefaults(scheme)
 }
--- a/federation/apis/federation/v1beta1/defaults.go
+++ b/federation/apis/federation/v1beta1/defaults.go
@@ -21,5 +21,5 @@ import (
 )

 func addDefaultingFuncs(scheme *runtime.Scheme) error {
-	return nil
+	return RegisterDefaults(scheme)
 }