diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index 49f8815e..52e48cef 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -460,647 +460,647 @@
 		},
 		{
 			"ImportPath": "k8s.io/client-go/discovery",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/discovery/fake",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/informers",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/informers/admissionregistration",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/informers/admissionregistration/v1alpha1",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/informers/admissionregistration/v1beta1",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/informers/apps",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/informers/apps/v1",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/informers/apps/v1beta1",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/informers/apps/v1beta2",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/informers/autoscaling",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/informers/autoscaling/v1",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/informers/autoscaling/v2beta1",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/informers/batch",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/informers/batch/v1",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/informers/batch/v1beta1",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/informers/batch/v2alpha1",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/informers/certificates",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/informers/certificates/v1beta1",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/informers/coordination",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/informers/coordination/v1beta1",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/informers/core",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/informers/core/v1",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/informers/events",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/informers/events/v1beta1",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/informers/extensions",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/informers/extensions/v1beta1",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/informers/internalinterfaces",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/informers/networking",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/informers/networking/v1",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/informers/policy",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/informers/policy/v1beta1",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/informers/rbac",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/informers/rbac/v1",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/informers/rbac/v1alpha1",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/informers/rbac/v1beta1",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/informers/scheduling",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/informers/scheduling/v1alpha1",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/informers/scheduling/v1beta1",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/informers/settings",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/informers/settings/v1alpha1",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/informers/storage",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/informers/storage/v1",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/informers/storage/v1alpha1",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/informers/storage/v1beta1",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/fake",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/scheme",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/admissionregistration/v1alpha1",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/admissionregistration/v1alpha1/fake",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/admissionregistration/v1beta1",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/admissionregistration/v1beta1/fake",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/apps/v1",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/apps/v1/fake",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/apps/v1beta1",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/apps/v1beta1/fake",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/apps/v1beta2",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/apps/v1beta2/fake",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/authentication/v1",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/authentication/v1/fake",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/authentication/v1beta1",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/authentication/v1beta1/fake",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/authorization/v1",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/authorization/v1/fake",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/authorization/v1beta1",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/authorization/v1beta1/fake",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/autoscaling/v1",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/autoscaling/v1/fake",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/autoscaling/v2beta1",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/autoscaling/v2beta1/fake",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/batch/v1",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/batch/v1/fake",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/batch/v1beta1",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/batch/v1beta1/fake",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/batch/v2alpha1",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/batch/v2alpha1/fake",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/certificates/v1beta1",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/certificates/v1beta1/fake",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/coordination/v1beta1",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/coordination/v1beta1/fake",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/core/v1",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/core/v1/fake",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/events/v1beta1",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/events/v1beta1/fake",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/extensions/v1beta1",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/extensions/v1beta1/fake",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/networking/v1",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/networking/v1/fake",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/policy/v1beta1",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/policy/v1beta1/fake",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/rbac/v1",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/rbac/v1/fake",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/rbac/v1alpha1",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/rbac/v1alpha1/fake",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/rbac/v1beta1",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/rbac/v1beta1/fake",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/scheduling/v1alpha1",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/scheduling/v1alpha1/fake",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/scheduling/v1beta1",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/scheduling/v1beta1/fake",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/settings/v1alpha1",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/settings/v1alpha1/fake",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/storage/v1",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/storage/v1/fake",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/storage/v1alpha1",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/storage/v1alpha1/fake",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/storage/v1beta1",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/storage/v1beta1/fake",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/listers/admissionregistration/v1alpha1",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/listers/admissionregistration/v1beta1",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/listers/apps/v1",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/listers/apps/v1beta1",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/listers/apps/v1beta2",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/listers/autoscaling/v1",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/listers/autoscaling/v2beta1",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/listers/batch/v1",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/listers/batch/v1beta1",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/listers/batch/v2alpha1",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/listers/certificates/v1beta1",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/listers/coordination/v1beta1",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/listers/core/v1",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/listers/events/v1beta1",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/listers/extensions/v1beta1",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/listers/networking/v1",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/listers/policy/v1beta1",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/listers/rbac/v1",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/listers/rbac/v1alpha1",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/listers/rbac/v1beta1",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/listers/scheduling/v1alpha1",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/listers/scheduling/v1beta1",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/listers/settings/v1alpha1",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/listers/storage/v1",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/listers/storage/v1alpha1",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/listers/storage/v1beta1",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/pkg/apis/clientauthentication",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/pkg/apis/clientauthentication/v1alpha1",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/pkg/apis/clientauthentication/v1beta1",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/pkg/version",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/plugin/pkg/client/auth/exec",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/rest",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/rest/watch",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/testing",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/tools/auth",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/tools/cache",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/tools/clientcmd",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/tools/clientcmd/api",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/tools/clientcmd/api/latest",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/tools/clientcmd/api/v1",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/tools/metrics",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/tools/pager",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/tools/record",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/tools/reference",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/transport",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/util/buffer",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/util/cert",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/util/connrotation",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/util/flowcontrol",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/util/homedir",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/util/integer",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/util/retry",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/util/workqueue",
-			"Rev": "a452c6c4361124523b81b214ffbdc71e917fbc9f"
+			"Rev": "0ec73abb067faf46eeb80234f4df6e8413ef3e09"
 		},
 		{
 			"ImportPath": "k8s.io/kube-openapi/pkg/util/proto",
diff --git a/pkg/client/clientset/versioned/fake/register.go b/pkg/client/clientset/versioned/fake/register.go
index 8bcf3327..8916108e 100644
--- a/pkg/client/clientset/versioned/fake/register.go
+++ b/pkg/client/clientset/versioned/fake/register.go
@@ -23,16 +23,15 @@ import (
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	schema "k8s.io/apimachinery/pkg/runtime/schema"
 	serializer "k8s.io/apimachinery/pkg/runtime/serializer"
+	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 	samplecontrollerv1alpha1 "k8s.io/sample-controller/pkg/apis/samplecontroller/v1alpha1"
 )
 
 var scheme = runtime.NewScheme()
 var codecs = serializer.NewCodecFactory(scheme)
 var parameterCodec = runtime.NewParameterCodec(scheme)
-
-func init() {
-	v1.AddToGroupVersion(scheme, schema.GroupVersion{Version: "v1"})
-	AddToScheme(scheme)
+var localSchemeBuilder = runtime.SchemeBuilder{
+	samplecontrollerv1alpha1.AddToScheme,
 }
 
 // AddToScheme adds all types of this clientset into the given scheme. This allows composition
@@ -45,10 +44,13 @@ func init() {
 //   )
 //
 //   kclientset, _ := kubernetes.NewForConfig(c)
-//   aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme)
+//   _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme)
 //
 // After this, RawExtensions in Kubernetes types will serialize kube-aggregator types
 // correctly.
-func AddToScheme(scheme *runtime.Scheme) {
-	samplecontrollerv1alpha1.AddToScheme(scheme)
+var AddToScheme = localSchemeBuilder.AddToScheme
+
+func init() {
+	v1.AddToGroupVersion(scheme, schema.GroupVersion{Version: "v1"})
+	utilruntime.Must(AddToScheme(scheme))
 }
diff --git a/pkg/client/clientset/versioned/scheme/register.go b/pkg/client/clientset/versioned/scheme/register.go
index 4fcc9c48..27c9b794 100644
--- a/pkg/client/clientset/versioned/scheme/register.go
+++ b/pkg/client/clientset/versioned/scheme/register.go
@@ -23,16 +23,15 @@ import (
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	schema "k8s.io/apimachinery/pkg/runtime/schema"
 	serializer "k8s.io/apimachinery/pkg/runtime/serializer"
+	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 	samplecontrollerv1alpha1 "k8s.io/sample-controller/pkg/apis/samplecontroller/v1alpha1"
 )
 
 var Scheme = runtime.NewScheme()
 var Codecs = serializer.NewCodecFactory(Scheme)
 var ParameterCodec = runtime.NewParameterCodec(Scheme)
-
-func init() {
-	v1.AddToGroupVersion(Scheme, schema.GroupVersion{Version: "v1"})
-	AddToScheme(Scheme)
+var localSchemeBuilder = runtime.SchemeBuilder{
+	samplecontrollerv1alpha1.AddToScheme,
 }
 
 // AddToScheme adds all types of this clientset into the given scheme. This allows composition
@@ -45,10 +44,13 @@ func init() {
 //   )
 //
 //   kclientset, _ := kubernetes.NewForConfig(c)
-//   aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme)
+//   _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme)
 //
 // After this, RawExtensions in Kubernetes types will serialize kube-aggregator types
 // correctly.
-func AddToScheme(scheme *runtime.Scheme) {
-	samplecontrollerv1alpha1.AddToScheme(scheme)
+var AddToScheme = localSchemeBuilder.AddToScheme
+
+func init() {
+	v1.AddToGroupVersion(Scheme, schema.GroupVersion{Version: "v1"})
+	utilruntime.Must(AddToScheme(Scheme))
 }
diff --git a/vendor/k8s.io/client-go/kubernetes/fake/register.go b/vendor/k8s.io/client-go/kubernetes/fake/register.go
index 79427d14..a39e7e59 100644
--- a/vendor/k8s.io/client-go/kubernetes/fake/register.go
+++ b/vendor/k8s.io/client-go/kubernetes/fake/register.go
@@ -53,15 +53,43 @@ import (
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	schema "k8s.io/apimachinery/pkg/runtime/schema"
 	serializer "k8s.io/apimachinery/pkg/runtime/serializer"
+	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 )
 
 var scheme = runtime.NewScheme()
 var codecs = serializer.NewCodecFactory(scheme)
 var parameterCodec = runtime.NewParameterCodec(scheme)
-
-func init() {
-	v1.AddToGroupVersion(scheme, schema.GroupVersion{Version: "v1"})
-	AddToScheme(scheme)
+var localSchemeBuilder = runtime.SchemeBuilder{
+	admissionregistrationv1alpha1.AddToScheme,
+	admissionregistrationv1beta1.AddToScheme,
+	appsv1beta1.AddToScheme,
+	appsv1beta2.AddToScheme,
+	appsv1.AddToScheme,
+	authenticationv1.AddToScheme,
+	authenticationv1beta1.AddToScheme,
+	authorizationv1.AddToScheme,
+	authorizationv1beta1.AddToScheme,
+	autoscalingv1.AddToScheme,
+	autoscalingv2beta1.AddToScheme,
+	batchv1.AddToScheme,
+	batchv1beta1.AddToScheme,
+	batchv2alpha1.AddToScheme,
+	certificatesv1beta1.AddToScheme,
+	coordinationv1beta1.AddToScheme,
+	corev1.AddToScheme,
+	eventsv1beta1.AddToScheme,
+	extensionsv1beta1.AddToScheme,
+	networkingv1.AddToScheme,
+	policyv1beta1.AddToScheme,
+	rbacv1.AddToScheme,
+	rbacv1beta1.AddToScheme,
+	rbacv1alpha1.AddToScheme,
+	schedulingv1alpha1.AddToScheme,
+	schedulingv1beta1.AddToScheme,
+	settingsv1alpha1.AddToScheme,
+	storagev1beta1.AddToScheme,
+	storagev1.AddToScheme,
+	storagev1alpha1.AddToScheme,
 }
 
 // AddToScheme adds all types of this clientset into the given scheme. This allows composition
@@ -74,39 +102,13 @@ func init() {
 //   )
 //
 //   kclientset, _ := kubernetes.NewForConfig(c)
-//   aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme)
+//   _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme)
 //
 // After this, RawExtensions in Kubernetes types will serialize kube-aggregator types
 // correctly.
-func AddToScheme(scheme *runtime.Scheme) {
-	admissionregistrationv1alpha1.AddToScheme(scheme)
-	admissionregistrationv1beta1.AddToScheme(scheme)
-	appsv1beta1.AddToScheme(scheme)
-	appsv1beta2.AddToScheme(scheme)
-	appsv1.AddToScheme(scheme)
-	authenticationv1.AddToScheme(scheme)
-	authenticationv1beta1.AddToScheme(scheme)
-	authorizationv1.AddToScheme(scheme)
-	authorizationv1beta1.AddToScheme(scheme)
-	autoscalingv1.AddToScheme(scheme)
-	autoscalingv2beta1.AddToScheme(scheme)
-	batchv1.AddToScheme(scheme)
-	batchv1beta1.AddToScheme(scheme)
-	batchv2alpha1.AddToScheme(scheme)
-	certificatesv1beta1.AddToScheme(scheme)
-	coordinationv1beta1.AddToScheme(scheme)
-	corev1.AddToScheme(scheme)
-	eventsv1beta1.AddToScheme(scheme)
-	extensionsv1beta1.AddToScheme(scheme)
-	networkingv1.AddToScheme(scheme)
-	policyv1beta1.AddToScheme(scheme)
-	rbacv1.AddToScheme(scheme)
-	rbacv1beta1.AddToScheme(scheme)
-	rbacv1alpha1.AddToScheme(scheme)
-	schedulingv1alpha1.AddToScheme(scheme)
-	schedulingv1beta1.AddToScheme(scheme)
-	settingsv1alpha1.AddToScheme(scheme)
-	storagev1beta1.AddToScheme(scheme)
-	storagev1.AddToScheme(scheme)
-	storagev1alpha1.AddToScheme(scheme)
+var AddToScheme = localSchemeBuilder.AddToScheme
+
+func init() {
+	v1.AddToGroupVersion(scheme, schema.GroupVersion{Version: "v1"})
+	utilruntime.Must(AddToScheme(scheme))
 }
diff --git a/vendor/k8s.io/client-go/kubernetes/scheme/register.go b/vendor/k8s.io/client-go/kubernetes/scheme/register.go
index 9f5c67f7..78d1d839 100644
--- a/vendor/k8s.io/client-go/kubernetes/scheme/register.go
+++ b/vendor/k8s.io/client-go/kubernetes/scheme/register.go
@@ -53,15 +53,43 @@ import (
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	schema "k8s.io/apimachinery/pkg/runtime/schema"
 	serializer "k8s.io/apimachinery/pkg/runtime/serializer"
+	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 )
 
 var Scheme = runtime.NewScheme()
 var Codecs = serializer.NewCodecFactory(Scheme)
 var ParameterCodec = runtime.NewParameterCodec(Scheme)
-
-func init() {
-	v1.AddToGroupVersion(Scheme, schema.GroupVersion{Version: "v1"})
-	AddToScheme(Scheme)
+var localSchemeBuilder = runtime.SchemeBuilder{
+	admissionregistrationv1alpha1.AddToScheme,
+	admissionregistrationv1beta1.AddToScheme,
+	appsv1beta1.AddToScheme,
+	appsv1beta2.AddToScheme,
+	appsv1.AddToScheme,
+	authenticationv1.AddToScheme,
+	authenticationv1beta1.AddToScheme,
+	authorizationv1.AddToScheme,
+	authorizationv1beta1.AddToScheme,
+	autoscalingv1.AddToScheme,
+	autoscalingv2beta1.AddToScheme,
+	batchv1.AddToScheme,
+	batchv1beta1.AddToScheme,
+	batchv2alpha1.AddToScheme,
+	certificatesv1beta1.AddToScheme,
+	coordinationv1beta1.AddToScheme,
+	corev1.AddToScheme,
+	eventsv1beta1.AddToScheme,
+	extensionsv1beta1.AddToScheme,
+	networkingv1.AddToScheme,
+	policyv1beta1.AddToScheme,
+	rbacv1.AddToScheme,
+	rbacv1beta1.AddToScheme,
+	rbacv1alpha1.AddToScheme,
+	schedulingv1alpha1.AddToScheme,
+	schedulingv1beta1.AddToScheme,
+	settingsv1alpha1.AddToScheme,
+	storagev1beta1.AddToScheme,
+	storagev1.AddToScheme,
+	storagev1alpha1.AddToScheme,
 }
 
 // AddToScheme adds all types of this clientset into the given scheme. This allows composition
@@ -74,39 +102,13 @@ func init() {
 //   )
 //
 //   kclientset, _ := kubernetes.NewForConfig(c)
-//   aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme)
+//   _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme)
 //
 // After this, RawExtensions in Kubernetes types will serialize kube-aggregator types
 // correctly.
-func AddToScheme(scheme *runtime.Scheme) {
-	admissionregistrationv1alpha1.AddToScheme(scheme)
-	admissionregistrationv1beta1.AddToScheme(scheme)
-	appsv1beta1.AddToScheme(scheme)
-	appsv1beta2.AddToScheme(scheme)
-	appsv1.AddToScheme(scheme)
-	authenticationv1.AddToScheme(scheme)
-	authenticationv1beta1.AddToScheme(scheme)
-	authorizationv1.AddToScheme(scheme)
-	authorizationv1beta1.AddToScheme(scheme)
-	autoscalingv1.AddToScheme(scheme)
-	autoscalingv2beta1.AddToScheme(scheme)
-	batchv1.AddToScheme(scheme)
-	batchv1beta1.AddToScheme(scheme)
-	batchv2alpha1.AddToScheme(scheme)
-	certificatesv1beta1.AddToScheme(scheme)
-	coordinationv1beta1.AddToScheme(scheme)
-	corev1.AddToScheme(scheme)
-	eventsv1beta1.AddToScheme(scheme)
-	extensionsv1beta1.AddToScheme(scheme)
-	networkingv1.AddToScheme(scheme)
-	policyv1beta1.AddToScheme(scheme)
-	rbacv1.AddToScheme(scheme)
-	rbacv1beta1.AddToScheme(scheme)
-	rbacv1alpha1.AddToScheme(scheme)
-	schedulingv1alpha1.AddToScheme(scheme)
-	schedulingv1beta1.AddToScheme(scheme)
-	settingsv1alpha1.AddToScheme(scheme)
-	storagev1beta1.AddToScheme(scheme)
-	storagev1.AddToScheme(scheme)
-	storagev1alpha1.AddToScheme(scheme)
+var AddToScheme = localSchemeBuilder.AddToScheme
+
+func init() {
+	v1.AddToGroupVersion(Scheme, schema.GroupVersion{Version: "v1"})
+	utilruntime.Must(AddToScheme(Scheme))
 }
diff --git a/vendor/k8s.io/code-generator/_examples/apiserver/clientset/internalversion/fake/register.go b/vendor/k8s.io/code-generator/_examples/apiserver/clientset/internalversion/fake/register.go
index 58b47c9f..5713015c 100644
--- a/vendor/k8s.io/code-generator/_examples/apiserver/clientset/internalversion/fake/register.go
+++ b/vendor/k8s.io/code-generator/_examples/apiserver/clientset/internalversion/fake/register.go
@@ -23,6 +23,7 @@ import (
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	schema "k8s.io/apimachinery/pkg/runtime/schema"
 	serializer "k8s.io/apimachinery/pkg/runtime/serializer"
+	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 	exampleinternalversion "k8s.io/code-generator/_examples/apiserver/apis/example"
 	secondexampleinternalversion "k8s.io/code-generator/_examples/apiserver/apis/example2"
 )
@@ -30,10 +31,9 @@ import (
 var scheme = runtime.NewScheme()
 var codecs = serializer.NewCodecFactory(scheme)
 var parameterCodec = runtime.NewParameterCodec(scheme)
-
-func init() {
-	v1.AddToGroupVersion(scheme, schema.GroupVersion{Version: "v1"})
-	AddToScheme(scheme)
+var localSchemeBuilder = runtime.SchemeBuilder{
+	exampleinternalversion.AddToScheme,
+	secondexampleinternalversion.AddToScheme,
 }
 
 // AddToScheme adds all types of this clientset into the given scheme. This allows composition
@@ -46,11 +46,13 @@ func init() {
 //   )
 //
 //   kclientset, _ := kubernetes.NewForConfig(c)
-//   aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme)
+//   _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme)
 //
 // After this, RawExtensions in Kubernetes types will serialize kube-aggregator types
 // correctly.
-func AddToScheme(scheme *runtime.Scheme) {
-	exampleinternalversion.AddToScheme(scheme)
-	secondexampleinternalversion.AddToScheme(scheme)
+var AddToScheme = localSchemeBuilder.AddToScheme
+
+func init() {
+	v1.AddToGroupVersion(scheme, schema.GroupVersion{Version: "v1"})
+	utilruntime.Must(AddToScheme(scheme))
 }
diff --git a/vendor/k8s.io/code-generator/_examples/apiserver/clientset/versioned/fake/register.go b/vendor/k8s.io/code-generator/_examples/apiserver/clientset/versioned/fake/register.go
index 79e20050..75282b82 100644
--- a/vendor/k8s.io/code-generator/_examples/apiserver/clientset/versioned/fake/register.go
+++ b/vendor/k8s.io/code-generator/_examples/apiserver/clientset/versioned/fake/register.go
@@ -23,6 +23,7 @@ import (
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	schema "k8s.io/apimachinery/pkg/runtime/schema"
 	serializer "k8s.io/apimachinery/pkg/runtime/serializer"
+	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 	examplev1 "k8s.io/code-generator/_examples/apiserver/apis/example/v1"
 	secondexamplev1 "k8s.io/code-generator/_examples/apiserver/apis/example2/v1"
 )
@@ -30,10 +31,9 @@ import (
 var scheme = runtime.NewScheme()
 var codecs = serializer.NewCodecFactory(scheme)
 var parameterCodec = runtime.NewParameterCodec(scheme)
-
-func init() {
-	v1.AddToGroupVersion(scheme, schema.GroupVersion{Version: "v1"})
-	AddToScheme(scheme)
+var localSchemeBuilder = runtime.SchemeBuilder{
+	examplev1.AddToScheme,
+	secondexamplev1.AddToScheme,
 }
 
 // AddToScheme adds all types of this clientset into the given scheme. This allows composition
@@ -46,11 +46,13 @@ func init() {
 //   )
 //
 //   kclientset, _ := kubernetes.NewForConfig(c)
-//   aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme)
+//   _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme)
 //
 // After this, RawExtensions in Kubernetes types will serialize kube-aggregator types
 // correctly.
-func AddToScheme(scheme *runtime.Scheme) {
-	examplev1.AddToScheme(scheme)
-	secondexamplev1.AddToScheme(scheme)
+var AddToScheme = localSchemeBuilder.AddToScheme
+
+func init() {
+	v1.AddToGroupVersion(scheme, schema.GroupVersion{Version: "v1"})
+	utilruntime.Must(AddToScheme(scheme))
 }
diff --git a/vendor/k8s.io/code-generator/_examples/apiserver/clientset/versioned/scheme/register.go b/vendor/k8s.io/code-generator/_examples/apiserver/clientset/versioned/scheme/register.go
index 16f0196a..e4c8dc10 100644
--- a/vendor/k8s.io/code-generator/_examples/apiserver/clientset/versioned/scheme/register.go
+++ b/vendor/k8s.io/code-generator/_examples/apiserver/clientset/versioned/scheme/register.go
@@ -23,6 +23,7 @@ import (
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	schema "k8s.io/apimachinery/pkg/runtime/schema"
 	serializer "k8s.io/apimachinery/pkg/runtime/serializer"
+	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 	examplev1 "k8s.io/code-generator/_examples/apiserver/apis/example/v1"
 	secondexamplev1 "k8s.io/code-generator/_examples/apiserver/apis/example2/v1"
 )
@@ -30,10 +31,9 @@ import (
 var Scheme = runtime.NewScheme()
 var Codecs = serializer.NewCodecFactory(Scheme)
 var ParameterCodec = runtime.NewParameterCodec(Scheme)
-
-func init() {
-	v1.AddToGroupVersion(Scheme, schema.GroupVersion{Version: "v1"})
-	AddToScheme(Scheme)
+var localSchemeBuilder = runtime.SchemeBuilder{
+	examplev1.AddToScheme,
+	secondexamplev1.AddToScheme,
 }
 
 // AddToScheme adds all types of this clientset into the given scheme. This allows composition
@@ -46,11 +46,13 @@ func init() {
 //   )
 //
 //   kclientset, _ := kubernetes.NewForConfig(c)
-//   aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme)
+//   _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme)
 //
 // After this, RawExtensions in Kubernetes types will serialize kube-aggregator types
 // correctly.
-func AddToScheme(scheme *runtime.Scheme) {
-	examplev1.AddToScheme(scheme)
-	secondexamplev1.AddToScheme(scheme)
+var AddToScheme = localSchemeBuilder.AddToScheme
+
+func init() {
+	v1.AddToGroupVersion(Scheme, schema.GroupVersion{Version: "v1"})
+	utilruntime.Must(AddToScheme(Scheme))
 }
diff --git a/vendor/k8s.io/code-generator/_examples/crd/clientset/versioned/fake/register.go b/vendor/k8s.io/code-generator/_examples/crd/clientset/versioned/fake/register.go
index d91e79da..f3fd49d0 100644
--- a/vendor/k8s.io/code-generator/_examples/crd/clientset/versioned/fake/register.go
+++ b/vendor/k8s.io/code-generator/_examples/crd/clientset/versioned/fake/register.go
@@ -23,6 +23,7 @@ import (
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	schema "k8s.io/apimachinery/pkg/runtime/schema"
 	serializer "k8s.io/apimachinery/pkg/runtime/serializer"
+	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 	examplev1 "k8s.io/code-generator/_examples/crd/apis/example/v1"
 	secondexamplev1 "k8s.io/code-generator/_examples/crd/apis/example2/v1"
 )
@@ -30,10 +31,9 @@ import (
 var scheme = runtime.NewScheme()
 var codecs = serializer.NewCodecFactory(scheme)
 var parameterCodec = runtime.NewParameterCodec(scheme)
-
-func init() {
-	v1.AddToGroupVersion(scheme, schema.GroupVersion{Version: "v1"})
-	AddToScheme(scheme)
+var localSchemeBuilder = runtime.SchemeBuilder{
+	examplev1.AddToScheme,
+	secondexamplev1.AddToScheme,
 }
 
 // AddToScheme adds all types of this clientset into the given scheme. This allows composition
@@ -46,11 +46,13 @@ func init() {
 //   )
 //
 //   kclientset, _ := kubernetes.NewForConfig(c)
-//   aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme)
+//   _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme)
 //
 // After this, RawExtensions in Kubernetes types will serialize kube-aggregator types
 // correctly.
-func AddToScheme(scheme *runtime.Scheme) {
-	examplev1.AddToScheme(scheme)
-	secondexamplev1.AddToScheme(scheme)
+var AddToScheme = localSchemeBuilder.AddToScheme
+
+func init() {
+	v1.AddToGroupVersion(scheme, schema.GroupVersion{Version: "v1"})
+	utilruntime.Must(AddToScheme(scheme))
 }
diff --git a/vendor/k8s.io/code-generator/_examples/crd/clientset/versioned/scheme/register.go b/vendor/k8s.io/code-generator/_examples/crd/clientset/versioned/scheme/register.go
index 7a5ad4f8..a98fc7ea 100644
--- a/vendor/k8s.io/code-generator/_examples/crd/clientset/versioned/scheme/register.go
+++ b/vendor/k8s.io/code-generator/_examples/crd/clientset/versioned/scheme/register.go
@@ -23,6 +23,7 @@ import (
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	schema "k8s.io/apimachinery/pkg/runtime/schema"
 	serializer "k8s.io/apimachinery/pkg/runtime/serializer"
+	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 	examplev1 "k8s.io/code-generator/_examples/crd/apis/example/v1"
 	secondexamplev1 "k8s.io/code-generator/_examples/crd/apis/example2/v1"
 )
@@ -30,10 +31,9 @@ import (
 var Scheme = runtime.NewScheme()
 var Codecs = serializer.NewCodecFactory(Scheme)
 var ParameterCodec = runtime.NewParameterCodec(Scheme)
-
-func init() {
-	v1.AddToGroupVersion(Scheme, schema.GroupVersion{Version: "v1"})
-	AddToScheme(Scheme)
+var localSchemeBuilder = runtime.SchemeBuilder{
+	examplev1.AddToScheme,
+	secondexamplev1.AddToScheme,
 }
 
 // AddToScheme adds all types of this clientset into the given scheme. This allows composition
@@ -46,11 +46,13 @@ func init() {
 //   )
 //
 //   kclientset, _ := kubernetes.NewForConfig(c)
-//   aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme)
+//   _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme)
 //
 // After this, RawExtensions in Kubernetes types will serialize kube-aggregator types
 // correctly.
-func AddToScheme(scheme *runtime.Scheme) {
-	examplev1.AddToScheme(scheme)
-	secondexamplev1.AddToScheme(scheme)
+var AddToScheme = localSchemeBuilder.AddToScheme
+
+func init() {
+	v1.AddToGroupVersion(Scheme, schema.GroupVersion{Version: "v1"})
+	utilruntime.Must(AddToScheme(Scheme))
 }
diff --git a/vendor/k8s.io/code-generator/cmd/client-gen/generators/scheme/generator_for_scheme.go b/vendor/k8s.io/code-generator/cmd/client-gen/generators/scheme/generator_for_scheme.go
index dd9afadb..60cfbcc0 100644
--- a/vendor/k8s.io/code-generator/cmd/client-gen/generators/scheme/generator_for_scheme.go
+++ b/vendor/k8s.io/code-generator/cmd/client-gen/generators/scheme/generator_for_scheme.go
@@ -93,6 +93,8 @@ func (g *GenScheme) GenerateType(c *generator.Context, t *types.Type, w io.Write
 		"runtimeNewScheme":          c.Universe.Function(types.Name{Package: "k8s.io/apimachinery/pkg/runtime", Name: "NewScheme"}),
 		"serializerNewCodecFactory": c.Universe.Function(types.Name{Package: "k8s.io/apimachinery/pkg/runtime/serializer", Name: "NewCodecFactory"}),
 		"runtimeScheme":             c.Universe.Type(types.Name{Package: "k8s.io/apimachinery/pkg/runtime", Name: "Scheme"}),
+		"runtimeSchemeBuilder":      c.Universe.Type(types.Name{Package: "k8s.io/apimachinery/pkg/runtime", Name: "SchemeBuilder"}),
+		"runtimeUtilMust":           c.Universe.Function(types.Name{Package: "k8s.io/apimachinery/pkg/util/runtime", Name: "Must"}),
 		"schemaGroupVersion":        c.Universe.Type(types.Name{Package: "k8s.io/apimachinery/pkg/runtime/schema", Name: "GroupVersion"}),
 		"metav1AddToGroupVersion":   c.Universe.Function(types.Name{Package: "k8s.io/apimachinery/pkg/apis/meta/v1", Name: "AddToGroupVersion"}),
 	}
@@ -130,10 +132,10 @@ func (g *GenScheme) GenerateType(c *generator.Context, t *types.Type, w io.Write
 var globalsTemplate = `
 var $.Scheme$ = $.runtimeNewScheme|raw$()
 var $.Codecs$ = $.serializerNewCodecFactory|raw$($.Scheme$)
-var $.ParameterCodec$ = $.runtimeNewParameterCodec|raw$($.Scheme$)
-`
+var $.ParameterCodec$ = $.runtimeNewParameterCodec|raw$($.Scheme$)`
 
 var registryRegistration = `
+
 func init() {
 	$.metav1AddToGroupVersion|raw$($.Scheme$, $.schemaGroupVersion|raw${Version: "v1"})
 	Install($.Scheme$)
@@ -151,11 +153,13 @@ func Install(scheme *$.runtimeScheme|raw$) {
 `
 
 var simpleRegistration = `
-
-
-func init() {
-	$.metav1AddToGroupVersion|raw$($.Scheme$, $.schemaGroupVersion|raw${Version: "v1"})
-	AddToScheme($.Scheme$)
+var localSchemeBuilder = $.runtimeSchemeBuilder|raw${
+	$- range .allGroupVersions$
+	$.PackageAlias$.AddToScheme,
+	$- end$
+	$if .customRegister$
+	ExtraAddToScheme,
+	$end -$
 }
 
 // AddToScheme adds all types of this clientset into the given scheme. This allows composition
@@ -168,16 +172,14 @@ func init() {
 //   )
 //
 //   kclientset, _ := kubernetes.NewForConfig(c)
-//   aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme)
+//   _ = aggregatorclientsetscheme.AddToScheme(clientsetscheme.Scheme)
 //
 // After this, RawExtensions in Kubernetes types will serialize kube-aggregator types
 // correctly.
-func AddToScheme(scheme *$.runtimeScheme|raw$) {
-	$- range .allGroupVersions$
-	$.PackageAlias$.AddToScheme(scheme)
-	$- end$
-	$if .customRegister$
-	ExtraAddToScheme(scheme)
-	$end -$
+var AddToScheme = localSchemeBuilder.AddToScheme
+
+func init() {
+	$.metav1AddToGroupVersion|raw$($.Scheme$, $.schemaGroupVersion|raw${Version: "v1"})
+	$.runtimeUtilMust|raw$(AddToScheme($.Scheme$))
 }
 `