diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index 95bbaec62..c1c2003ee 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -1152,583 +1152,583 @@
 		},
 		{
 			"ImportPath": "k8s.io/client-go/discovery",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/discovery/fake",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/informers",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/informers/admissionregistration",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/informers/admissionregistration/v1alpha1",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/informers/admissionregistration/v1beta1",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/informers/apps",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/informers/apps/v1",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/informers/apps/v1beta1",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/informers/apps/v1beta2",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/informers/autoscaling",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/informers/autoscaling/v1",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/informers/autoscaling/v2beta1",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/informers/batch",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/informers/batch/v1",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/informers/batch/v1beta1",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/informers/batch/v2alpha1",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/informers/certificates",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/informers/certificates/v1beta1",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/informers/core",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/informers/core/v1",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/informers/events",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/informers/events/v1beta1",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/informers/extensions",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/informers/extensions/v1beta1",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/informers/internalinterfaces",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/informers/networking",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/informers/networking/v1",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/informers/policy",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/informers/policy/v1beta1",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/informers/rbac",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/informers/rbac/v1",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/informers/rbac/v1alpha1",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/informers/rbac/v1beta1",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/informers/scheduling",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/informers/scheduling/v1alpha1",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/informers/settings",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/informers/settings/v1alpha1",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/informers/storage",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/informers/storage/v1",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/informers/storage/v1alpha1",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/informers/storage/v1beta1",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/fake",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/scheme",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/admissionregistration/v1alpha1",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/admissionregistration/v1alpha1/fake",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/admissionregistration/v1beta1",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/admissionregistration/v1beta1/fake",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/apps/v1",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/apps/v1/fake",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/apps/v1beta1",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/apps/v1beta1/fake",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/apps/v1beta2",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/apps/v1beta2/fake",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/authentication/v1",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/authentication/v1/fake",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/authentication/v1beta1",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/authentication/v1beta1/fake",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/authorization/v1",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/authorization/v1/fake",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/authorization/v1beta1",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/authorization/v1beta1/fake",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/autoscaling/v1",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/autoscaling/v1/fake",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/autoscaling/v2beta1",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/autoscaling/v2beta1/fake",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/batch/v1",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/batch/v1/fake",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/batch/v1beta1",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/batch/v1beta1/fake",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/batch/v2alpha1",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/batch/v2alpha1/fake",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/certificates/v1beta1",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/certificates/v1beta1/fake",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/core/v1",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/core/v1/fake",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/events/v1beta1",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/events/v1beta1/fake",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/extensions/v1beta1",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/extensions/v1beta1/fake",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/networking/v1",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/networking/v1/fake",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/policy/v1beta1",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/policy/v1beta1/fake",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/rbac/v1",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/rbac/v1/fake",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/rbac/v1alpha1",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/rbac/v1alpha1/fake",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/rbac/v1beta1",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/rbac/v1beta1/fake",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/scheduling/v1alpha1",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/scheduling/v1alpha1/fake",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/settings/v1alpha1",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/settings/v1alpha1/fake",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/storage/v1",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/storage/v1/fake",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/storage/v1alpha1",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/storage/v1alpha1/fake",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/storage/v1beta1",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/storage/v1beta1/fake",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/listers/admissionregistration/v1alpha1",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/listers/admissionregistration/v1beta1",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/listers/apps/v1",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/listers/apps/v1beta1",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/listers/apps/v1beta2",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/listers/autoscaling/v1",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/listers/autoscaling/v2beta1",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/listers/batch/v1",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/listers/batch/v1beta1",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/listers/batch/v2alpha1",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/listers/certificates/v1beta1",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/listers/core/v1",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/listers/events/v1beta1",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/listers/extensions/v1beta1",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/listers/networking/v1",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/listers/policy/v1beta1",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/listers/rbac/v1",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/listers/rbac/v1alpha1",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/listers/rbac/v1beta1",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/listers/scheduling/v1alpha1",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/listers/settings/v1alpha1",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/listers/storage/v1",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/listers/storage/v1alpha1",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/listers/storage/v1beta1",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/pkg/version",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/rest",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/rest/watch",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/testing",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/tools/auth",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/tools/cache",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/tools/clientcmd",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/tools/clientcmd/api",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/tools/clientcmd/api/latest",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/tools/clientcmd/api/v1",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/tools/metrics",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/tools/pager",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/tools/reference",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/transport",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/util/buffer",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/util/cert",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/util/flowcontrol",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/util/homedir",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/util/integer",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/util/retry",
-			"Rev": "dce0331f190bf5cc5352010093ab732fee8be96d"
+			"Rev": "d902e7da4bfa28d901dca2cb81b76e40ee7703ae"
 		},
 		{
 			"ImportPath": "k8s.io/kube-openapi/pkg/builder",
diff --git a/pkg/admission/config.go b/pkg/admission/config.go
index 07c2c90f8..f59d0608b 100644
--- a/pkg/admission/config.go
+++ b/pkg/admission/config.go
@@ -29,7 +29,6 @@ import (
 	"github.com/golang/glog"
 
 	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/runtime/serializer"
 	"k8s.io/apimachinery/pkg/util/sets"
 	"k8s.io/apiserver/pkg/apis/apiserver"
@@ -177,26 +176,3 @@ func (p configProvider) ConfigFor(pluginName string) (io.Reader, error) {
 	// there is no registered config that matches on plugin name.
 	return nil, nil
 }
-
-// writeYAML writes the specified object to a byte array as yaml.
-func writeYAML(obj runtime.Object, scheme *runtime.Scheme) ([]byte, error) {
-	gvks, _, err := scheme.ObjectKinds(obj)
-	if err != nil {
-		return nil, err
-	}
-	gvs := []schema.GroupVersion{}
-	for _, gvk := range gvks {
-		gvs = append(gvs, gvk.GroupVersion())
-	}
-	codecs := serializer.NewCodecFactory(scheme)
-	json, err := runtime.Encode(codecs.LegacyCodec(gvs...), obj)
-	if err != nil {
-		return nil, err
-	}
-
-	content, err := yaml.JSONToYAML(json)
-	if err != nil {
-		return nil, err
-	}
-	return content, err
-}
diff --git a/pkg/endpoints/handlers/negotiation/negotiate.go b/pkg/endpoints/handlers/negotiation/negotiate.go
index 226c0efe9..f9bb47bab 100644
--- a/pkg/endpoints/handlers/negotiation/negotiate.go
+++ b/pkg/endpoints/handlers/negotiation/negotiate.go
@@ -119,32 +119,6 @@ func isPrettyPrint(req *http.Request) bool {
 	return false
 }
 
-// negotiate the most appropriate content type given the accept header and a list of
-// alternatives.
-func negotiate(header string, alternatives []string) (goautoneg.Accept, bool) {
-	alternates := make([][]string, 0, len(alternatives))
-	for _, alternate := range alternatives {
-		alternates = append(alternates, strings.SplitN(alternate, "/", 2))
-	}
-	for _, clause := range goautoneg.ParseAccept(header) {
-		for _, alternate := range alternates {
-			if clause.Type == alternate[0] && clause.SubType == alternate[1] {
-				return clause, true
-			}
-			if clause.Type == alternate[0] && clause.SubType == "*" {
-				clause.SubType = alternate[1]
-				return clause, true
-			}
-			if clause.Type == "*" && clause.SubType == "*" {
-				clause.Type = alternate[0]
-				clause.SubType = alternate[1]
-				return clause, true
-			}
-		}
-	}
-	return goautoneg.Accept{}, false
-}
-
 // EndpointRestrictions is an interface that allows content-type negotiation
 // to verify server support for specific options
 type EndpointRestrictions interface {