From 34e9e54ce1aea5c6a6c5e03a7603feb80ca6be41 Mon Sep 17 00:00:00 2001
From: Clayton Coleman <ccoleman@redhat.com>
Date: Sat, 21 Jan 2017 21:44:35 -0500
Subject: [PATCH] Remove federation api defaulters

---
 federation/apis/core/defaults.go | 37 --------------------------------
 federation/apis/core/register.go |  2 +-
 2 files changed, 1 insertion(+), 38 deletions(-)
 delete mode 100644 federation/apis/core/defaults.go

diff --git a/federation/apis/core/defaults.go b/federation/apis/core/defaults.go
deleted file mode 100644
index 3192fe9868a..00000000000
--- a/federation/apis/core/defaults.go
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-Copyright 2016 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.
-*/
-
-package core
-
-import (
-	"k8s.io/apimachinery/pkg/fields"
-	"k8s.io/apimachinery/pkg/labels"
-	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/kubernetes/pkg/api"
-)
-
-func addDefaultingFuncs(scheme *runtime.Scheme) error {
-	return scheme.AddDefaultingFuncs(
-		func(obj *api.ListOptions) {
-			if obj.LabelSelector == nil {
-				obj.LabelSelector = labels.Everything()
-			}
-			if obj.FieldSelector == nil {
-				obj.FieldSelector = fields.Everything()
-			}
-		},
-	)
-}
diff --git a/federation/apis/core/register.go b/federation/apis/core/register.go
index c75e7e5b76c..211ad6c39a5 100644
--- a/federation/apis/core/register.go
+++ b/federation/apis/core/register.go
@@ -54,7 +54,7 @@ func Resource(resource string) schema.GroupResource {
 }
 
 var (
-	SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes, addDefaultingFuncs, addConversionFuncs)
+	SchemeBuilder = runtime.NewSchemeBuilder(addKnownTypes, addConversionFuncs)
 	AddToScheme   = SchemeBuilder.AddToScheme
 )