diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index ec598d8c9..7f0095d09 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -1212,579 +1212,579 @@
 		},
 		{
 			"ImportPath": "k8s.io/client-go/discovery",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/discovery/fake",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/informers",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/informers/admissionregistration",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/informers/admissionregistration/v1alpha1",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/informers/admissionregistration/v1beta1",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/informers/apps",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/informers/apps/v1",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/informers/apps/v1beta1",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/informers/apps/v1beta2",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/informers/autoscaling",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/informers/autoscaling/v1",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/informers/autoscaling/v2beta1",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/informers/batch",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/informers/batch/v1",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/informers/batch/v1beta1",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/informers/batch/v2alpha1",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/informers/certificates",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/informers/certificates/v1beta1",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/informers/core",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/informers/core/v1",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/informers/events",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/informers/events/v1beta1",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/informers/extensions",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/informers/extensions/v1beta1",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/informers/internalinterfaces",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/informers/networking",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/informers/networking/v1",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/informers/policy",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/informers/policy/v1beta1",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/informers/rbac",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/informers/rbac/v1",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/informers/rbac/v1alpha1",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/informers/rbac/v1beta1",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/informers/scheduling",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/informers/scheduling/v1alpha1",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/informers/settings",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/informers/settings/v1alpha1",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/informers/storage",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/informers/storage/v1",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/informers/storage/v1alpha1",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/informers/storage/v1beta1",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/fake",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/scheme",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/admissionregistration/v1alpha1",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/admissionregistration/v1alpha1/fake",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/admissionregistration/v1beta1",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/admissionregistration/v1beta1/fake",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/apps/v1",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/apps/v1/fake",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/apps/v1beta1",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/apps/v1beta1/fake",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/apps/v1beta2",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/apps/v1beta2/fake",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/authentication/v1",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/authentication/v1/fake",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/authentication/v1beta1",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/authentication/v1beta1/fake",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/authorization/v1",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/authorization/v1/fake",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/authorization/v1beta1",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/authorization/v1beta1/fake",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/autoscaling/v1",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/autoscaling/v1/fake",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/autoscaling/v2beta1",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/autoscaling/v2beta1/fake",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/batch/v1",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/batch/v1/fake",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/batch/v1beta1",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/batch/v1beta1/fake",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/batch/v2alpha1",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/batch/v2alpha1/fake",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/certificates/v1beta1",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/certificates/v1beta1/fake",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/core/v1",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/core/v1/fake",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/events/v1beta1",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/events/v1beta1/fake",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/extensions/v1beta1",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/extensions/v1beta1/fake",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/networking/v1",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/networking/v1/fake",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/policy/v1beta1",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/policy/v1beta1/fake",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/rbac/v1",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/rbac/v1/fake",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/rbac/v1alpha1",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/rbac/v1alpha1/fake",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/rbac/v1beta1",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/rbac/v1beta1/fake",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/scheduling/v1alpha1",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/scheduling/v1alpha1/fake",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/settings/v1alpha1",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/settings/v1alpha1/fake",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/storage/v1",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/storage/v1/fake",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/storage/v1alpha1",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/storage/v1alpha1/fake",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/storage/v1beta1",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/kubernetes/typed/storage/v1beta1/fake",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/listers/admissionregistration/v1alpha1",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/listers/admissionregistration/v1beta1",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/listers/apps/v1",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/listers/apps/v1beta1",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/listers/apps/v1beta2",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/listers/autoscaling/v1",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/listers/autoscaling/v2beta1",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/listers/batch/v1",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/listers/batch/v1beta1",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/listers/batch/v2alpha1",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/listers/certificates/v1beta1",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/listers/core/v1",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/listers/events/v1beta1",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/listers/extensions/v1beta1",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/listers/networking/v1",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/listers/policy/v1beta1",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/listers/rbac/v1",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/listers/rbac/v1alpha1",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/listers/rbac/v1beta1",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/listers/scheduling/v1alpha1",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/listers/settings/v1alpha1",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/listers/storage/v1",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/listers/storage/v1alpha1",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/listers/storage/v1beta1",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/pkg/version",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/rest",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/rest/watch",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/testing",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/tools/auth",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/tools/cache",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/tools/clientcmd",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/tools/clientcmd/api",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/tools/clientcmd/api/latest",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/tools/clientcmd/api/v1",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/tools/metrics",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/tools/pager",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/tools/reference",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/transport",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/util/buffer",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/util/cert",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/util/flowcontrol",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/util/homedir",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/client-go/util/integer",
-			"Rev": "1b825e3a786379cb2ae2edc98a39e9c8cd68ee3c"
+			"Rev": "21ab0aa61a13eb1ea583b24c69943f9fea5929bd"
 		},
 		{
 			"ImportPath": "k8s.io/kube-openapi/pkg/builder",
diff --git a/pkg/util/logs/logs.go b/pkg/util/logs/logs.go
index a3909583a..c5ba084a5 100644
--- a/pkg/util/logs/logs.go
+++ b/pkg/util/logs/logs.go
@@ -26,13 +26,21 @@ import (
 	"k8s.io/apimachinery/pkg/util/wait"
 )
 
-var logFlushFreq = pflag.Duration("log-flush-frequency", 5*time.Second, "Maximum number of seconds between log flushes")
+const logFlushFreqFlagName = "log-flush-frequency"
+
+var logFlushFreq = pflag.Duration(logFlushFreqFlagName, 5*time.Second, "Maximum number of seconds between log flushes")
 
 // TODO(thockin): This is temporary until we agree on log dirs and put those into each cmd.
 func init() {
 	flag.Set("logtostderr", "true")
 }
 
+// AddFlags registers this package's flags on arbitrary FlagSets, such that they point to the
+// same value as the global flags.
+func AddFlags(fs *pflag.FlagSet) {
+	fs.AddFlag(pflag.Lookup(logFlushFreqFlagName))
+}
+
 // GlogWriter serves as a bridge between the standard log package and the glog package.
 type GlogWriter struct{}