From 55edd8ec77ceea6ed1700e84f5fcd899649c99b8 Mon Sep 17 00:00:00 2001
From: Phillip Wittrock <pwittroc@google.com>
Date: Sat, 9 Jun 2018 10:46:21 -0700
Subject: [PATCH 01/13] Actually run metalinter

---
 .travis.yml | 23 -----------------------
 test.sh     | 41 +++++++++++++++++++++++++++++++++++++++--
 2 files changed, 39 insertions(+), 25 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a89ac50b2a..e7c8cf56a9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,29 +23,6 @@ install:
   - go get -u gopkg.in/alecthomas/gometalinter.v2 && gometalinter.v2 --install
 
 script:
-- go vet ./pkg/...
-- golint -set_exit_status ./pkg/...
-- gometalinter.v2 --disable-all --enable=misspell \
-    --enable=misspell \
-    --enable=structcheck \
-    --enable=maligned \
-    --enable=nakedret \
-    --enable=deadcode \
-    --enable=gocyclo \
-    --enable=ineffassign \
-    --enable=dupl \
-    --enable=golint \
-    --enable=goimports \
-    --enable=errcheck \
-    --enable=varcheck \
-    --enable=interfacer \
-    --enable=goconst \
-    --enable=unparam \
-    --enable=misspell \
-    --enable=lll \
-    --enable=gas \
-    --enable=safesql \
-    --enable=megacheck ./pkg/...
 - TRACE=1 ./test.sh
 
 
diff --git a/test.sh b/test.sh
index 01f6faeb1d..309a175718 100755
--- a/test.sh
+++ b/test.sh
@@ -101,5 +101,42 @@ fetch_kb_tools
 # setup testing env
 setup_envs
 
-go test github.com/kubernetes-sigs/controller-runtime/pkg/...
-go install github.com/kubernetes-sigs/controller-runtime/example
+header_text "running go vet"
+
+go vet ./pkg/...
+
+header_text "running golint"
+
+golint -set_exit_status ./pkg/...
+
+header_text "running gometalinter.v2"
+
+gometalinter.v2 --disable-all --enable=misspell \
+    --enable=misspell \
+    --enable=structcheck \
+    --enable=golint \
+    --enable=deadcode \
+    --enable=goimports \
+    ./pkg/...
+# TODO: Enable these as we fix them to make them pass
+#    --enable=gocyclo \
+#    --enable=errcheck \
+#    --enable=varcheck \
+#    --enable=gas \
+#    --enable=interfacer \
+#    --enable=maligned \
+#    --enable=ineffassign \
+#    --enable=nakedret \
+#    --enable=goconst \
+#    --enable=unparam \
+#    --enable=dupl \
+#    --enable=misspell \
+#    --enable=safesql \
+
+header_text "running go test"
+
+go test ./pkg/...
+
+header_text "running go install"
+
+go install ./example

From d8d7d146030d6dc111ebd7634ba64b0e880a2b5a Mon Sep 17 00:00:00 2001
From: Phillip Wittrock <pwittroc@google.com>
Date: Sat, 9 Jun 2018 10:46:42 -0700
Subject: [PATCH 02/13] fix metalinting errors

---
 pkg/client/cache_test.go                      |  3 +-
 pkg/controller/controller.go                  |  3 --
 pkg/controller/eventhandler/enqueue_owner.go  |  3 --
 pkg/controller/source/source.go               |  3 --
 pkg/internal/admission/decode.go              |  1 +
 pkg/internal/admission/example_decode_test.go |  1 +
 pkg/internal/admission/handler.go             |  3 +-
 pkg/internal/admission/http.go                |  5 +-
 pkg/internal/admission/tls.go                 | 51 +++++++++----------
 9 files changed, 32 insertions(+), 41 deletions(-)

diff --git a/pkg/client/cache_test.go b/pkg/client/cache_test.go
index 8cd81b66ec..870bd7bb8d 100644
--- a/pkg/client/cache_test.go
+++ b/pkg/client/cache_test.go
@@ -11,8 +11,9 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/client-go/tools/cache"
 
-	"k8s.io/client-go/kubernetes/scheme"
 	"reflect"
+
+	"k8s.io/client-go/kubernetes/scheme"
 )
 
 var _ = Describe("Indexers", func() {
diff --git a/pkg/controller/controller.go b/pkg/controller/controller.go
index 095c0c162d..2a10823035 100644
--- a/pkg/controller/controller.go
+++ b/pkg/controller/controller.go
@@ -93,9 +93,6 @@ type controller struct {
 	// the queue for processing
 	queue workqueue.RateLimitingInterface
 
-	// once ensures unspecified fields get default values
-	once sync.Once
-
 	// inject is used to inject dependencies into other objects such as Sources, EventHandlers and Predicates
 	inject func(i interface{}) error
 
diff --git a/pkg/controller/eventhandler/enqueue_owner.go b/pkg/controller/eventhandler/enqueue_owner.go
index 1ac5f9c350..b7550a6a42 100644
--- a/pkg/controller/eventhandler/enqueue_owner.go
+++ b/pkg/controller/eventhandler/enqueue_owner.go
@@ -51,9 +51,6 @@ type EnqueueOwnerHandler struct {
 
 	// groupKind is the cached Group and Kind from OwnerType
 	groupKind schema.GroupKind
-
-	// kindOk is true if OwnerType was successfully parsed
-	kindOk bool
 }
 
 var _ inject.Scheme = &EnqueueOwnerHandler{}
diff --git a/pkg/controller/source/source.go b/pkg/controller/source/source.go
index 0e64237261..34101026b4 100644
--- a/pkg/controller/source/source.go
+++ b/pkg/controller/source/source.go
@@ -28,7 +28,6 @@ import (
 	"k8s.io/client-go/util/workqueue"
 
 	"github.com/kubernetes-sigs/controller-runtime/pkg/controller/predicate"
-	logf "github.com/kubernetes-sigs/controller-runtime/pkg/runtime/log"
 )
 
 // Source is a source of events (eh.g. Create, Update, Delete operations on Kubernetes Objects, Webhook callbacks, etc)
@@ -61,8 +60,6 @@ func (ks ChannelSource) Start(
 	return nil
 }
 
-var log = logf.KBLog.WithName("source").WithName("KindSource")
-
 // KindSource is used to provide a source of events originating inside the cluster from Watches (eh.g. Pod Create)
 type KindSource struct {
 	// Type is the type of object to watch.  e.g. &v1.Pod{}
diff --git a/pkg/internal/admission/decode.go b/pkg/internal/admission/decode.go
index 15cc09cf7a..e3dae2dbbd 100644
--- a/pkg/internal/admission/decode.go
+++ b/pkg/internal/admission/decode.go
@@ -18,6 +18,7 @@ package admission
 
 import (
 	"fmt"
+
 	"k8s.io/api/admission/v1beta1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
diff --git a/pkg/internal/admission/example_decode_test.go b/pkg/internal/admission/example_decode_test.go
index 1cd400baaf..285977119a 100644
--- a/pkg/internal/admission/example_decode_test.go
+++ b/pkg/internal/admission/example_decode_test.go
@@ -18,6 +18,7 @@ package admission_test
 
 import (
 	"fmt"
+
 	"github.com/kubernetes-sigs/controller-runtime/pkg/internal/admission"
 	"k8s.io/api/admission/v1beta1"
 	corev1 "k8s.io/api/core/v1"
diff --git a/pkg/internal/admission/handler.go b/pkg/internal/admission/handler.go
index 7798474a5d..933ff43e34 100644
--- a/pkg/internal/admission/handler.go
+++ b/pkg/internal/admission/handler.go
@@ -17,9 +17,10 @@ limitations under the License.
 package admission
 
 import (
+	"net/http"
+
 	"k8s.io/api/admission/v1beta1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"net/http"
 )
 
 // Func implements an AdmissionReview operation for a GroupVersionResource
diff --git a/pkg/internal/admission/http.go b/pkg/internal/admission/http.go
index 812111d7b7..19412ab05f 100644
--- a/pkg/internal/admission/http.go
+++ b/pkg/internal/admission/http.go
@@ -18,11 +18,12 @@ package admission
 
 import (
 	"encoding/json"
-	"github.com/golang/glog"
 	"io/ioutil"
+	"net/http"
+
+	"github.com/golang/glog"
 	"k8s.io/api/admission/v1beta1"
 	"k8s.io/apimachinery/pkg/runtime"
-	"net/http"
 )
 
 func (h httpHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
diff --git a/pkg/internal/admission/tls.go b/pkg/internal/admission/tls.go
index 8a39651df3..ed22d249b2 100644
--- a/pkg/internal/admission/tls.go
+++ b/pkg/internal/admission/tls.go
@@ -16,32 +16,27 @@ limitations under the License.
 
 package admission
 
-import (
-	"crypto/tls"
-	"crypto/x509"
-)
+//type certs struct {
+//	Cert   []byte
+//	Key    []byte
+//	CACert []byte
+//}
 
-type certs struct {
-	Cert   []byte
-	Key    []byte
-	CACert []byte
-}
-
-// MakeTLSConfig makes a TLS configuration suitable for use with the server
-func makeTLSConfig(certs certs) (*tls.Config, error) {
-	caCertPool := x509.NewCertPool()
-	caCertPool.AppendCertsFromPEM(certs.CACert)
-	//cert, err := tls.X509KeyPair(certs.Cert, certs.Key)
-	//if err != nil {
-	//	return nil, err
-	//}
-	return &tls.Config{
-		//Certificates: []tls.Certificate{cert},
-		ClientCAs:  caCertPool,
-		ClientAuth: tls.NoClientCert,
-		// Note on GKE there apparently is no client cert sent, so this
-		// does not work on GKE.
-		// TODO: make this into a configuration option.
-		//		ClientAuth:   tls.RequireAndVerifyClientCert,
-	}, nil
-}
+//// MakeTLSConfig makes a TLS configuration suitable for use with the server
+//func makeTLSConfig(certs certs) (*tls.Config, error) {
+//	caCertPool := x509.NewCertPool()
+//	caCertPool.AppendCertsFromPEM(certs.CACert)
+//	//cert, err := tls.X509KeyPair(certs.Cert, certs.Key)
+//	//if err != nil {
+//	//	return nil, err
+//	//}
+//	return &tls.Config{
+//		//Certificates: []tls.Certificate{cert},
+//		ClientCAs:  caCertPool,
+//		ClientAuth: tls.NoClientCert,
+//		// Note on GKE there apparently is no client cert sent, so this
+//		// does not work on GKE.
+//		// TODO: make this into a configuration option.
+//		//		ClientAuth:   tls.RequireAndVerifyClientCert,
+//	}, nil
+//}

From ea3c75ffde6c36f432e926e9003d8a7ecb49f464 Mon Sep 17 00:00:00 2001
From: Phillip Wittrock <pwittroc@google.com>
Date: Sat, 9 Jun 2018 11:39:36 -0700
Subject: [PATCH 03/13] Fix errcheck lints

---
 pkg/controller/manager.go | 10 ++++++----
 pkg/test/server.go        |  4 ++--
 test.sh                   |  2 +-
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/pkg/controller/manager.go b/pkg/controller/manager.go
index de9965f86b..14510a5726 100644
--- a/pkg/controller/manager.go
+++ b/pkg/controller/manager.go
@@ -25,7 +25,6 @@ import (
 	"github.com/kubernetes-sigs/controller-runtime/pkg/internal/apiutil"
 	"github.com/kubernetes-sigs/controller-runtime/pkg/internal/informer"
 	"github.com/kubernetes-sigs/controller-runtime/pkg/runtime/inject"
-	"k8s.io/api/apps/v1"
 	"k8s.io/apimachinery/pkg/api/meta"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/client-go/kubernetes/scheme"
@@ -105,7 +104,9 @@ func (cm *controllerManager) NewController(ca Args, r reconcile.Reconcile) (Cont
 	}
 
 	// Inject dependencies into Reconcile
-	cm.injectInto(r)
+	if err := cm.injectInto(r); err != nil {
+		return nil, err
+	}
 
 	// Create controller with dependencies set
 	c := &controller{
@@ -165,7 +166,9 @@ func (cm *controllerManager) GetFieldIndexer() client.FieldIndexer {
 func (cm *controllerManager) Start(stop <-chan struct{}) error {
 	// Start the Informers.
 	cm.stop = stop
-	cm.informers.Start(stop)
+	if err := cm.informers.Start(stop); err != nil {
+		return err
+	}
 
 	// Start the controllers after the promises
 	for _, c := range cm.controllers {
@@ -224,7 +227,6 @@ func NewManager(args ManagerArgs) (Manager, error) {
 		Scheme: cm.scheme,
 	}
 	cm.informers = spi
-	cm.informers.InformerFor(&v1.Deployment{})
 
 	// Inject a Read / Write client into all controllers
 	// TODO(directxman12): Figure out how to allow users to request a client without requesting a watch
diff --git a/pkg/test/server.go b/pkg/test/server.go
index 17d623c0ff..ad726ce4eb 100644
--- a/pkg/test/server.go
+++ b/pkg/test/server.go
@@ -42,8 +42,8 @@ type Environment struct {
 }
 
 // Stop stops a running server
-func (te *Environment) Stop() {
-	te.ControlPlane.Stop()
+func (te *Environment) Stop() error {
+	return te.ControlPlane.Stop()
 }
 
 // Start starts a local Kubernetes server and updates te.ApiserverPort with the port it is listening on
diff --git a/test.sh b/test.sh
index 309a175718..ae57fb8b52 100755
--- a/test.sh
+++ b/test.sh
@@ -117,10 +117,10 @@ gometalinter.v2 --disable-all --enable=misspell \
     --enable=golint \
     --enable=deadcode \
     --enable=goimports \
+    --enable=errcheck \
     ./pkg/...
 # TODO: Enable these as we fix them to make them pass
 #    --enable=gocyclo \
-#    --enable=errcheck \
 #    --enable=varcheck \
 #    --enable=gas \
 #    --enable=interfacer \

From 9a41a7f41d6c880532fa12e33ab4c695da0cb60f Mon Sep 17 00:00:00 2001
From: Phillip Wittrock <pwittroc@google.com>
Date: Sat, 9 Jun 2018 11:40:52 -0700
Subject: [PATCH 04/13] Fix varcheck lints

---
 pkg/controller/controller_suite_integration_test.go | 2 --
 test.sh                                             | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkg/controller/controller_suite_integration_test.go b/pkg/controller/controller_suite_integration_test.go
index 11f17c412e..f74d1e80e5 100644
--- a/pkg/controller/controller_suite_integration_test.go
+++ b/pkg/controller/controller_suite_integration_test.go
@@ -21,7 +21,6 @@ import (
 	"time"
 
 	"github.com/kubernetes-sigs/controller-runtime/pkg/controller"
-	"github.com/kubernetes-sigs/controller-runtime/pkg/internal/informer"
 	logf "github.com/kubernetes-sigs/controller-runtime/pkg/runtime/log"
 	"github.com/kubernetes-sigs/controller-runtime/pkg/test"
 	. "github.com/onsi/ginkgo"
@@ -38,7 +37,6 @@ func TestSource(t *testing.T) {
 var testenv *test.Environment
 var cfg *rest.Config
 var clientset *kubernetes.Clientset
-var icache informer.Informers
 
 var _ = BeforeSuite(func() {
 	logf.SetLogger(logf.ZapLogger(false))
diff --git a/test.sh b/test.sh
index ae57fb8b52..bd8a40d585 100755
--- a/test.sh
+++ b/test.sh
@@ -118,10 +118,10 @@ gometalinter.v2 --disable-all --enable=misspell \
     --enable=deadcode \
     --enable=goimports \
     --enable=errcheck \
+    --enable=varcheck \
     ./pkg/...
 # TODO: Enable these as we fix them to make them pass
 #    --enable=gocyclo \
-#    --enable=varcheck \
 #    --enable=gas \
 #    --enable=interfacer \
 #    --enable=maligned \

From 785705d8cb626d71b7ec4817e98b086bb523a1d7 Mon Sep 17 00:00:00 2001
From: Phillip Wittrock <pwittroc@google.com>
Date: Sat, 9 Jun 2018 12:11:31 -0700
Subject: [PATCH 05/13] Fix unparam lint checks

---
 pkg/internal/informer/informertest/fake_cache.go | 2 +-
 test.sh                                          | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkg/internal/informer/informertest/fake_cache.go b/pkg/internal/informer/informertest/fake_cache.go
index 7b5821d2ce..08eee50ee5 100644
--- a/pkg/internal/informer/informertest/fake_cache.go
+++ b/pkg/internal/informer/informertest/fake_cache.go
@@ -85,7 +85,7 @@ func (c *FakeInformers) FakeInformerFor(obj runtime.Object) (*controllertest.Fak
 	return i.(*controllertest.FakeInformer), nil
 }
 
-func (c *FakeInformers) informerFor(gvk schema.GroupVersionKind, obj runtime.Object) (cache.SharedIndexInformer, error) {
+func (c *FakeInformers) informerFor(gvk schema.GroupVersionKind, _ runtime.Object) (cache.SharedIndexInformer, error) {
 	if c.Error != nil {
 		return nil, c.Error
 	}
diff --git a/test.sh b/test.sh
index bd8a40d585..4441a0230b 100755
--- a/test.sh
+++ b/test.sh
@@ -119,16 +119,16 @@ gometalinter.v2 --disable-all --enable=misspell \
     --enable=goimports \
     --enable=errcheck \
     --enable=varcheck \
+    --enable=goconst \
+    --enable=gas \
+    --enable=unparam \
     ./pkg/...
 # TODO: Enable these as we fix them to make them pass
 #    --enable=gocyclo \
-#    --enable=gas \
 #    --enable=interfacer \
 #    --enable=maligned \
 #    --enable=ineffassign \
 #    --enable=nakedret \
-#    --enable=goconst \
-#    --enable=unparam \
 #    --enable=dupl \
 #    --enable=misspell \
 #    --enable=safesql \

From b5833be110e3344178a00cc95f979974a2576767 Mon Sep 17 00:00:00 2001
From: Phillip Wittrock <pwittroc@google.com>
Date: Sat, 9 Jun 2018 12:13:30 -0700
Subject: [PATCH 06/13] Fix ineffassign lints

---
 pkg/admission/certprovisioner/selfsignedcertprovisioner_test.go | 2 +-
 test.sh                                                         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkg/admission/certprovisioner/selfsignedcertprovisioner_test.go b/pkg/admission/certprovisioner/selfsignedcertprovisioner_test.go
index 0e98347c17..da52bb9799 100644
--- a/pkg/admission/certprovisioner/selfsignedcertprovisioner_test.go
+++ b/pkg/admission/certprovisioner/selfsignedcertprovisioner_test.go
@@ -25,7 +25,7 @@ import (
 func TestProvisionServingCert(t *testing.T) {
 	cn := "mysvc.myns.svc"
 	cp := SelfSignedCertProvisioner{CommonName: cn}
-	certs, err := cp.ProvisionServingCert()
+	certs, _ := cp.ProvisionServingCert()
 
 	// First, create the set of root certificates. For this example we only
 	// have one. It's also possible to omit this in order to use the
diff --git a/test.sh b/test.sh
index 4441a0230b..feae3133f0 100755
--- a/test.sh
+++ b/test.sh
@@ -122,12 +122,12 @@ gometalinter.v2 --disable-all --enable=misspell \
     --enable=goconst \
     --enable=gas \
     --enable=unparam \
+    --enable=ineffassign \
     ./pkg/...
 # TODO: Enable these as we fix them to make them pass
 #    --enable=gocyclo \
 #    --enable=interfacer \
 #    --enable=maligned \
-#    --enable=ineffassign \
 #    --enable=nakedret \
 #    --enable=dupl \
 #    --enable=misspell \

From f710176dd109fe74385bde1ebc83b293dded02ed Mon Sep 17 00:00:00 2001
From: Phillip Wittrock <pwittroc@google.com>
Date: Sat, 9 Jun 2018 12:13:54 -0700
Subject: [PATCH 07/13] add nakedret lint

---
 test.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test.sh b/test.sh
index feae3133f0..d4d92517b8 100755
--- a/test.sh
+++ b/test.sh
@@ -123,12 +123,12 @@ gometalinter.v2 --disable-all --enable=misspell \
     --enable=gas \
     --enable=unparam \
     --enable=ineffassign \
+    --enable=nakedret \
     ./pkg/...
 # TODO: Enable these as we fix them to make them pass
 #    --enable=gocyclo \
 #    --enable=interfacer \
 #    --enable=maligned \
-#    --enable=nakedret \
 #    --enable=dupl \
 #    --enable=misspell \
 #    --enable=safesql \

From 2aecdf57628c25a540421563d90f98fd8bfe1364 Mon Sep 17 00:00:00 2001
From: Phillip Wittrock <pwittroc@google.com>
Date: Sat, 9 Jun 2018 12:14:42 -0700
Subject: [PATCH 08/13] add interfacer lint check

---
 test.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test.sh b/test.sh
index d4d92517b8..1f87f6eacd 100755
--- a/test.sh
+++ b/test.sh
@@ -124,10 +124,10 @@ gometalinter.v2 --disable-all --enable=misspell \
     --enable=unparam \
     --enable=ineffassign \
     --enable=nakedret \
+    --enable=interfacer \
     ./pkg/...
 # TODO: Enable these as we fix them to make them pass
 #    --enable=gocyclo \
-#    --enable=interfacer \
 #    --enable=maligned \
 #    --enable=dupl \
 #    --enable=misspell \

From b7d955fc3c07866eae4f35c945782bb0742119b4 Mon Sep 17 00:00:00 2001
From: Phillip Wittrock <pwittroc@google.com>
Date: Sat, 9 Jun 2018 12:15:05 -0700
Subject: [PATCH 09/13] git add misspell lint

---
 test.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test.sh b/test.sh
index 1f87f6eacd..4e11bfb738 100755
--- a/test.sh
+++ b/test.sh
@@ -125,12 +125,12 @@ gometalinter.v2 --disable-all --enable=misspell \
     --enable=ineffassign \
     --enable=nakedret \
     --enable=interfacer \
+    --enable=misspell \
     ./pkg/...
 # TODO: Enable these as we fix them to make them pass
 #    --enable=gocyclo \
 #    --enable=maligned \
 #    --enable=dupl \
-#    --enable=misspell \
 #    --enable=safesql \
 
 header_text "running go test"

From 00a6118260df313c67b0153ca8edf67307b5f1de Mon Sep 17 00:00:00 2001
From: Phillip Wittrock <pwittroc@google.com>
Date: Sat, 9 Jun 2018 12:18:09 -0700
Subject: [PATCH 10/13] fix gocyclo lints

---
 pkg/client/cache.go | 14 +++++++++++---
 test.sh             |  2 +-
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/pkg/client/cache.go b/pkg/client/cache.go
index aff95685fe..86f9fea2f2 100644
--- a/pkg/client/cache.go
+++ b/pkg/client/cache.go
@@ -189,15 +189,23 @@ func (c *singleObjectCache) List(ctx context.Context, opts *ListOptions, out run
 		labelSel = opts.LabelSelector
 	}
 
+	outItems, err := c.getListItems(objs, labelSel)
+	if err != nil {
+		return err
+	}
+	return apimeta.SetList(out, outItems)
+}
+
+func (c *singleObjectCache) getListItems(objs []interface{}, labelSel labels.Selector) ([]runtime.Object, error) {
 	outItems := make([]runtime.Object, 0, len(objs))
 	for _, item := range objs {
 		obj, isObj := item.(runtime.Object)
 		if !isObj {
-			return fmt.Errorf("cache contained %T, which is not an Object", obj)
+			return nil, fmt.Errorf("cache contained %T, which is not an Object", obj)
 		}
 		meta, err := apimeta.Accessor(obj)
 		if err != nil {
-			return err
+			return nil, err
 		}
 		if labelSel != nil {
 			lbls := labels.Set(meta.GetLabels())
@@ -207,7 +215,7 @@ func (c *singleObjectCache) List(ctx context.Context, opts *ListOptions, out run
 		}
 		outItems = append(outItems, obj.DeepCopyObject())
 	}
-	return apimeta.SetList(out, outItems)
+	return outItems, nil
 }
 
 // TODO: Make an interface with this function that has an Informers as an object on the struct
diff --git a/test.sh b/test.sh
index 4e11bfb738..9e5b56531a 100755
--- a/test.sh
+++ b/test.sh
@@ -126,9 +126,9 @@ gometalinter.v2 --disable-all --enable=misspell \
     --enable=nakedret \
     --enable=interfacer \
     --enable=misspell \
+    --enable=gocyclo \
     ./pkg/...
 # TODO: Enable these as we fix them to make them pass
-#    --enable=gocyclo \
 #    --enable=maligned \
 #    --enable=dupl \
 #    --enable=safesql \

From 49e3bb7df6b208c670a7ed56b21e7fe67cf77310 Mon Sep 17 00:00:00 2001
From: Phillip Wittrock <pwittroc@google.com>
Date: Sat, 9 Jun 2018 12:18:38 -0700
Subject: [PATCH 11/13] minor refactor to test.sh

---
 test.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test.sh b/test.sh
index 9e5b56531a..0af0959879 100755
--- a/test.sh
+++ b/test.sh
@@ -111,7 +111,7 @@ golint -set_exit_status ./pkg/...
 
 header_text "running gometalinter.v2"
 
-gometalinter.v2 --disable-all --enable=misspell \
+gometalinter.v2 --disable-all \
     --enable=misspell \
     --enable=structcheck \
     --enable=golint \

From 711623311875d98812fb11b84d6504ee77f4aa9a Mon Sep 17 00:00:00 2001
From: Phillip Wittrock <pwittroc@google.com>
Date: Sat, 9 Jun 2018 12:28:13 -0700
Subject: [PATCH 12/13] Increase thresholds for remaining linters and enable

---
 test.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/test.sh b/test.sh
index 0af0959879..ff4751ab60 100755
--- a/test.sh
+++ b/test.sh
@@ -112,6 +112,7 @@ golint -set_exit_status ./pkg/...
 header_text "running gometalinter.v2"
 
 gometalinter.v2 --disable-all \
+    --deadline 5m \
     --enable=misspell \
     --enable=structcheck \
     --enable=golint \
@@ -127,10 +128,13 @@ gometalinter.v2 --disable-all \
     --enable=interfacer \
     --enable=misspell \
     --enable=gocyclo \
+    --line-length=170 \
+    --enable=lll \
+    --dupl-threshold=250 \
+    --enable=dupl \
     ./pkg/...
 # TODO: Enable these as we fix them to make them pass
 #    --enable=maligned \
-#    --enable=dupl \
 #    --enable=safesql \
 
 header_text "running go test"

From 8960bfa6098a4cdff35d1d28fbd2e9e84b98e549 Mon Sep 17 00:00:00 2001
From: Phillip Wittrock <pwittroc@google.com>
Date: Sun, 10 Jun 2018 07:34:39 -0700
Subject: [PATCH 13/13] increase dupl threshold

---
 test.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test.sh b/test.sh
index ff4751ab60..aedf1fc7ca 100755
--- a/test.sh
+++ b/test.sh
@@ -130,7 +130,7 @@ gometalinter.v2 --disable-all \
     --enable=gocyclo \
     --line-length=170 \
     --enable=lll \
-    --dupl-threshold=250 \
+    --dupl-threshold=400 \
     --enable=dupl \
     ./pkg/...
 # TODO: Enable these as we fix them to make them pass