Merge pull request #54801 from apelisse/fix-broken-truncate

Automatic merge from submit-queue (batch tested with PRs 53190, 54790, 54445, 52607, 54801). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Update `truncateBody` to not truncate with high level And add a unit-tests to verify that it works properly. **What this PR does / why we need it**: Update `truncateBody` so that one can use `V(10)` to read the entire content of a HTTP response. **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes # **Special notes for your reviewer**: **Release note**: ```release-note NONE ``` Kubernetes-commit: 7fdacaa6bf2bc406998f059416339c3402fdccd4
Merge pull request #319 from caesarxuchao/remove-dep
2026-06-22 17:54:57 +00:00 · 2017-12-07 04:13:40 +00:00 · 2017-11-01 12:11:50 -07:00 · 2017-10-31 19:48:53 -07:00 · 2017-10-31 19:47:32 -07:00 · 2017-10-31 19:36:26 -07:00
545 changed files with 29316 additions and 7680 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,18 +2,81 @@ TODO: This document was manually maintained so might be incomplete. The
 automation effort is tracked in
 https://github.com/kubernetes/client-go/issues/234.

-# HEAD (changes that will go into v5)
+# v5.0.1

-** Breaking changes**
+Bug fix: picked up a security fix [kubernetes/kubernetes#53443](https://github.com/kubernetes/kubernetes/pull/53443) for `PodSecurityPolicy`.

-pkg/api and pkg/apis are moved to
-[k8s.io/api](https://github.com/kubernetes/api). Other kubernetes repositories
-also import types from there, so they are composable with client-go.
+# v5.0.0

-Helper functions in pkg/api and pkg/apis are also removed. They are planned to
-be exported in other repos. The issue is tracked
-[here](https://github.com/kubernetes/kubernetes/issues/48209#issuecomment-314537745).
-During the transition, you'll have to copy the helper functions to your projects. 
+**New features:**
+
+* Added paging support
+
+   * [https://github.com/kubernetes/kubernetes/pull/51876](https://github.com/kubernetes/kubernetes/pull/51876)
+
+* Added support for client-side spam filtering of events
+
+   * [https://github.com/kubernetes/kubernetes/pull/47367](https://github.com/kubernetes/kubernetes/pull/47367)
+
+* Added support for http etag and caching
+
+   * [https://github.com/kubernetes/kubernetes/pull/50404](https://github.com/kubernetes/kubernetes/pull/50404)
+
+* Added priority queue support to informer cache
+
+   * [https://github.com/kubernetes/kubernetes/pull/49752](https://github.com/kubernetes/kubernetes/pull/49752)
+
+* Added openstack auth provider
+
+   * [https://github.com/kubernetes/kubernetes/pull/39587](https://github.com/kubernetes/kubernetes/pull/39587)
+
+* Added metrics for checking reflector health
+
+   * [https://github.com/kubernetes/kubernetes/pull/48224](https://github.com/kubernetes/kubernetes/pull/48224)
+
+* Client-go now includes the leaderelection package
+
+   * [https://github.com/kubernetes/kubernetes/pull/39173](https://github.com/kubernetes/kubernetes/pull/39173)
+
+**API changes:**
+
+* Promoted Autoscaling v2alpha1 to v2beta1
+
+   * [https://github.com/kubernetes/kubernetes/pull/50708](https://github.com/kubernetes/kubernetes/pull/50708)
+
+* Promoted CronJobs to batch/v1beta1
+
+   * [https://github.com/kubernetes/kubernetes/pull/41901](https://github.com/kubernetes/kubernetes/pull/41901)
+
+* Promoted rbac.authorization.k8s.io/v1beta1 to rbac.authorization.k8s.io/v1
+
+   * [https://github.com/kubernetes/kubernetes/pull/49642](https://github.com/kubernetes/kubernetes/pull/49642)
+
+* Added a new API version apps/v1beta2
+
+   * [https://github.com/kubernetes/kubernetes/pull/48746](https://github.com/kubernetes/kubernetes/pull/48746)
+
+* Added a new API version scheduling/v1alpha1
+
+   * [https://github.com/kubernetes/kubernetes/pull/48377](https://github.com/kubernetes/kubernetes/pull/48377)
+
+**Breaking changes:**
+
+* Moved pkg/api and pkg/apis to [k8s.io/api](https://github.com/kubernetes/api). Other kubernetes repositories also import types from there, so they are composable with client-go.
+
+* Removed helper functions in pkg/api and pkg/apis. They are planned to be exported in other repos. The issue is tracked [here](https://github.com/kubernetes/kubernetes/issues/48209#issuecomment-314537745). During the transition, you'll have to copy the helper functions to your projects.
+
+* The discovery client now fetches the protobuf encoded OpenAPI schema and returns `openapi_v2.Document`
+
+   * [https://github.com/kubernetes/kubernetes/pull/46803](https://github.com/kubernetes/kubernetes/pull/46803)
+
+* Enforced explicit references to API group client interfaces in clientsets to avoid ambiguity.
+
+   * [https://github.com/kubernetes/kubernetes/pull/49370](https://github.com/kubernetes/kubernetes/pull/49370)
+
+* The generic RESTClient type (`k8s.io/client-go/rest`) no longer exposes `LabelSelectorParam` or `FieldSelectorParam` methods - use `VersionedParams` with `metav1.ListOptions` instead. The `UintParam` method has been removed. The `timeout` parameter will no longer cause an error when using `Param()`.
+
+   * [https://github.com/kubernetes/kubernetes/pull/48991](https://github.com/kubernetes/kubernetes/pull/48991)

 # v4.0.0

--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -90,10 +90,6 @@
      "ImportPath": "github.com/emicklei/go-restful",
      "Rev": "ff4f55a206334ef123e4f79bbf348980da81ca46"
    },
-    {
-      "ImportPath": "github.com/emicklei/go-restful-swagger12",
-      "Rev": "dcef7f55730566d41eae5db10e7d6981829720f6"
-    },
    {
      "ImportPath": "github.com/emicklei/go-restful/log",
      "Rev": "ff4f55a206334ef123e4f79bbf348980da81ca46"
@@ -112,11 +108,11 @@
    },
    {
      "ImportPath": "github.com/go-openapi/spec",
-      "Rev": "6aced65f8501fe1217321abf0749d354824ba2ff"
+      "Rev": "7abd5745472fff5eb3685386d5fb8bf38683154d"
    },
    {
      "ImportPath": "github.com/go-openapi/swag",
-      "Rev": "1d0bd113de87027671077d3c71eb3ac5d7dbba72"
+      "Rev": "f3f9494671f93fcff853e3c6e9e948b3eb71e590"
    },
    {
      "ImportPath": "github.com/gogo/protobuf/proto",
@@ -176,31 +172,31 @@
    },
    {
      "ImportPath": "github.com/gophercloud/gophercloud",
-      "Rev": "c0406a133c4a74a838baf0ddff3c2fab21155fba"
+      "Rev": "443743e88335413103dcf1997e46d401b264fbcd"
    },
    {
      "ImportPath": "github.com/gophercloud/gophercloud/openstack",
-      "Rev": "c0406a133c4a74a838baf0ddff3c2fab21155fba"
+      "Rev": "443743e88335413103dcf1997e46d401b264fbcd"
    },
    {
      "ImportPath": "github.com/gophercloud/gophercloud/openstack/identity/v2/tenants",
-      "Rev": "c0406a133c4a74a838baf0ddff3c2fab21155fba"
+      "Rev": "443743e88335413103dcf1997e46d401b264fbcd"
    },
    {
      "ImportPath": "github.com/gophercloud/gophercloud/openstack/identity/v2/tokens",
-      "Rev": "c0406a133c4a74a838baf0ddff3c2fab21155fba"
+      "Rev": "443743e88335413103dcf1997e46d401b264fbcd"
    },
    {
      "ImportPath": "github.com/gophercloud/gophercloud/openstack/identity/v3/tokens",
-      "Rev": "c0406a133c4a74a838baf0ddff3c2fab21155fba"
+      "Rev": "443743e88335413103dcf1997e46d401b264fbcd"
    },
    {
      "ImportPath": "github.com/gophercloud/gophercloud/openstack/utils",
-      "Rev": "c0406a133c4a74a838baf0ddff3c2fab21155fba"
+      "Rev": "443743e88335413103dcf1997e46d401b264fbcd"
    },
    {
      "ImportPath": "github.com/gophercloud/gophercloud/pagination",
-      "Rev": "c0406a133c4a74a838baf0ddff3c2fab21155fba"
+      "Rev": "443743e88335413103dcf1997e46d401b264fbcd"
    },
    {
      "ImportPath": "github.com/gregjones/httpcache",
@@ -240,15 +236,15 @@
    },
    {
      "ImportPath": "github.com/mailru/easyjson/buffer",
-      "Rev": "d5b7844b561a7bc640052f1b935f7b800330d7e0"
+      "Rev": "2f5df55504ebc322e4d52d34df6a1f5b503bf26d"
    },
    {
      "ImportPath": "github.com/mailru/easyjson/jlexer",
-      "Rev": "d5b7844b561a7bc640052f1b935f7b800330d7e0"
+      "Rev": "2f5df55504ebc322e4d52d34df6a1f5b503bf26d"
    },
    {
      "ImportPath": "github.com/mailru/easyjson/jwriter",
-      "Rev": "d5b7844b561a7bc640052f1b935f7b800330d7e0"
+      "Rev": "2f5df55504ebc322e4d52d34df6a1f5b503bf26d"
    },
    {
      "ImportPath": "github.com/peterbourgon/diskv",
@@ -268,7 +264,7 @@
    },
    {
      "ImportPath": "golang.org/x/crypto/ssh/terminal",
-      "Rev": "d172538b2cfce0c13cee31e647d0367aa8cd2486"
+      "Rev": "81e90905daefcd6fd217b62423c0908922eadb30"
    },
    {
      "ImportPath": "golang.org/x/net/context",
@@ -316,7 +312,11 @@
    },
    {
      "ImportPath": "golang.org/x/sys/unix",
-      "Rev": "7a4fde3fda8ef580a89dbae8138c26041be14299"
+      "Rev": "7ddbeae9ae08c6a06a59597f0c9edbc5ff2444ce"
+    },
+    {
+      "ImportPath": "golang.org/x/sys/windows",
+      "Rev": "7ddbeae9ae08c6a06a59597f0c9edbc5ff2444ce"
    },
    {
      "ImportPath": "golang.org/x/text/cases",
@@ -372,299 +372,327 @@
    },
    {
      "ImportPath": "k8s.io/api/admissionregistration/v1alpha1",
-      "Rev": "021a0685b636ed3732cd73e57035cddfd074706a"
+      "Rev": "1414bb6a06f4bf767440cc791d9ecf844c867971"
+    },
+    {
+      "ImportPath": "k8s.io/api/apps/v1",
+      "Rev": "1414bb6a06f4bf767440cc791d9ecf844c867971"
    },
    {
      "ImportPath": "k8s.io/api/apps/v1beta1",
-      "Rev": "021a0685b636ed3732cd73e57035cddfd074706a"
+      "Rev": "1414bb6a06f4bf767440cc791d9ecf844c867971"
    },
    {
      "ImportPath": "k8s.io/api/apps/v1beta2",
-      "Rev": "021a0685b636ed3732cd73e57035cddfd074706a"
+      "Rev": "1414bb6a06f4bf767440cc791d9ecf844c867971"
    },
    {
      "ImportPath": "k8s.io/api/authentication/v1",
-      "Rev": "021a0685b636ed3732cd73e57035cddfd074706a"
+      "Rev": "1414bb6a06f4bf767440cc791d9ecf844c867971"
    },
    {
      "ImportPath": "k8s.io/api/authentication/v1beta1",
-      "Rev": "021a0685b636ed3732cd73e57035cddfd074706a"
+      "Rev": "1414bb6a06f4bf767440cc791d9ecf844c867971"
    },
    {
      "ImportPath": "k8s.io/api/authorization/v1",
-      "Rev": "021a0685b636ed3732cd73e57035cddfd074706a"
+      "Rev": "1414bb6a06f4bf767440cc791d9ecf844c867971"
    },
    {
      "ImportPath": "k8s.io/api/authorization/v1beta1",
-      "Rev": "021a0685b636ed3732cd73e57035cddfd074706a"
+      "Rev": "1414bb6a06f4bf767440cc791d9ecf844c867971"
    },
    {
      "ImportPath": "k8s.io/api/autoscaling/v1",
-      "Rev": "021a0685b636ed3732cd73e57035cddfd074706a"
+      "Rev": "1414bb6a06f4bf767440cc791d9ecf844c867971"
    },
    {
-      "ImportPath": "k8s.io/api/autoscaling/v2alpha1",
-      "Rev": "021a0685b636ed3732cd73e57035cddfd074706a"
+      "ImportPath": "k8s.io/api/autoscaling/v2beta1",
+      "Rev": "1414bb6a06f4bf767440cc791d9ecf844c867971"
    },
    {
      "ImportPath": "k8s.io/api/batch/v1",
-      "Rev": "021a0685b636ed3732cd73e57035cddfd074706a"
+      "Rev": "1414bb6a06f4bf767440cc791d9ecf844c867971"
    },
    {
      "ImportPath": "k8s.io/api/batch/v1beta1",
-      "Rev": "021a0685b636ed3732cd73e57035cddfd074706a"
+      "Rev": "1414bb6a06f4bf767440cc791d9ecf844c867971"
    },
    {
      "ImportPath": "k8s.io/api/batch/v2alpha1",
-      "Rev": "021a0685b636ed3732cd73e57035cddfd074706a"
+      "Rev": "1414bb6a06f4bf767440cc791d9ecf844c867971"
    },
    {
      "ImportPath": "k8s.io/api/certificates/v1beta1",
-      "Rev": "021a0685b636ed3732cd73e57035cddfd074706a"
+      "Rev": "1414bb6a06f4bf767440cc791d9ecf844c867971"
    },
    {
      "ImportPath": "k8s.io/api/core/v1",
-      "Rev": "021a0685b636ed3732cd73e57035cddfd074706a"
+      "Rev": "1414bb6a06f4bf767440cc791d9ecf844c867971"
    },
    {
      "ImportPath": "k8s.io/api/extensions/v1beta1",
-      "Rev": "021a0685b636ed3732cd73e57035cddfd074706a"
+      "Rev": "1414bb6a06f4bf767440cc791d9ecf844c867971"
    },
    {
      "ImportPath": "k8s.io/api/imagepolicy/v1alpha1",
-      "Rev": "021a0685b636ed3732cd73e57035cddfd074706a"
+      "Rev": "1414bb6a06f4bf767440cc791d9ecf844c867971"
    },
    {
      "ImportPath": "k8s.io/api/networking/v1",
-      "Rev": "021a0685b636ed3732cd73e57035cddfd074706a"
+      "Rev": "1414bb6a06f4bf767440cc791d9ecf844c867971"
    },
    {
      "ImportPath": "k8s.io/api/policy/v1beta1",
-      "Rev": "021a0685b636ed3732cd73e57035cddfd074706a"
+      "Rev": "1414bb6a06f4bf767440cc791d9ecf844c867971"
    },
    {
      "ImportPath": "k8s.io/api/rbac/v1",
-      "Rev": "021a0685b636ed3732cd73e57035cddfd074706a"
+      "Rev": "1414bb6a06f4bf767440cc791d9ecf844c867971"
    },
    {
      "ImportPath": "k8s.io/api/rbac/v1alpha1",
-      "Rev": "021a0685b636ed3732cd73e57035cddfd074706a"
+      "Rev": "1414bb6a06f4bf767440cc791d9ecf844c867971"
    },
    {
      "ImportPath": "k8s.io/api/rbac/v1beta1",
-      "Rev": "021a0685b636ed3732cd73e57035cddfd074706a"
+      "Rev": "1414bb6a06f4bf767440cc791d9ecf844c867971"
    },
    {
      "ImportPath": "k8s.io/api/scheduling/v1alpha1",
-      "Rev": "021a0685b636ed3732cd73e57035cddfd074706a"
+      "Rev": "1414bb6a06f4bf767440cc791d9ecf844c867971"
    },
    {
      "ImportPath": "k8s.io/api/settings/v1alpha1",
-      "Rev": "021a0685b636ed3732cd73e57035cddfd074706a"
+      "Rev": "1414bb6a06f4bf767440cc791d9ecf844c867971"
    },
    {
      "ImportPath": "k8s.io/api/storage/v1",
-      "Rev": "021a0685b636ed3732cd73e57035cddfd074706a"
+      "Rev": "1414bb6a06f4bf767440cc791d9ecf844c867971"
    },
    {
      "ImportPath": "k8s.io/api/storage/v1beta1",
-      "Rev": "021a0685b636ed3732cd73e57035cddfd074706a"
+      "Rev": "1414bb6a06f4bf767440cc791d9ecf844c867971"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/api/equality",
-      "Rev": "03c2414c0d061466ee18ea8b9301392f0c8b7f27"
+      "Rev": "9cf13201f03e0dc2a9782ed30908f3030442a665"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/api/errors",
-      "Rev": "03c2414c0d061466ee18ea8b9301392f0c8b7f27"
+      "Rev": "9cf13201f03e0dc2a9782ed30908f3030442a665"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/api/meta",
-      "Rev": "03c2414c0d061466ee18ea8b9301392f0c8b7f27"
+      "Rev": "9cf13201f03e0dc2a9782ed30908f3030442a665"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/api/resource",
-      "Rev": "03c2414c0d061466ee18ea8b9301392f0c8b7f27"
+      "Rev": "9cf13201f03e0dc2a9782ed30908f3030442a665"
+    },
+    {
+      "ImportPath": "k8s.io/apimachinery/pkg/api/testing",
+      "Rev": "9cf13201f03e0dc2a9782ed30908f3030442a665"
+    },
+    {
+      "ImportPath": "k8s.io/apimachinery/pkg/api/testing/fuzzer",
+      "Rev": "9cf13201f03e0dc2a9782ed30908f3030442a665"
+    },
+    {
+      "ImportPath": "k8s.io/apimachinery/pkg/api/testing/roundtrip",
+      "Rev": "9cf13201f03e0dc2a9782ed30908f3030442a665"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/apimachinery",
-      "Rev": "03c2414c0d061466ee18ea8b9301392f0c8b7f27"
+      "Rev": "9cf13201f03e0dc2a9782ed30908f3030442a665"
+    },
+    {
+      "ImportPath": "k8s.io/apimachinery/pkg/apimachinery/announced",
+      "Rev": "9cf13201f03e0dc2a9782ed30908f3030442a665"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/apimachinery/registered",
-      "Rev": "03c2414c0d061466ee18ea8b9301392f0c8b7f27"
+      "Rev": "9cf13201f03e0dc2a9782ed30908f3030442a665"
+    },
+    {
+      "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/fuzzer",
+      "Rev": "9cf13201f03e0dc2a9782ed30908f3030442a665"
+    },
+    {
+      "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/internalversion",
+      "Rev": "9cf13201f03e0dc2a9782ed30908f3030442a665"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1",
-      "Rev": "03c2414c0d061466ee18ea8b9301392f0c8b7f27"
+      "Rev": "9cf13201f03e0dc2a9782ed30908f3030442a665"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured",
-      "Rev": "03c2414c0d061466ee18ea8b9301392f0c8b7f27"
+      "Rev": "9cf13201f03e0dc2a9782ed30908f3030442a665"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1alpha1",
-      "Rev": "03c2414c0d061466ee18ea8b9301392f0c8b7f27"
+      "Rev": "9cf13201f03e0dc2a9782ed30908f3030442a665"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/conversion",
-      "Rev": "03c2414c0d061466ee18ea8b9301392f0c8b7f27"
+      "Rev": "9cf13201f03e0dc2a9782ed30908f3030442a665"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/conversion/queryparams",
-      "Rev": "03c2414c0d061466ee18ea8b9301392f0c8b7f27"
+      "Rev": "9cf13201f03e0dc2a9782ed30908f3030442a665"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/conversion/unstructured",
-      "Rev": "03c2414c0d061466ee18ea8b9301392f0c8b7f27"
+      "Rev": "9cf13201f03e0dc2a9782ed30908f3030442a665"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/fields",
-      "Rev": "03c2414c0d061466ee18ea8b9301392f0c8b7f27"
+      "Rev": "9cf13201f03e0dc2a9782ed30908f3030442a665"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/labels",
-      "Rev": "03c2414c0d061466ee18ea8b9301392f0c8b7f27"
+      "Rev": "9cf13201f03e0dc2a9782ed30908f3030442a665"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/runtime",
-      "Rev": "03c2414c0d061466ee18ea8b9301392f0c8b7f27"
+      "Rev": "9cf13201f03e0dc2a9782ed30908f3030442a665"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/runtime/schema",
-      "Rev": "03c2414c0d061466ee18ea8b9301392f0c8b7f27"
+      "Rev": "9cf13201f03e0dc2a9782ed30908f3030442a665"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer",
-      "Rev": "03c2414c0d061466ee18ea8b9301392f0c8b7f27"
+      "Rev": "9cf13201f03e0dc2a9782ed30908f3030442a665"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/json",
-      "Rev": "03c2414c0d061466ee18ea8b9301392f0c8b7f27"
+      "Rev": "9cf13201f03e0dc2a9782ed30908f3030442a665"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/protobuf",
-      "Rev": "03c2414c0d061466ee18ea8b9301392f0c8b7f27"
+      "Rev": "9cf13201f03e0dc2a9782ed30908f3030442a665"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/recognizer",
-      "Rev": "03c2414c0d061466ee18ea8b9301392f0c8b7f27"
+      "Rev": "9cf13201f03e0dc2a9782ed30908f3030442a665"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/streaming",
-      "Rev": "03c2414c0d061466ee18ea8b9301392f0c8b7f27"
+      "Rev": "9cf13201f03e0dc2a9782ed30908f3030442a665"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/versioning",
-      "Rev": "03c2414c0d061466ee18ea8b9301392f0c8b7f27"
+      "Rev": "9cf13201f03e0dc2a9782ed30908f3030442a665"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/selection",
-      "Rev": "03c2414c0d061466ee18ea8b9301392f0c8b7f27"
+      "Rev": "9cf13201f03e0dc2a9782ed30908f3030442a665"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/types",
-      "Rev": "03c2414c0d061466ee18ea8b9301392f0c8b7f27"
+      "Rev": "9cf13201f03e0dc2a9782ed30908f3030442a665"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/util/cache",
-      "Rev": "03c2414c0d061466ee18ea8b9301392f0c8b7f27"
+      "Rev": "9cf13201f03e0dc2a9782ed30908f3030442a665"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/util/clock",
-      "Rev": "03c2414c0d061466ee18ea8b9301392f0c8b7f27"
+      "Rev": "9cf13201f03e0dc2a9782ed30908f3030442a665"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/util/diff",
-      "Rev": "03c2414c0d061466ee18ea8b9301392f0c8b7f27"
+      "Rev": "9cf13201f03e0dc2a9782ed30908f3030442a665"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/util/errors",
-      "Rev": "03c2414c0d061466ee18ea8b9301392f0c8b7f27"
+      "Rev": "9cf13201f03e0dc2a9782ed30908f3030442a665"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/util/framer",
-      "Rev": "03c2414c0d061466ee18ea8b9301392f0c8b7f27"
+      "Rev": "9cf13201f03e0dc2a9782ed30908f3030442a665"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/util/httpstream",
-      "Rev": "03c2414c0d061466ee18ea8b9301392f0c8b7f27"
+      "Rev": "9cf13201f03e0dc2a9782ed30908f3030442a665"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/util/httpstream/spdy",
-      "Rev": "03c2414c0d061466ee18ea8b9301392f0c8b7f27"
+      "Rev": "9cf13201f03e0dc2a9782ed30908f3030442a665"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/util/intstr",
-      "Rev": "03c2414c0d061466ee18ea8b9301392f0c8b7f27"
+      "Rev": "9cf13201f03e0dc2a9782ed30908f3030442a665"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/util/json",
-      "Rev": "03c2414c0d061466ee18ea8b9301392f0c8b7f27"
+      "Rev": "9cf13201f03e0dc2a9782ed30908f3030442a665"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/util/mergepatch",
-      "Rev": "03c2414c0d061466ee18ea8b9301392f0c8b7f27"
+      "Rev": "9cf13201f03e0dc2a9782ed30908f3030442a665"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/util/net",
-      "Rev": "03c2414c0d061466ee18ea8b9301392f0c8b7f27"
+      "Rev": "9cf13201f03e0dc2a9782ed30908f3030442a665"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/util/remotecommand",
-      "Rev": "03c2414c0d061466ee18ea8b9301392f0c8b7f27"
+      "Rev": "9cf13201f03e0dc2a9782ed30908f3030442a665"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/util/runtime",
-      "Rev": "03c2414c0d061466ee18ea8b9301392f0c8b7f27"
+      "Rev": "9cf13201f03e0dc2a9782ed30908f3030442a665"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/util/sets",
-      "Rev": "03c2414c0d061466ee18ea8b9301392f0c8b7f27"
+      "Rev": "9cf13201f03e0dc2a9782ed30908f3030442a665"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/util/strategicpatch",
-      "Rev": "03c2414c0d061466ee18ea8b9301392f0c8b7f27"
+      "Rev": "9cf13201f03e0dc2a9782ed30908f3030442a665"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/util/validation",
-      "Rev": "03c2414c0d061466ee18ea8b9301392f0c8b7f27"
+      "Rev": "9cf13201f03e0dc2a9782ed30908f3030442a665"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/util/validation/field",
-      "Rev": "03c2414c0d061466ee18ea8b9301392f0c8b7f27"
+      "Rev": "9cf13201f03e0dc2a9782ed30908f3030442a665"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/util/wait",
-      "Rev": "03c2414c0d061466ee18ea8b9301392f0c8b7f27"
+      "Rev": "9cf13201f03e0dc2a9782ed30908f3030442a665"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/util/yaml",
-      "Rev": "03c2414c0d061466ee18ea8b9301392f0c8b7f27"
+      "Rev": "9cf13201f03e0dc2a9782ed30908f3030442a665"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/version",
-      "Rev": "03c2414c0d061466ee18ea8b9301392f0c8b7f27"
+      "Rev": "9cf13201f03e0dc2a9782ed30908f3030442a665"
    },
    {
      "ImportPath": "k8s.io/apimachinery/pkg/watch",
-      "Rev": "03c2414c0d061466ee18ea8b9301392f0c8b7f27"
+      "Rev": "9cf13201f03e0dc2a9782ed30908f3030442a665"
    },
    {
      "ImportPath": "k8s.io/apimachinery/third_party/forked/golang/json",
-      "Rev": "03c2414c0d061466ee18ea8b9301392f0c8b7f27"
+      "Rev": "9cf13201f03e0dc2a9782ed30908f3030442a665"
    },
    {
      "ImportPath": "k8s.io/apimachinery/third_party/forked/golang/netutil",
-      "Rev": "03c2414c0d061466ee18ea8b9301392f0c8b7f27"
+      "Rev": "9cf13201f03e0dc2a9782ed30908f3030442a665"
    },
    {
      "ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect",
-      "Rev": "03c2414c0d061466ee18ea8b9301392f0c8b7f27"
+      "Rev": "9cf13201f03e0dc2a9782ed30908f3030442a665"
    },
    {
      "ImportPath": "k8s.io/kube-openapi/pkg/common",
-      "Rev": "80f07ef71bb4f781233c65aa8d0369e4ecafab87"
+      "Rev": "61b46af70dfed79c6d24530cd23b41440a7f22a5"
    }
  ]
 }
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -143,38 +143,20 @@ After modifying, run `glide up -v` again to re-populate your /vendor directory.
 Optionally, Glide users can also use [`glide-vc`](https://github.com/sgotti/glide-vc)
 after running `glide up -v` to remove unused files from /vendor.

-### Dep
+### Dep (Not supported yet!)

-[dep](https://github.com/golang/dep) is an up-and-coming dependency management tool,
-which has the goal of being accepted as part of the standard go toolchain. Its
-status is currently alpha. However, it comes the closest to working easily out
-of the box.
+[dep](https://github.com/golang/dep) is an up-and-coming dependency management
+tool, which has the goal of being accepted as part of the standard go toolchain.
+However, client-go does **NOT** work well with `dep` yet. To support `dep`, we
+need to fix at least two issues:
+1. publish native `Gopkg.toml` in client-go and other k8s.io repos, like `k8s.io/apimachinery`;
+2. find a way to express transitive constraints (see https://github.com/golang/dep/issues/1124).

-```sh
-$ go get github.com/golang/dep
-$ go install github.com/golang/dep/cmd/dep
+As a workaround, which may or may not be worthwhile, you can specify all
+client-go dependencies manually as
+[override](https://github.com/golang/dep/blob/master/docs/Gopkg.toml.md#override)
+in Gopkg.toml with the versions listed in [Godeps.json](./Godeps/Godeps.json),
+and manually update them when you upgrade client-go version.

-# Make sure you have a go file in your directory which imports a package of
-# k8s.io/client-go first--I suggest copying one of the examples.
-$ dep init
-$ dep ensure k8s.io/client-go@^2.0.0
-```
-
-Then you can try one of the
-[examples](https://github.com/kubernetes/client-go/tree/v2.0.0/examples/) from
-the 2.0.0 release.
-
-This will set up a `vendor` directory in your current directory, add `k8s.io/client-go`
-to it, and flatten all of `k8s.io/client-go`'s dependencies into that vendor directory,
-so that your code and `client-go` will both get the same copy of each
-dependency.
-
-After installing like this, you could either use dep for your other
-dependencies, or copy everything in the `vendor` directory into your
-`$GOPATH/src` directory and proceed as if you had done a fancy `go get` that
-flattened dependencies sanely.
-
-One thing to note about dep is that it will omit dependencies that aren't
-actually used, and some dependencies of `client-go` are used only if you import
-one of the plugins (for example, the auth plugins). So you may need to run `dep
-ensure` again if you start importing a plugin that you weren't using before.
+We are actively working on the two issues blocking using `dep`. For the
+meantime, we recommend using `glide` or `godeps`.
--- a/README.md
+++ b/README.md
@@ -17,6 +17,7 @@ will give you head and doesn't handle the dependencies well.
  - [Compatibility: client-go <-> Kubernetes clusters](#compatibility-client-go---kubernetes-clusters)
  - [Compatibility matrix](#compatibility-matrix)
  - [Why do the 1.4 and 1.5 branch contain top-level folder named after the version?](#why-do-the-14-and-15-branch-contain-top-level-folder-named-after-the-version)
+- [Kuberentes tags](#kubernetes-tags)
 - [How to get it](#how-to-get-it)
 - [How to use it](#how-to-use-it)
 - [Dependency management](#dependency-management)
@@ -80,27 +81,29 @@ We will backport bugfixes--but not new features--into older versions of

 #### Compatibility matrix

-|                     | Kubernetes 1.3 | Kubernetes 1.4 | Kubernetes 1.5 | Kubernetes 1.6 | Kubernetes 1.7 |
+|                     | Kubernetes 1.4 | Kubernetes 1.5 | Kubernetes 1.6 | Kubernetes 1.7 | Kubernetes 1.8 |
 |---------------------|----------------|----------------|----------------|----------------|----------------|
-| client-go 1.4       | +              | ✓              | -              | -              | -              |
-| client-go 1.5       | +              | +              | -              | -              | -              |
-| client-go 2.0       | +              | +              | ✓              | -              | -              |
-| client-go 3.0       | †              | †              | †              | ✓              | -              |
-| client-go 4.0       | †              | †              | †              | +              | ✓              |
-| client-go HEAD      | †              | †              | †              | +              | +              |
+| client-go 1.4       | ✓              | -              | -              | -              | -              |
+| client-go 1.5       | +              | -              | -              | -              | -              |
+| client-go 2.0       | +-             | ✓              | +-             | +-             | +-             |
+| client-go 3.0       | +-             | +-             | ✓              | -              | +-             |
+| client-go 4.0       | +-             | +-             | +-             | ✓              | +-             |
+| client-go 5.0       | +-             | +-             | +-             | +-             | ✓              |
+| client-go HEAD      | +-             | +-             | +-             | +-             | +              |

 Key:

 * `✓` Exactly the same features / API objects in both client-go and the Kubernetes
  version.
-* `+` client-go has features or api objects that may not be present in the
-  Kubernetes cluster, but everything they have in common will work. Please
-  note that alpha APIs may vanish or change significantly in a single release.
-* `†` client-go has new features or api objects, and some APIs running in the
-  cluster may have been deprecated and removed from client-go. But everything
-  they share in common (i.e., most APIs) will work.
-* `-` The Kubernetes cluster has features the client-go library can't use
-  (additional API objects, etc).
+* `+` client-go has features or API objects that may not be present in the
+  Kubernetes cluster, either due to that client-go has additional new API, or
+  that the server has removed old API. However, everything they have in
+  common (i.e., most APIs) will work. Please note that alpha APIs may vanish or
+  change significantly in a single release.
+* `-` The Kubernetes cluster has features the client-go library can't use,
+  either due to the server has additional new API, or that client-go has
+  removed old API. However, everything they share in common (i.e., most APIs)
+  will work.

 See the [CHANGELOG](./CHANGELOG.md) for a detailed description of changes
 between client-go versions.
@@ -112,6 +115,7 @@ between client-go versions.
 | client-go 2.0  | Kubernetes main repo, 1.5 branch     | ✓                             |
 | client-go 3.0  | Kubernetes main repo, 1.6 branch     | ✓                             |
 | client-go 4.0  | Kubernetes main repo, 1.7 branch     | ✓                             |
+| client-go 5.0  | Kubernetes main repo, 1.8 branch     | ✓                             |
 | client-go HEAD | Kubernetes main repo, master branch  | ✓                             |

 Key:
@@ -134,6 +138,23 @@ separate directories for each minor version. That soon proved to be a mistake.
 We are keeping the top-level folders in the 1.4 and 1.5 branches so that
 existing users won't be broken.

+### Kubernetes tags
+
+As of October 2017, client-go is still a mirror of
+[k8s.io/kubernetes/staging/src/client-go](https://github.com/kubernetes/kubernetes/tree/master/staging/src/k8s.io/client-go),
+the code development is still done in the staging area. Since Kubernetes 1.8
+release, when syncing the code from the staging area, we also sync the Kubernetes
+version tags to client-go, prefixed with "kubernetes-". For example, if you check
+out the `kubernetes-v1.8.0` tag in client-go, the code you get is exactly the
+same as if you check out the `v1.8.0` tag in kubernetes, and change directory to
+`staging/src/k8s.io/client-go`. The purpose is to let users quickly find matching
+commits among published repos, like
+[sample-apiserver](https://github.com/kubernetes/sample-apiserver),
+[apiextension-apiserver](https://github.com/kubernetes/apiextensions-apiserver),
+etc. The Kubernetes version tag does NOT claim any backwards compatibility
+guarantees for client-go. Please check the [semantic versions](#versioning) if
+you care about backwards compatibility.
+
 ### How to get it

 You can use `go get k8s.io/client-go/...` to get client-go, but **you will get
--- a/discovery/BUILD
+++ b/discovery/BUILD
@@ -14,12 +14,11 @@ go_library(
        "restmapper.go",
        "unstructured.go",
    ],
+    importpath = "k8s.io/client-go/discovery",
    deps = [
-        "//vendor/github.com/emicklei/go-restful-swagger12:go_default_library",
        "//vendor/github.com/golang/glog:go_default_library",
        "//vendor/github.com/golang/protobuf/proto:go_default_library",
        "//vendor/github.com/googleapis/gnostic/OpenAPIv2:go_default_library",
-        "//vendor/k8s.io/api/core/v1:go_default_library",
        "//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library",
        "//vendor/k8s.io/apimachinery/pkg/api/meta:go_default_library",
        "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
@@ -40,8 +39,8 @@ go_test(
        "helper_blackbox_test.go",
        "restmapper_test.go",
    ],
+    importpath = "k8s.io/client-go/discovery_test",
    deps = [
-        "//vendor/github.com/emicklei/go-restful-swagger12:go_default_library",
        "//vendor/github.com/gogo/protobuf/proto:go_default_library",
        "//vendor/github.com/googleapis/gnostic/OpenAPIv2:go_default_library",
        "//vendor/github.com/stretchr/testify/assert:go_default_library",
--- a/discovery/cached/BUILD
+++ b/discovery/cached/BUILD
@@ -9,6 +9,7 @@ load(
 go_test(
    name = "go_default_test",
    srcs = ["memcache_test.go"],
+    importpath = "k8s.io/client-go/discovery/cached",
    library = ":go_default_library",
    deps = [
        "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
@@ -19,11 +20,10 @@ go_test(
 go_library(
    name = "go_default_library",
    srcs = ["memcache.go"],
+    importpath = "k8s.io/client-go/discovery/cached",
    deps = [
-        "//vendor/github.com/emicklei/go-restful-swagger12:go_default_library",
        "//vendor/github.com/googleapis/gnostic/OpenAPIv2:go_default_library",
        "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
        "//vendor/k8s.io/apimachinery/pkg/util/runtime:go_default_library",
        "//vendor/k8s.io/apimachinery/pkg/version:go_default_library",
        "//vendor/k8s.io/client-go/discovery:go_default_library",
--- a/discovery/cached/memcache.go
+++ b/discovery/cached/memcache.go
@@ -21,11 +21,9 @@ import (
 	"fmt"
 	"sync"

-	"github.com/emicklei/go-restful-swagger12"
 	"github.com/googleapis/gnostic/OpenAPIv2"

 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/runtime/schema"
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 	"k8s.io/apimachinery/pkg/version"
 	"k8s.io/client-go/discovery"
@@ -116,10 +114,6 @@ func (d *memCacheClient) ServerVersion() (*version.Info, error) {
 	return d.delegate.ServerVersion()
 }

-func (d *memCacheClient) SwaggerSchema(version schema.GroupVersion) (*swagger.ApiDeclaration, error) {
-	return d.delegate.SwaggerSchema(version)
-}
-
 func (d *memCacheClient) OpenAPISchema() (*openapi_v2.Document, error) {
 	return d.delegate.OpenAPISchema()
 }
--- a/discovery/discovery_client.go
+++ b/discovery/discovery_client.go
@@ -23,11 +23,9 @@ import (
 	"sort"
 	"strings"

-	"github.com/emicklei/go-restful-swagger12"
 	"github.com/golang/protobuf/proto"
 	"github.com/googleapis/gnostic/OpenAPIv2"

-	"k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
@@ -48,7 +46,6 @@ type DiscoveryInterface interface {
 	ServerGroupsInterface
 	ServerResourcesInterface
 	ServerVersionInterface
-	SwaggerSchemaInterface
 	OpenAPISchemaInterface
 }

@@ -92,12 +89,6 @@ type ServerVersionInterface interface {
 	ServerVersion() (*version.Info, error)
 }

-// SwaggerSchemaInterface has a method to retrieve the swagger schema.
-type SwaggerSchemaInterface interface {
-	// SwaggerSchema retrieves and parses the swagger API schema the server supports.
-	SwaggerSchema(version schema.GroupVersion) (*swagger.ApiDeclaration, error)
-}
-
 // OpenAPISchemaInterface has a method to retrieve the open API schema.
 type OpenAPISchemaInterface interface {
 	// OpenAPISchema retrieves and parses the swagger API schema the server supports.
@@ -336,41 +327,6 @@ func (d *DiscoveryClient) ServerVersion() (*version.Info, error) {
 	return &info, nil
 }

-// SwaggerSchema retrieves and parses the swagger API schema the server supports.
-// TODO: Replace usages with Open API.  Tracked in https://github.com/kubernetes/kubernetes/issues/44589
-func (d *DiscoveryClient) SwaggerSchema(version schema.GroupVersion) (*swagger.ApiDeclaration, error) {
-	if version.Empty() {
-		return nil, fmt.Errorf("groupVersion cannot be empty")
-	}
-
-	groupList, err := d.ServerGroups()
-	if err != nil {
-		return nil, err
-	}
-	groupVersions := metav1.ExtractGroupVersions(groupList)
-	// This check also takes care the case that kubectl is newer than the running endpoint
-	if stringDoesntExistIn(version.String(), groupVersions) {
-		return nil, fmt.Errorf("API version: %v is not supported by the server. Use one of: %v", version, groupVersions)
-	}
-	var path string
-	if len(d.LegacyPrefix) > 0 && version == v1.SchemeGroupVersion {
-		path = "/swaggerapi" + d.LegacyPrefix + "/" + version.Version
-	} else {
-		path = "/swaggerapi/apis/" + version.Group + "/" + version.Version
-	}
-
-	body, err := d.restClient.Get().AbsPath(path).Do().Raw()
-	if err != nil {
-		return nil, err
-	}
-	var schema swagger.ApiDeclaration
-	err = json.Unmarshal(body, &schema)
-	if err != nil {
-		return nil, fmt.Errorf("got '%s': %v", string(body), err)
-	}
-	return &schema, nil
-}
-
 // OpenAPISchema fetches the open api schema using a rest client and parses the proto.
 func (d *DiscoveryClient) OpenAPISchema() (*openapi_v2.Document, error) {
 	data, err := d.restClient.Get().AbsPath("/swagger-2.0.0.pb-v1").Do().Raw()
--- a/discovery/discovery_client_test.go
+++ b/discovery/discovery_client_test.go
@@ -25,11 +25,9 @@ import (
 	"reflect"
 	"testing"

-	"github.com/emicklei/go-restful-swagger12"
 	"github.com/gogo/protobuf/proto"
 	"github.com/googleapis/gnostic/OpenAPIv2"

-	"k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/util/sets"
@@ -267,68 +265,6 @@ func TestGetServerResources(t *testing.T) {
 	}
 }

-func swaggerSchemaFakeServer() (*httptest.Server, error) {
-	request := 1
-	var sErr error
-
-	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
-		var resp interface{}
-		if request == 1 {
-			resp = metav1.APIVersions{Versions: []string{"v1", "v2", "v3"}}
-			request++
-		} else {
-			resp = swagger.ApiDeclaration{}
-		}
-		output, err := json.Marshal(resp)
-		if err != nil {
-			sErr = err
-			return
-		}
-		w.Header().Set("Content-Type", "application/json")
-		w.WriteHeader(http.StatusOK)
-		w.Write(output)
-	}))
-	return server, sErr
-}
-
-func TestGetSwaggerSchema(t *testing.T) {
-	expect := swagger.ApiDeclaration{}
-
-	server, err := swaggerSchemaFakeServer()
-	if err != nil {
-		t.Errorf("unexpected encoding error: %v", err)
-	}
-	defer server.Close()
-
-	client := NewDiscoveryClientForConfigOrDie(&restclient.Config{Host: server.URL})
-	got, err := client.SwaggerSchema(v1.SchemeGroupVersion)
-	if err != nil {
-		t.Fatalf("unexpected encoding error: %v", err)
-	}
-	if e, a := expect, *got; !reflect.DeepEqual(e, a) {
-		t.Errorf("expected %v, got %v", e, a)
-	}
-}
-
-func TestGetSwaggerSchemaFail(t *testing.T) {
-	expErr := "API version: api.group/v4 is not supported by the server. Use one of: [v1 v2 v3]"
-
-	server, err := swaggerSchemaFakeServer()
-	if err != nil {
-		t.Errorf("unexpected encoding error: %v", err)
-	}
-	defer server.Close()
-
-	client := NewDiscoveryClientForConfigOrDie(&restclient.Config{Host: server.URL})
-	got, err := client.SwaggerSchema(schema.GroupVersion{Group: "api.group", Version: "v4"})
-	if got != nil {
-		t.Fatalf("unexpected response: %v", got)
-	}
-	if err.Error() != expErr {
-		t.Errorf("expected an error, got %v", err)
-	}
-}
-
 var returnedOpenAPI = openapi_v2.Document{
 	Definitions: &openapi_v2.Definitions{
 		AdditionalProperties: []*openapi_v2.NamedSchema{
--- a/discovery/fake/BUILD
+++ b/discovery/fake/BUILD
@@ -3,15 +3,15 @@ package(default_visibility = ["//visibility:public"])
 load(
    "@io_bazel_rules_go//go:def.bzl",
    "go_library",
+    "go_test",
 )

 go_library(
    name = "go_default_library",
    srcs = ["discovery.go"],
+    importpath = "k8s.io/client-go/discovery/fake",
    deps = [
-        "//vendor/github.com/emicklei/go-restful-swagger12:go_default_library",
        "//vendor/github.com/googleapis/gnostic/OpenAPIv2:go_default_library",
-        "//vendor/k8s.io/api/core/v1:go_default_library",
        "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
        "//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
        "//vendor/k8s.io/apimachinery/pkg/version:go_default_library",
@@ -33,3 +33,14 @@ filegroup(
    srcs = [":package-srcs"],
    tags = ["automanaged"],
 )
+
+go_test(
+    name = "go_default_xtest",
+    srcs = ["discovery_test.go"],
+    importpath = "k8s.io/client-go/discovery/fake_test",
+    deps = [
+        "//vendor/k8s.io/apimachinery/pkg/version:go_default_library",
+        "//vendor/k8s.io/client-go/discovery/fake:go_default_library",
+        "//vendor/k8s.io/client-go/kubernetes/fake:go_default_library",
+    ],
+)
--- a/discovery/fake/discovery.go
+++ b/discovery/fake/discovery.go
@@ -19,10 +19,8 @@ package fake
 import (
 	"fmt"

-	"github.com/emicklei/go-restful-swagger12"
 	"github.com/googleapis/gnostic/OpenAPIv2"

-	"k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/version"
@@ -31,8 +29,11 @@ import (
 	"k8s.io/client-go/testing"
 )

+// FakeDiscovery implements discovery.DiscoveryInterface and sometimes calls testing.Fake.Invoke with an action,
+// but doesn't respect the return value if any. There is a way to fake static values like ServerVersion by using the Faked... fields on the struct.
 type FakeDiscovery struct {
 	*testing.Fake
+	FakedServerVersion *version.Info
 }

 func (c *FakeDiscovery) ServerResourcesForGroupVersion(groupVersion string) (*metav1.APIResourceList, error) {
@@ -67,30 +68,58 @@ func (c *FakeDiscovery) ServerPreferredNamespacedResources() ([]*metav1.APIResou
 }

 func (c *FakeDiscovery) ServerGroups() (*metav1.APIGroupList, error) {
-	return nil, nil
+	action := testing.ActionImpl{
+		Verb:     "get",
+		Resource: schema.GroupVersionResource{Resource: "group"},
+	}
+	c.Invokes(action, nil)
+
+	groups := map[string]*metav1.APIGroup{}
+
+	for _, res := range c.Resources {
+		gv, err := schema.ParseGroupVersion(res.GroupVersion)
+		if err != nil {
+			return nil, err
+		}
+		group := groups[gv.Group]
+		if group == nil {
+			group = &metav1.APIGroup{
+				Name: gv.Group,
+				PreferredVersion: metav1.GroupVersionForDiscovery{
+					GroupVersion: res.GroupVersion,
+					Version:      gv.Version,
+				},
+			}
+			groups[gv.Group] = group
+		}
+
+		group.Versions = append(group.Versions, metav1.GroupVersionForDiscovery{
+			GroupVersion: res.GroupVersion,
+			Version:      gv.Version,
+		})
+	}
+
+	list := &metav1.APIGroupList{}
+	for _, apiGroup := range groups {
+		list.Groups = append(list.Groups, *apiGroup)
+	}
+
+	return list, nil
+
 }

 func (c *FakeDiscovery) ServerVersion() (*version.Info, error) {
 	action := testing.ActionImpl{}
 	action.Verb = "get"
 	action.Resource = schema.GroupVersionResource{Resource: "version"}
-
 	c.Invokes(action, nil)
-	versionInfo := kubeversion.Get()
-	return &versionInfo, nil
-}

-func (c *FakeDiscovery) SwaggerSchema(version schema.GroupVersion) (*swagger.ApiDeclaration, error) {
-	action := testing.ActionImpl{}
-	action.Verb = "get"
-	if version == v1.SchemeGroupVersion {
-		action.Resource = schema.GroupVersionResource{Resource: "/swaggerapi/api/" + version.Version}
-	} else {
-		action.Resource = schema.GroupVersionResource{Resource: "/swaggerapi/apis/" + version.Group + "/" + version.Version}
+	if c.FakedServerVersion != nil {
+		return c.FakedServerVersion, nil
 	}

-	c.Invokes(action, nil)
-	return &swagger.ApiDeclaration{}, nil
+	versionInfo := kubeversion.Get()
+	return &versionInfo, nil
 }

 func (c *FakeDiscovery) OpenAPISchema() (*openapi_v2.Document, error) {
--- a/discovery/fake/discovery_test.go
+++ b/discovery/fake/discovery_test.go
@@ -0,0 +1,46 @@
+/*
+Copyright 2017 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package fake_test
+
+import (
+	"testing"
+
+	"k8s.io/apimachinery/pkg/version"
+	fakediscovery "k8s.io/client-go/discovery/fake"
+	fakeclientset "k8s.io/client-go/kubernetes/fake"
+)
+
+func TestFakingServerVersion(t *testing.T) {
+	client := fakeclientset.NewSimpleClientset()
+	fakeDiscovery, ok := client.Discovery().(*fakediscovery.FakeDiscovery)
+	if !ok {
+		t.Fatalf("couldn't convert Discovery() to *FakeDiscovery")
+	}
+
+	testGitCommit := "v1.0.0"
+	fakeDiscovery.FakedServerVersion = &version.Info{
+		GitCommit: testGitCommit,
+	}
+
+	sv, err := client.Discovery().ServerVersion()
+	if err != nil {
+		t.Fatalf("unexpected error: %v", err)
+	}
+	if sv.GitCommit != testGitCommit {
+		t.Fatalf("unexpected faked discovery return value: %q", sv.GitCommit)
+	}
+}
--- a/discovery/restmapper.go
+++ b/discovery/restmapper.go
@@ -49,6 +49,7 @@ func NewRESTMapper(groupResources []*APIGroupResources, versionInterfaces meta.V
 	for _, group := range groupResources {
 		groupPriority = append(groupPriority, group.Group.Name)

+		// Make sure the preferred version comes first
 		if len(group.Group.PreferredVersion.Version) != 0 {
 			preferred := group.Group.PreferredVersion.Version
 			if _, ok := group.VersionedResources[preferred]; ok {
@@ -72,6 +73,21 @@ func NewRESTMapper(groupResources []*APIGroupResources, versionInterfaces meta.V
 				continue
 			}

+			// Add non-preferred versions after the preferred version, in case there are resources that only exist in those versions
+			if discoveryVersion.Version != group.Group.PreferredVersion.Version {
+				resourcePriority = append(resourcePriority, schema.GroupVersionResource{
+					Group:    group.Group.Name,
+					Version:  discoveryVersion.Version,
+					Resource: meta.AnyResource,
+				})
+
+				kindPriority = append(kindPriority, schema.GroupVersionKind{
+					Group:   group.Group.Name,
+					Version: discoveryVersion.Version,
+					Kind:    meta.AnyKind,
+				})
+			}
+
 			gv := schema.GroupVersion{Group: group.Group.Name, Version: discoveryVersion.Version}
 			versionMapper := meta.NewDefaultRESTMapper([]schema.GroupVersion{gv}, versionInterfaces)

@@ -80,8 +96,19 @@ func NewRESTMapper(groupResources []*APIGroupResources, versionInterfaces meta.V
 				if !resource.Namespaced {
 					scope = meta.RESTScopeRoot
 				}
-				versionMapper.Add(gv.WithKind(resource.Kind), scope)
-				// TODO only do this if it supports listing
+
+				// this is for legacy resources and servers which don't list singular forms.  For those we must still guess.
+				if len(resource.SingularName) == 0 {
+					versionMapper.Add(gv.WithKind(resource.Kind), scope)
+					// TODO this is producing unsafe guesses that don't actually work, but it matches previous behavior
+					versionMapper.Add(gv.WithKind(resource.Kind+"List"), scope)
+					continue
+				}
+
+				plural := gv.WithResource(resource.Name)
+				singular := gv.WithResource(resource.SingularName)
+				versionMapper.AddSpecific(gv.WithKind(resource.Kind), plural, singular, scope)
+				// TODO this is producing unsafe guesses that don't actually work, but it matches previous behavior
 				versionMapper.Add(gv.WithKind(resource.Kind+"List"), scope)
 			}
 			// TODO why is this type not in discovery (at least for "v1")
--- a/discovery/restmapper_test.go
+++ b/discovery/restmapper_test.go
@@ -28,7 +28,6 @@ import (
 	restclient "k8s.io/client-go/rest"
 	"k8s.io/client-go/rest/fake"

-	"github.com/emicklei/go-restful-swagger12"
 	"github.com/googleapis/gnostic/OpenAPIv2"
 	"github.com/stretchr/testify/assert"
 )
@@ -67,6 +66,32 @@ func TestRESTMapper(t *testing.T) {
 				},
 			},
 		},
+
+		// This group tests finding and prioritizing resources that only exist in non-preferred versions
+		{
+			Group: metav1.APIGroup{
+				Name: "unpreferred",
+				Versions: []metav1.GroupVersionForDiscovery{
+					{Version: "v1"},
+					{Version: "v2beta1"},
+					{Version: "v2alpha1"},
+				},
+				PreferredVersion: metav1.GroupVersionForDiscovery{Version: "v1"},
+			},
+			VersionedResources: map[string][]metav1.APIResource{
+				"v1": {
+					{Name: "broccoli", Namespaced: true, Kind: "Broccoli"},
+				},
+				"v2beta1": {
+					{Name: "broccoli", Namespaced: true, Kind: "Broccoli"},
+					{Name: "peas", Namespaced: true, Kind: "Pea"},
+				},
+				"v2alpha1": {
+					{Name: "broccoli", Namespaced: true, Kind: "Broccoli"},
+					{Name: "peas", Namespaced: true, Kind: "Pea"},
+				},
+			},
+		},
 	}

 	restMapper := NewRESTMapper(resources, nil)
@@ -123,6 +148,16 @@ func TestRESTMapper(t *testing.T) {
 				Kind:    "Job",
 			},
 		},
+		{
+			input: schema.GroupVersionResource{
+				Resource: "peas",
+			},
+			want: schema.GroupVersionKind{
+				Group:   "unpreferred",
+				Version: "v2beta1",
+				Kind:    "Pea",
+			},
+		},
 	}

 	for _, tc := range kindTCs {
@@ -344,10 +379,6 @@ func (c *fakeCachedDiscoveryInterface) ServerVersion() (*version.Info, error) {
 	return &version.Info{}, nil
 }

-func (c *fakeCachedDiscoveryInterface) SwaggerSchema(version schema.GroupVersion) (*swagger.ApiDeclaration, error) {
-	return &swagger.ApiDeclaration{}, nil
-}
-
 func (c *fakeCachedDiscoveryInterface) OpenAPISchema() (*openapi_v2.Document, error) {
 	return &openapi_v2.Document{}, nil
 }
--- a/dynamic/BUILD
+++ b/dynamic/BUILD
@@ -12,6 +12,7 @@ go_test(
        "client_test.go",
        "dynamic_util_test.go",
    ],
+    importpath = "k8s.io/client-go/dynamic",
    library = ":go_default_library",
    deps = [
        "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
@@ -33,6 +34,7 @@ go_library(
        "client_pool.go",
        "dynamic_util.go",
    ],
+    importpath = "k8s.io/client-go/dynamic",
    deps = [
        "//vendor/k8s.io/api/core/v1:go_default_library",
        "//vendor/k8s.io/apimachinery/pkg/api/meta:go_default_library",
--- a/dynamic/client_pool.go
+++ b/dynamic/client_pool.go
@@ -26,7 +26,7 @@ import (

 // ClientPool manages a pool of dynamic clients.
 type ClientPool interface {
-	// ClientForGroupVersionKind returns a client configured for the specified groupVersionResource.
+	// ClientForGroupVersionResource returns a client configured for the specified groupVersionResource.
 	// Resource may be empty.
 	ClientForGroupVersionResource(resource schema.GroupVersionResource) (Interface, error)
 	// ClientForGroupVersionKind returns a client configured for the specified groupVersionKind.
@@ -56,7 +56,7 @@ type clientPoolImpl struct {
 	mapper              meta.RESTMapper
 }

-// NewClientPool returns a ClientPool from the specified config. It reuses clients for the the same
+// NewClientPool returns a ClientPool from the specified config. It reuses clients for the same
 // group version. It is expected this type may be wrapped by specific logic that special cases certain
 // resources or groups.
 func NewClientPool(config *restclient.Config, mapper meta.RESTMapper, apiPathResolverFunc APIPathResolverFunc) ClientPool {
--- a/dynamic/fake/BUILD
+++ b/dynamic/fake/BUILD
@@ -11,6 +11,7 @@ go_library(
        "client.go",
        "client_pool.go",
    ],
+    importpath = "k8s.io/client-go/dynamic/fake",
    deps = [
        "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
        "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1/unstructured:go_default_library",
--- a/examples/create-update-delete-deployment/BUILD
+++ b/examples/create-update-delete-deployment/BUILD
@@ -8,19 +8,22 @@ load(

 go_binary(
    name = "create-update-delete-deployment",
+    importpath = "k8s.io/client-go/examples/create-update-delete-deployment",
    library = ":go_default_library",
 )

 go_library(
    name = "go_default_library",
    srcs = ["main.go"],
+    importpath = "k8s.io/client-go/examples/create-update-delete-deployment",
    deps = [
        "//vendor/k8s.io/api/apps/v1beta1:go_default_library",
        "//vendor/k8s.io/api/core/v1:go_default_library",
-        "//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library",
        "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
        "//vendor/k8s.io/client-go/kubernetes:go_default_library",
        "//vendor/k8s.io/client-go/tools/clientcmd:go_default_library",
+        "//vendor/k8s.io/client-go/util/homedir:go_default_library",
+        "//vendor/k8s.io/client-go/util/retry:go_default_library",
    ],
 )

--- a/examples/create-update-delete-deployment/README.md
+++ b/examples/create-update-delete-deployment/README.md
@@ -22,6 +22,8 @@ go build -o ./app
 Now, run this application on your workstation with your local kubeconfig file:

 ```
+./app
+# or specify a kubeconfig file with flag
 ./app -kubeconfig=$HOME/.kube/config
 ```

@@ -30,13 +32,19 @@ Running this command will execute the following operations on your cluster:
 1. **Create Deployment:** This will create a 2 replica Deployment. Verify with
   `kubectl get pods`.
 2. **Update Deployment:** This will update the Deployment resource created in
-   previous step to set the replica count to 1 and add annotations. You are
-   encouraged to inspect the retry loop that handles conflicts. Verify the new
-   replica count and `foo=bar` annotation with `kubectl describe deployment
-   demo`.
-3. **List Deployments:** This will retrieve Deployments in the `default`
+   previous step by setting the replica count to 1 and changing the container
+   image to `nginx:1.13`. You are encouraged to inspect the retry loop that
+   handles conflicts. Verify the new replica count and container image with
+   `kubectl describe deployment demo`.
+3. **Rollback Deployment:** This will rollback the Deployment to the last
+   revision. In this case, it's the revision that was created in Step 1.
+   Use `kubectl describe` to verify the container image is now `nginx:1.12`.
+   Also note that the Deployment's replica count is still 1; this is because a
+   Deployment revision is created if and only if the Deployment's pod template
+   (`.spec.template`) is changed.
+4. **List Deployments:** This will retrieve Deployments in the `default`
   namespace and print their names and replica counts.
-4. **Delete Deployment:** This will delete the Deployment object and its
+5. **Delete Deployment:** This will delete the Deployment object and its
   dependent ReplicaSet resource. Verify with `kubectl get deployments`.

 Each step is separated by an interactive prompt. You must hit the
@@ -55,6 +63,10 @@ Updating deployment...
 Updated deployment...
 -> Press Return key to continue.

+Rolling back deployment...
+Rolled back deployment...
+-> Press Return key to continue.
+
 Listing deployments in namespace "default":
 * demo-deployment (1 replicas)
 -> Press Return key to continue.
--- a/examples/create-update-delete-deployment/main.go
+++ b/examples/create-update-delete-deployment/main.go
@@ -22,23 +22,28 @@ import (
 	"flag"
 	"fmt"
 	"os"
+	"path/filepath"

 	appsv1beta1 "k8s.io/api/apps/v1beta1"
 	apiv1 "k8s.io/api/core/v1"
-	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/tools/clientcmd"
+	"k8s.io/client-go/util/homedir"
+	"k8s.io/client-go/util/retry"
 	// Uncomment the following line to load the gcp plugin (only required to authenticate against GKE clusters).
 	// _ "k8s.io/client-go/plugin/pkg/client/auth/gcp"
 )

 func main() {
-	kubeconfig := flag.String("kubeconfig", "", "absolute path to the kubeconfig file")
-	flag.Parse()
-	if *kubeconfig == "" {
-		panic("-kubeconfig not specified")
+	var kubeconfig *string
+	if home := homedir.HomeDir(); home != "" {
+		kubeconfig = flag.String("kubeconfig", filepath.Join(home, ".kube", "config"), "(optional) absolute path to the kubeconfig file")
+	} else {
+		kubeconfig = flag.String("kubeconfig", "", "absolute path to the kubeconfig file")
 	}
+	flag.Parse()
+
 	config, err := clientcmd.BuildConfigFromFlags("", *kubeconfig)
 	if err != nil {
 		panic(err)
@@ -66,7 +71,7 @@ func main() {
 					Containers: []apiv1.Container{
 						{
 							Name:  "web",
-							Image: "nginx:1.13",
+							Image: "nginx:1.12",
 							Ports: []apiv1.ContainerPort{
 								{
 									Name:          "http",
@@ -97,36 +102,53 @@ func main() {
 	//    1. Modify the "deployment" variable and call: Update(deployment).
 	//       This works like the "kubectl replace" command and it overwrites/loses changes
 	//       made by other clients between you Create() and Update() the object.
-	//    2. Modify the "result" returned by Create()/Get() and retry Update(result) until
+	//    2. Modify the "result" returned by Get() and retry Update(result) until
 	//       you no longer get a conflict error. This way, you can preserve changes made
-	//       by other clients between Create() and Update(). This is implemented below:
+	//       by other clients between Create() and Update(). This is implemented below
+	//			 using the retry utility package included with client-go. (RECOMMENDED)
+	//
+	// More Info:
+	// https://github.com/kubernetes/community/blob/master/contributors/devel/api-conventions.md#concurrency-control-and-consistency

-	for {
-		result.Spec.Replicas = int32Ptr(1)                    // reduce replica count
-		result.Spec.Template.Annotations = map[string]string{ // add annotations
-			"foo": "bar",
+	retryErr := retry.RetryOnConflict(retry.DefaultRetry, func() error {
+		// Retrieve the latest version of Deployment before attempting update
+		// RetryOnConflict uses exponential backoff to avoid exhausting the apiserver
+		result, getErr := deploymentsClient.Get("demo-deployment", metav1.GetOptions{})
+		if getErr != nil {
+			panic(fmt.Errorf("Failed to get latest version of Deployment: %v", getErr))
 		}

-		if _, err := deploymentsClient.Update(result); errors.IsConflict(err) {
-			// Deployment is modified in the meanwhile, query the latest version
-			// and modify the retrieved object.
-			fmt.Println("encountered conflict, retrying")
-			result, err = deploymentsClient.Get("demo-deployment", metav1.GetOptions{})
-			if err != nil {
-				panic(fmt.Errorf("Get failed: %+v", err))
-			}
-		} else if err != nil {
-			panic(err)
-		} else {
-			break
-		}
-
-		// TODO: You should sleep here with an exponential backoff to avoid
-		// exhausting the apiserver, and add a limit/timeout on the retries to
-		// avoid getting stuck in this loop indefintiely.
+		result.Spec.Replicas = int32Ptr(1)                           // reduce replica count
+		result.Spec.Template.Spec.Containers[0].Image = "nginx:1.13" // change nginx version
+		_, updateErr := deploymentsClient.Update(result)
+		return updateErr
+	})
+	if retryErr != nil {
+		panic(fmt.Errorf("Update failed: %v", retryErr))
 	}
 	fmt.Println("Updated deployment...")

+	// Rollback Deployment
+	prompt()
+	fmt.Println("Rolling back deployment...")
+	// Once again use RetryOnConflict to avoid update conflicts
+	retryErr = retry.RetryOnConflict(retry.DefaultRetry, func() error {
+		result, getErr := deploymentsClient.Get("demo-deployment", metav1.GetOptions{})
+		if getErr != nil {
+			panic(fmt.Errorf("Failed to get latest version of Deployment: %v", getErr))
+		}
+
+		result.Spec.RollbackTo = &appsv1beta1.RollbackConfig{
+			Revision: 0, // can be specific revision number, or 0 for last revision
+		}
+		_, updateErr := deploymentsClient.Update(result)
+		return updateErr
+	})
+	if retryErr != nil {
+		panic(fmt.Errorf("Rollback failed: %v", retryErr))
+	}
+	fmt.Println("Rolled back deployment...")
+
 	// List Deployments
 	prompt()
 	fmt.Printf("Listing deployments in namespace %q:\n", apiv1.NamespaceDefault)
--- a/examples/in-cluster-client-configuration/BUILD
+++ b/examples/in-cluster-client-configuration/BUILD
@@ -8,12 +8,14 @@ load(

 go_binary(
    name = "in-cluster-client-configuration",
+    importpath = "k8s.io/client-go/examples/in-cluster-client-configuration",
    library = ":go_default_library",
 )

 go_library(
    name = "go_default_library",
    srcs = ["main.go"],
+    importpath = "k8s.io/client-go/examples/in-cluster-client-configuration",
    deps = [
        "//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library",
        "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
--- a/examples/out-of-cluster-client-configuration/BUILD
+++ b/examples/out-of-cluster-client-configuration/BUILD
@@ -8,12 +8,14 @@ load(

 go_binary(
    name = "out-of-cluster-client-configuration",
+    importpath = "k8s.io/client-go/examples/out-of-cluster-client-configuration",
    library = ":go_default_library",
 )

 go_library(
    name = "go_default_library",
    srcs = ["main.go"],
+    importpath = "k8s.io/client-go/examples/out-of-cluster-client-configuration",
    deps = [
        "//vendor/k8s.io/apimachinery/pkg/api/errors:go_default_library",
        "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
--- a/examples/workqueue/BUILD
+++ b/examples/workqueue/BUILD
@@ -8,12 +8,14 @@ load(

 go_binary(
    name = "workqueue",
+    importpath = "k8s.io/client-go/examples/workqueue",
    library = ":go_default_library",
 )

 go_library(
    name = "go_default_library",
    srcs = ["main.go"],
+    importpath = "k8s.io/client-go/examples/workqueue",
    deps = [
        "//vendor/github.com/golang/glog:go_default_library",
        "//vendor/k8s.io/api/core/v1:go_default_library",
--- a/informers/BUILD
+++ b/informers/BUILD
@@ -11,12 +11,14 @@ go_library(
        "factory.go",
        "generic.go",
    ],
+    importpath = "k8s.io/client-go/informers",
    deps = [
        "//vendor/k8s.io/api/admissionregistration/v1alpha1:go_default_library",
+        "//vendor/k8s.io/api/apps/v1:go_default_library",
        "//vendor/k8s.io/api/apps/v1beta1:go_default_library",
        "//vendor/k8s.io/api/apps/v1beta2:go_default_library",
        "//vendor/k8s.io/api/autoscaling/v1:go_default_library",
-        "//vendor/k8s.io/api/autoscaling/v2alpha1:go_default_library",
+        "//vendor/k8s.io/api/autoscaling/v2beta1:go_default_library",
        "//vendor/k8s.io/api/batch/v1:go_default_library",
        "//vendor/k8s.io/api/batch/v1beta1:go_default_library",
        "//vendor/k8s.io/api/batch/v2alpha1:go_default_library",
--- a/informers/admissionregistration/BUILD
+++ b/informers/admissionregistration/BUILD
@@ -8,6 +8,7 @@ load(
 go_library(
    name = "go_default_library",
    srcs = ["interface.go"],
+    importpath = "k8s.io/client-go/informers/admissionregistration",
    deps = [
        "//vendor/k8s.io/client-go/informers/admissionregistration/v1alpha1:go_default_library",
        "//vendor/k8s.io/client-go/informers/internalinterfaces:go_default_library",
--- a/informers/admissionregistration/v1alpha1/BUILD
+++ b/informers/admissionregistration/v1alpha1/BUILD
@@ -12,6 +12,7 @@ go_library(
        "initializerconfiguration.go",
        "interface.go",
    ],
+    importpath = "k8s.io/client-go/informers/admissionregistration/v1alpha1",
    deps = [
        "//vendor/k8s.io/api/admissionregistration/v1alpha1:go_default_library",
        "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
--- a/informers/apps/BUILD
+++ b/informers/apps/BUILD
@@ -8,7 +8,9 @@ load(
 go_library(
    name = "go_default_library",
    srcs = ["interface.go"],
+    importpath = "k8s.io/client-go/informers/apps",
    deps = [
+        "//vendor/k8s.io/client-go/informers/apps/v1:go_default_library",
        "//vendor/k8s.io/client-go/informers/apps/v1beta1:go_default_library",
        "//vendor/k8s.io/client-go/informers/apps/v1beta2:go_default_library",
        "//vendor/k8s.io/client-go/informers/internalinterfaces:go_default_library",
@@ -26,6 +28,7 @@ filegroup(
    name = "all-srcs",
    srcs = [
        ":package-srcs",
+        "//staging/src/k8s.io/client-go/informers/apps/v1:all-srcs",
        "//staging/src/k8s.io/client-go/informers/apps/v1beta1:all-srcs",
        "//staging/src/k8s.io/client-go/informers/apps/v1beta2:all-srcs",
    ],
--- a/informers/apps/interface.go
+++ b/informers/apps/interface.go
@@ -19,6 +19,7 @@ limitations under the License.
 package apps

 import (
+	v1 "k8s.io/client-go/informers/apps/v1"
 	v1beta1 "k8s.io/client-go/informers/apps/v1beta1"
 	v1beta2 "k8s.io/client-go/informers/apps/v1beta2"
 	internalinterfaces "k8s.io/client-go/informers/internalinterfaces"
@@ -26,6 +27,8 @@ import (

 // Interface provides access to each of this group's versions.
 type Interface interface {
+	// V1 provides access to shared informers for resources in V1.
+	V1() v1.Interface
 	// V1beta1 provides access to shared informers for resources in V1beta1.
 	V1beta1() v1beta1.Interface
 	// V1beta2 provides access to shared informers for resources in V1beta2.
@@ -41,6 +44,11 @@ func New(f internalinterfaces.SharedInformerFactory) Interface {
 	return &group{f}
 }

+// V1 returns a new v1.Interface.
+func (g *group) V1() v1.Interface {
+	return v1.New(g.SharedInformerFactory)
+}
+
 // V1beta1 returns a new v1beta1.Interface.
 func (g *group) V1beta1() v1beta1.Interface {
 	return v1beta1.New(g.SharedInformerFactory)
--- a/informers/apps/v1/BUILD
+++ b/informers/apps/v1/BUILD
@@ -0,0 +1,35 @@
+load("@io_bazel_rules_go//go:def.bzl", "go_library")
+
+go_library(
+    name = "go_default_library",
+    srcs = [
+        "daemonset.go",
+        "interface.go",
+    ],
+    importpath = "k8s.io/client-go/informers/apps/v1",
+    visibility = ["//visibility:public"],
+    deps = [
+        "//vendor/k8s.io/api/apps/v1:go_default_library",
+        "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
+        "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library",
+        "//vendor/k8s.io/apimachinery/pkg/watch:go_default_library",
+        "//vendor/k8s.io/client-go/informers/internalinterfaces:go_default_library",
+        "//vendor/k8s.io/client-go/kubernetes:go_default_library",
+        "//vendor/k8s.io/client-go/listers/apps/v1:go_default_library",
+        "//vendor/k8s.io/client-go/tools/cache:go_default_library",
+    ],
+)
+
+filegroup(
+    name = "package-srcs",
+    srcs = glob(["**"]),
+    tags = ["automanaged"],
+    visibility = ["//visibility:private"],
+)
+
+filegroup(
+    name = "all-srcs",
+    srcs = [":package-srcs"],
+    tags = ["automanaged"],
+    visibility = ["//visibility:public"],
+)
--- a/informers/apps/v1/daemonset.go
+++ b/informers/apps/v1/daemonset.go
@@ -0,0 +1,73 @@
+/*
+Copyright 2017 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// This file was automatically generated by informer-gen
+
+package v1
+
+import (
+	apps_v1 "k8s.io/api/apps/v1"
+	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	runtime "k8s.io/apimachinery/pkg/runtime"
+	watch "k8s.io/apimachinery/pkg/watch"
+	internalinterfaces "k8s.io/client-go/informers/internalinterfaces"
+	kubernetes "k8s.io/client-go/kubernetes"
+	v1 "k8s.io/client-go/listers/apps/v1"
+	cache "k8s.io/client-go/tools/cache"
+	time "time"
+)
+
+// DaemonSetInformer provides access to a shared informer and lister for
+// DaemonSets.
+type DaemonSetInformer interface {
+	Informer() cache.SharedIndexInformer
+	Lister() v1.DaemonSetLister
+}
+
+type daemonSetInformer struct {
+	factory internalinterfaces.SharedInformerFactory
+}
+
+// NewDaemonSetInformer constructs a new informer for DaemonSet type.
+// Always prefer using an informer factory to get a shared informer instead of getting an independent
+// one. This reduces memory footprint and number of connections to the server.
+func NewDaemonSetInformer(client kubernetes.Interface, namespace string, resyncPeriod time.Duration, indexers cache.Indexers) cache.SharedIndexInformer {
+	return cache.NewSharedIndexInformer(
+		&cache.ListWatch{
+			ListFunc: func(options meta_v1.ListOptions) (runtime.Object, error) {
+				return client.AppsV1().DaemonSets(namespace).List(options)
+			},
+			WatchFunc: func(options meta_v1.ListOptions) (watch.Interface, error) {
+				return client.AppsV1().DaemonSets(namespace).Watch(options)
+			},
+		},
+		&apps_v1.DaemonSet{},
+		resyncPeriod,
+		indexers,
+	)
+}
+
+func defaultDaemonSetInformer(client kubernetes.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer {
+	return NewDaemonSetInformer(client, meta_v1.NamespaceAll, resyncPeriod, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc})
+}
+
+func (f *daemonSetInformer) Informer() cache.SharedIndexInformer {
+	return f.factory.InformerFor(&apps_v1.DaemonSet{}, defaultDaemonSetInformer)
+}
+
+func (f *daemonSetInformer) Lister() v1.DaemonSetLister {
+	return v1.NewDaemonSetLister(f.Informer().GetIndexer())
+}
--- a/informers/apps/v1/interface.go
+++ b/informers/apps/v1/interface.go
@@ -0,0 +1,43 @@
+/*
+Copyright 2017 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// This file was automatically generated by informer-gen
+
+package v1
+
+import (
+	internalinterfaces "k8s.io/client-go/informers/internalinterfaces"
+)
+
+// Interface provides access to all the informers in this group version.
+type Interface interface {
+	// DaemonSets returns a DaemonSetInformer.
+	DaemonSets() DaemonSetInformer
+}
+
+type version struct {
+	internalinterfaces.SharedInformerFactory
+}
+
+// New returns a new Interface.
+func New(f internalinterfaces.SharedInformerFactory) Interface {
+	return &version{f}
+}
+
+// DaemonSets returns a DaemonSetInformer.
+func (v *version) DaemonSets() DaemonSetInformer {
+	return &daemonSetInformer{factory: v.SharedInformerFactory}
+}
--- a/informers/apps/v1beta1/BUILD
+++ b/informers/apps/v1beta1/BUILD
@@ -13,6 +13,7 @@ go_library(
        "interface.go",
        "statefulset.go",
    ],
+    importpath = "k8s.io/client-go/informers/apps/v1beta1",
    deps = [
        "//vendor/k8s.io/api/apps/v1beta1:go_default_library",
        "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
--- a/informers/apps/v1beta2/BUILD
+++ b/informers/apps/v1beta2/BUILD
@@ -15,6 +15,7 @@ go_library(
        "replicaset.go",
        "statefulset.go",
    ],
+    importpath = "k8s.io/client-go/informers/apps/v1beta2",
    deps = [
        "//vendor/k8s.io/api/apps/v1beta2:go_default_library",
        "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
--- a/informers/autoscaling/BUILD
+++ b/informers/autoscaling/BUILD
@@ -1,16 +1,13 @@
-package(default_visibility = ["//visibility:public"])
-
-load(
-    "@io_bazel_rules_go//go:def.bzl",
-    "go_library",
-)
+load("@io_bazel_rules_go//go:def.bzl", "go_library")

 go_library(
    name = "go_default_library",
    srcs = ["interface.go"],
+    importpath = "k8s.io/client-go/informers/autoscaling",
+    visibility = ["//visibility:public"],
    deps = [
        "//vendor/k8s.io/client-go/informers/autoscaling/v1:go_default_library",
-        "//vendor/k8s.io/client-go/informers/autoscaling/v2alpha1:go_default_library",
+        "//vendor/k8s.io/client-go/informers/autoscaling/v2beta1:go_default_library",
        "//vendor/k8s.io/client-go/informers/internalinterfaces:go_default_library",
    ],
 )
@@ -27,7 +24,8 @@ filegroup(
    srcs = [
        ":package-srcs",
        "//staging/src/k8s.io/client-go/informers/autoscaling/v1:all-srcs",
-        "//staging/src/k8s.io/client-go/informers/autoscaling/v2alpha1:all-srcs",
+        "//staging/src/k8s.io/client-go/informers/autoscaling/v2beta1:all-srcs",
    ],
    tags = ["automanaged"],
+    visibility = ["//visibility:public"],
 )
--- a/informers/autoscaling/interface.go
+++ b/informers/autoscaling/interface.go
@@ -20,7 +20,7 @@ package autoscaling

 import (
 	v1 "k8s.io/client-go/informers/autoscaling/v1"
-	v2alpha1 "k8s.io/client-go/informers/autoscaling/v2alpha1"
+	v2beta1 "k8s.io/client-go/informers/autoscaling/v2beta1"
 	internalinterfaces "k8s.io/client-go/informers/internalinterfaces"
 )

@@ -28,8 +28,8 @@ import (
 type Interface interface {
 	// V1 provides access to shared informers for resources in V1.
 	V1() v1.Interface
-	// V2alpha1 provides access to shared informers for resources in V2alpha1.
-	V2alpha1() v2alpha1.Interface
+	// V2beta1 provides access to shared informers for resources in V2beta1.
+	V2beta1() v2beta1.Interface
 }

 type group struct {
@@ -46,7 +46,7 @@ func (g *group) V1() v1.Interface {
 	return v1.New(g.SharedInformerFactory)
 }

-// V2alpha1 returns a new v2alpha1.Interface.
-func (g *group) V2alpha1() v2alpha1.Interface {
-	return v2alpha1.New(g.SharedInformerFactory)
+// V2beta1 returns a new v2beta1.Interface.
+func (g *group) V2beta1() v2beta1.Interface {
+	return v2beta1.New(g.SharedInformerFactory)
 }
--- a/informers/autoscaling/v1/BUILD
+++ b/informers/autoscaling/v1/BUILD
@@ -1,9 +1,4 @@
-package(default_visibility = ["//visibility:public"])
-
-load(
-    "@io_bazel_rules_go//go:def.bzl",
-    "go_library",
-)
+load("@io_bazel_rules_go//go:def.bzl", "go_library")

 go_library(
    name = "go_default_library",
@@ -11,6 +6,8 @@ go_library(
        "horizontalpodautoscaler.go",
        "interface.go",
    ],
+    importpath = "k8s.io/client-go/informers/autoscaling/v1",
+    visibility = ["//visibility:public"],
    deps = [
        "//vendor/k8s.io/api/autoscaling/v1:go_default_library",
        "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
@@ -34,4 +31,5 @@ filegroup(
    name = "all-srcs",
    srcs = [":package-srcs"],
    tags = ["automanaged"],
+    visibility = ["//visibility:public"],
 )
--- a/informers/autoscaling/v2alpha1/BUILD
+++ b/informers/autoscaling/v2alpha1/BUILD
@@ -1,9 +1,4 @@
-package(default_visibility = ["//visibility:public"])
-
-load(
-    "@io_bazel_rules_go//go:def.bzl",
-    "go_library",
-)
+load("@io_bazel_rules_go//go:def.bzl", "go_library")

 go_library(
    name = "go_default_library",
@@ -11,14 +6,16 @@ go_library(
        "horizontalpodautoscaler.go",
        "interface.go",
    ],
+    importpath = "k8s.io/client-go/informers/autoscaling/v2beta1",
+    visibility = ["//visibility:public"],
    deps = [
-        "//vendor/k8s.io/api/autoscaling/v2alpha1:go_default_library",
+        "//vendor/k8s.io/api/autoscaling/v2beta1:go_default_library",
        "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
        "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library",
        "//vendor/k8s.io/apimachinery/pkg/watch:go_default_library",
        "//vendor/k8s.io/client-go/informers/internalinterfaces:go_default_library",
        "//vendor/k8s.io/client-go/kubernetes:go_default_library",
-        "//vendor/k8s.io/client-go/listers/autoscaling/v2alpha1:go_default_library",
+        "//vendor/k8s.io/client-go/listers/autoscaling/v2beta1:go_default_library",
        "//vendor/k8s.io/client-go/tools/cache:go_default_library",
    ],
 )
@@ -34,4 +31,5 @@ filegroup(
    name = "all-srcs",
    srcs = [":package-srcs"],
    tags = ["automanaged"],
+    visibility = ["//visibility:public"],
 )
--- a/informers/autoscaling/v2alpha1/horizontalpodautoscaler.go
+++ b/informers/autoscaling/v2alpha1/horizontalpodautoscaler.go
@@ -16,16 +16,16 @@ limitations under the License.

 // This file was automatically generated by informer-gen

-package v2alpha1
+package v2beta1

 import (
-	autoscaling_v2alpha1 "k8s.io/api/autoscaling/v2alpha1"
+	autoscaling_v2beta1 "k8s.io/api/autoscaling/v2beta1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	watch "k8s.io/apimachinery/pkg/watch"
 	internalinterfaces "k8s.io/client-go/informers/internalinterfaces"
 	kubernetes "k8s.io/client-go/kubernetes"
-	v2alpha1 "k8s.io/client-go/listers/autoscaling/v2alpha1"
+	v2beta1 "k8s.io/client-go/listers/autoscaling/v2beta1"
 	cache "k8s.io/client-go/tools/cache"
 	time "time"
 )
@@ -34,7 +34,7 @@ import (
 // HorizontalPodAutoscalers.
 type HorizontalPodAutoscalerInformer interface {
 	Informer() cache.SharedIndexInformer
-	Lister() v2alpha1.HorizontalPodAutoscalerLister
+	Lister() v2beta1.HorizontalPodAutoscalerLister
 }

 type horizontalPodAutoscalerInformer struct {
@@ -48,13 +48,13 @@ func NewHorizontalPodAutoscalerInformer(client kubernetes.Interface, namespace s
 	return cache.NewSharedIndexInformer(
 		&cache.ListWatch{
 			ListFunc: func(options v1.ListOptions) (runtime.Object, error) {
-				return client.AutoscalingV2alpha1().HorizontalPodAutoscalers(namespace).List(options)
+				return client.AutoscalingV2beta1().HorizontalPodAutoscalers(namespace).List(options)
 			},
 			WatchFunc: func(options v1.ListOptions) (watch.Interface, error) {
-				return client.AutoscalingV2alpha1().HorizontalPodAutoscalers(namespace).Watch(options)
+				return client.AutoscalingV2beta1().HorizontalPodAutoscalers(namespace).Watch(options)
 			},
 		},
-		&autoscaling_v2alpha1.HorizontalPodAutoscaler{},
+		&autoscaling_v2beta1.HorizontalPodAutoscaler{},
 		resyncPeriod,
 		indexers,
 	)
@@ -65,9 +65,9 @@ func defaultHorizontalPodAutoscalerInformer(client kubernetes.Interface, resyncP
 }

 func (f *horizontalPodAutoscalerInformer) Informer() cache.SharedIndexInformer {
-	return f.factory.InformerFor(&autoscaling_v2alpha1.HorizontalPodAutoscaler{}, defaultHorizontalPodAutoscalerInformer)
+	return f.factory.InformerFor(&autoscaling_v2beta1.HorizontalPodAutoscaler{}, defaultHorizontalPodAutoscalerInformer)
 }

-func (f *horizontalPodAutoscalerInformer) Lister() v2alpha1.HorizontalPodAutoscalerLister {
-	return v2alpha1.NewHorizontalPodAutoscalerLister(f.Informer().GetIndexer())
+func (f *horizontalPodAutoscalerInformer) Lister() v2beta1.HorizontalPodAutoscalerLister {
+	return v2beta1.NewHorizontalPodAutoscalerLister(f.Informer().GetIndexer())
 }
--- a/informers/autoscaling/v2alpha1/interface.go
+++ b/informers/autoscaling/v2alpha1/interface.go
@@ -16,7 +16,7 @@ limitations under the License.

 // This file was automatically generated by informer-gen

-package v2alpha1
+package v2beta1

 import (
 	internalinterfaces "k8s.io/client-go/informers/internalinterfaces"
--- a/informers/batch/BUILD
+++ b/informers/batch/BUILD
@@ -8,6 +8,7 @@ load(
 go_library(
    name = "go_default_library",
    srcs = ["interface.go"],
+    importpath = "k8s.io/client-go/informers/batch",
    deps = [
        "//vendor/k8s.io/client-go/informers/batch/v1:go_default_library",
        "//vendor/k8s.io/client-go/informers/batch/v1beta1:go_default_library",
--- a/informers/batch/v1/BUILD
+++ b/informers/batch/v1/BUILD
@@ -11,6 +11,7 @@ go_library(
        "interface.go",
        "job.go",
    ],
+    importpath = "k8s.io/client-go/informers/batch/v1",
    deps = [
        "//vendor/k8s.io/api/batch/v1:go_default_library",
        "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
--- a/informers/batch/v1beta1/BUILD
+++ b/informers/batch/v1beta1/BUILD
@@ -1,7 +1,5 @@
 package(default_visibility = ["//visibility:public"])

-licenses(["notice"])
-
 load(
    "@io_bazel_rules_go//go:def.bzl",
    "go_library",
@@ -13,7 +11,7 @@ go_library(
        "cronjob.go",
        "interface.go",
    ],
-    tags = ["automanaged"],
+    importpath = "k8s.io/client-go/informers/batch/v1beta1",
    deps = [
        "//vendor/k8s.io/api/batch/v1beta1:go_default_library",
        "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
--- a/informers/batch/v2alpha1/BUILD
+++ b/informers/batch/v2alpha1/BUILD
@@ -11,6 +11,7 @@ go_library(
        "cronjob.go",
        "interface.go",
    ],
+    importpath = "k8s.io/client-go/informers/batch/v2alpha1",
    deps = [
        "//vendor/k8s.io/api/batch/v2alpha1:go_default_library",
        "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
--- a/informers/certificates/BUILD
+++ b/informers/certificates/BUILD
@@ -8,6 +8,7 @@ load(
 go_library(
    name = "go_default_library",
    srcs = ["interface.go"],
+    importpath = "k8s.io/client-go/informers/certificates",
    deps = [
        "//vendor/k8s.io/client-go/informers/certificates/v1beta1:go_default_library",
        "//vendor/k8s.io/client-go/informers/internalinterfaces:go_default_library",
--- a/informers/certificates/v1beta1/BUILD
+++ b/informers/certificates/v1beta1/BUILD
@@ -11,6 +11,7 @@ go_library(
        "certificatesigningrequest.go",
        "interface.go",
    ],
+    importpath = "k8s.io/client-go/informers/certificates/v1beta1",
    deps = [
        "//vendor/k8s.io/api/certificates/v1beta1:go_default_library",
        "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
--- a/informers/core/BUILD
+++ b/informers/core/BUILD
@@ -8,6 +8,7 @@ load(
 go_library(
    name = "go_default_library",
    srcs = ["interface.go"],
+    importpath = "k8s.io/client-go/informers/core",
    deps = [
        "//vendor/k8s.io/client-go/informers/core/v1:go_default_library",
        "//vendor/k8s.io/client-go/informers/internalinterfaces:go_default_library",
--- a/informers/core/v1/BUILD
+++ b/informers/core/v1/BUILD
@@ -26,6 +26,7 @@ go_library(
        "service.go",
        "serviceaccount.go",
    ],
+    importpath = "k8s.io/client-go/informers/core/v1",
    deps = [
        "//vendor/k8s.io/api/core/v1:go_default_library",
        "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
--- a/informers/extensions/BUILD
+++ b/informers/extensions/BUILD
@@ -8,6 +8,7 @@ load(
 go_library(
    name = "go_default_library",
    srcs = ["interface.go"],
+    importpath = "k8s.io/client-go/informers/extensions",
    deps = [
        "//vendor/k8s.io/client-go/informers/extensions/v1beta1:go_default_library",
        "//vendor/k8s.io/client-go/informers/internalinterfaces:go_default_library",
--- a/informers/extensions/v1beta1/BUILD
+++ b/informers/extensions/v1beta1/BUILD
@@ -16,6 +16,7 @@ go_library(
        "replicaset.go",
        "thirdpartyresource.go",
    ],
+    importpath = "k8s.io/client-go/informers/extensions/v1beta1",
    deps = [
        "//vendor/k8s.io/api/extensions/v1beta1:go_default_library",
        "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
--- a/informers/generic.go
+++ b/informers/generic.go
@@ -21,13 +21,14 @@ package informers
 import (
 	"fmt"
 	v1alpha1 "k8s.io/api/admissionregistration/v1alpha1"
+	v1 "k8s.io/api/apps/v1"
 	v1beta1 "k8s.io/api/apps/v1beta1"
 	v1beta2 "k8s.io/api/apps/v1beta2"
-	v1 "k8s.io/api/autoscaling/v1"
-	v2alpha1 "k8s.io/api/autoscaling/v2alpha1"
+	autoscaling_v1 "k8s.io/api/autoscaling/v1"
+	v2beta1 "k8s.io/api/autoscaling/v2beta1"
 	batch_v1 "k8s.io/api/batch/v1"
 	batch_v1beta1 "k8s.io/api/batch/v1beta1"
-	batch_v2alpha1 "k8s.io/api/batch/v2alpha1"
+	v2alpha1 "k8s.io/api/batch/v2alpha1"
 	certificates_v1beta1 "k8s.io/api/certificates/v1beta1"
 	core_v1 "k8s.io/api/core/v1"
 	extensions_v1beta1 "k8s.io/api/extensions/v1beta1"
@@ -76,6 +77,10 @@ func (f *sharedInformerFactory) ForResource(resource schema.GroupVersionResource
 	case v1alpha1.SchemeGroupVersion.WithResource("initializerconfigurations"):
 		return &genericInformer{resource: resource.GroupResource(), informer: f.Admissionregistration().V1alpha1().InitializerConfigurations().Informer()}, nil

+		// Group=Apps, Version=V1
+	case v1.SchemeGroupVersion.WithResource("daemonsets"):
+		return &genericInformer{resource: resource.GroupResource(), informer: f.Apps().V1().DaemonSets().Informer()}, nil
+
 		// Group=Apps, Version=V1beta1
 	case v1beta1.SchemeGroupVersion.WithResource("controllerrevisions"):
 		return &genericInformer{resource: resource.GroupResource(), informer: f.Apps().V1beta1().ControllerRevisions().Informer()}, nil
@@ -97,12 +102,12 @@ func (f *sharedInformerFactory) ForResource(resource schema.GroupVersionResource
 		return &genericInformer{resource: resource.GroupResource(), informer: f.Apps().V1beta2().StatefulSets().Informer()}, nil

 		// Group=Autoscaling, Version=V1
-	case v1.SchemeGroupVersion.WithResource("horizontalpodautoscalers"):
+	case autoscaling_v1.SchemeGroupVersion.WithResource("horizontalpodautoscalers"):
 		return &genericInformer{resource: resource.GroupResource(), informer: f.Autoscaling().V1().HorizontalPodAutoscalers().Informer()}, nil

-		// Group=Autoscaling, Version=V2alpha1
-	case v2alpha1.SchemeGroupVersion.WithResource("horizontalpodautoscalers"):
-		return &genericInformer{resource: resource.GroupResource(), informer: f.Autoscaling().V2alpha1().HorizontalPodAutoscalers().Informer()}, nil
+		// Group=Autoscaling, Version=V2beta1
+	case v2beta1.SchemeGroupVersion.WithResource("horizontalpodautoscalers"):
+		return &genericInformer{resource: resource.GroupResource(), informer: f.Autoscaling().V2beta1().HorizontalPodAutoscalers().Informer()}, nil

 		// Group=Batch, Version=V1
 	case batch_v1.SchemeGroupVersion.WithResource("jobs"):
@@ -113,7 +118,7 @@ func (f *sharedInformerFactory) ForResource(resource schema.GroupVersionResource
 		return &genericInformer{resource: resource.GroupResource(), informer: f.Batch().V1beta1().CronJobs().Informer()}, nil

 		// Group=Batch, Version=V2alpha1
-	case batch_v2alpha1.SchemeGroupVersion.WithResource("cronjobs"):
+	case v2alpha1.SchemeGroupVersion.WithResource("cronjobs"):
 		return &genericInformer{resource: resource.GroupResource(), informer: f.Batch().V2alpha1().CronJobs().Informer()}, nil

 		// Group=Certificates, Version=V1beta1
--- a/informers/internalinterfaces/BUILD
+++ b/informers/internalinterfaces/BUILD
@@ -8,6 +8,7 @@ load(
 go_library(
    name = "go_default_library",
    srcs = ["factory_interfaces.go"],
+    importpath = "k8s.io/client-go/informers/internalinterfaces",
    deps = [
        "//vendor/k8s.io/apimachinery/pkg/runtime:go_default_library",
        "//vendor/k8s.io/client-go/kubernetes:go_default_library",
--- a/informers/networking/BUILD
+++ b/informers/networking/BUILD
@@ -8,6 +8,7 @@ load(
 go_library(
    name = "go_default_library",
    srcs = ["interface.go"],
+    importpath = "k8s.io/client-go/informers/networking",
    deps = [
        "//vendor/k8s.io/client-go/informers/internalinterfaces:go_default_library",
        "//vendor/k8s.io/client-go/informers/networking/v1:go_default_library",
--- a/informers/networking/v1/BUILD
+++ b/informers/networking/v1/BUILD
@@ -11,6 +11,7 @@ go_library(
        "interface.go",
        "networkpolicy.go",
    ],
+    importpath = "k8s.io/client-go/informers/networking/v1",
    deps = [
        "//vendor/k8s.io/api/networking/v1:go_default_library",
        "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
--- a/informers/policy/BUILD
+++ b/informers/policy/BUILD
@@ -8,6 +8,7 @@ load(
 go_library(
    name = "go_default_library",
    srcs = ["interface.go"],
+    importpath = "k8s.io/client-go/informers/policy",
    deps = [
        "//vendor/k8s.io/client-go/informers/internalinterfaces:go_default_library",
        "//vendor/k8s.io/client-go/informers/policy/v1beta1:go_default_library",
--- a/informers/policy/v1beta1/BUILD
+++ b/informers/policy/v1beta1/BUILD
@@ -11,6 +11,7 @@ go_library(
        "interface.go",
        "poddisruptionbudget.go",
    ],
+    importpath = "k8s.io/client-go/informers/policy/v1beta1",
    deps = [
        "//vendor/k8s.io/api/policy/v1beta1:go_default_library",
        "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
--- a/informers/rbac/BUILD
+++ b/informers/rbac/BUILD
@@ -8,6 +8,7 @@ load(
 go_library(
    name = "go_default_library",
    srcs = ["interface.go"],
+    importpath = "k8s.io/client-go/informers/rbac",
    deps = [
        "//vendor/k8s.io/client-go/informers/internalinterfaces:go_default_library",
        "//vendor/k8s.io/client-go/informers/rbac/v1:go_default_library",
--- a/informers/rbac/v1/BUILD
+++ b/informers/rbac/v1/BUILD
@@ -14,6 +14,7 @@ go_library(
        "role.go",
        "rolebinding.go",
    ],
+    importpath = "k8s.io/client-go/informers/rbac/v1",
    deps = [
        "//vendor/k8s.io/api/rbac/v1:go_default_library",
        "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
--- a/informers/rbac/v1alpha1/BUILD
+++ b/informers/rbac/v1alpha1/BUILD
@@ -14,6 +14,7 @@ go_library(
        "role.go",
        "rolebinding.go",
    ],
+    importpath = "k8s.io/client-go/informers/rbac/v1alpha1",
    deps = [
        "//vendor/k8s.io/api/rbac/v1alpha1:go_default_library",
        "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
--- a/informers/rbac/v1beta1/BUILD
+++ b/informers/rbac/v1beta1/BUILD
@@ -14,6 +14,7 @@ go_library(
        "role.go",
        "rolebinding.go",
    ],
+    importpath = "k8s.io/client-go/informers/rbac/v1beta1",
    deps = [
        "//vendor/k8s.io/api/rbac/v1beta1:go_default_library",
        "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
--- a/informers/scheduling/BUILD
+++ b/informers/scheduling/BUILD
@@ -8,6 +8,7 @@ load(
 go_library(
    name = "go_default_library",
    srcs = ["interface.go"],
+    importpath = "k8s.io/client-go/informers/scheduling",
    deps = [
        "//vendor/k8s.io/client-go/informers/internalinterfaces:go_default_library",
        "//vendor/k8s.io/client-go/informers/scheduling/v1alpha1:go_default_library",
--- a/informers/scheduling/v1alpha1/BUILD
+++ b/informers/scheduling/v1alpha1/BUILD
@@ -11,6 +11,7 @@ go_library(
        "interface.go",
        "priorityclass.go",
    ],
+    importpath = "k8s.io/client-go/informers/scheduling/v1alpha1",
    deps = [
        "//vendor/k8s.io/api/scheduling/v1alpha1:go_default_library",
        "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
--- a/informers/settings/BUILD
+++ b/informers/settings/BUILD
@@ -8,6 +8,7 @@ load(
 go_library(
    name = "go_default_library",
    srcs = ["interface.go"],
+    importpath = "k8s.io/client-go/informers/settings",
    deps = [
        "//vendor/k8s.io/client-go/informers/internalinterfaces:go_default_library",
        "//vendor/k8s.io/client-go/informers/settings/v1alpha1:go_default_library",
--- a/informers/settings/v1alpha1/BUILD
+++ b/informers/settings/v1alpha1/BUILD
@@ -11,6 +11,7 @@ go_library(
        "interface.go",
        "podpreset.go",
    ],
+    importpath = "k8s.io/client-go/informers/settings/v1alpha1",
    deps = [
        "//vendor/k8s.io/api/settings/v1alpha1:go_default_library",
        "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
--- a/informers/storage/BUILD
+++ b/informers/storage/BUILD
@@ -8,6 +8,7 @@ load(
 go_library(
    name = "go_default_library",
    srcs = ["interface.go"],
+    importpath = "k8s.io/client-go/informers/storage",
    deps = [
        "//vendor/k8s.io/client-go/informers/internalinterfaces:go_default_library",
        "//vendor/k8s.io/client-go/informers/storage/v1:go_default_library",
--- a/informers/storage/v1/BUILD
+++ b/informers/storage/v1/BUILD
@@ -11,6 +11,7 @@ go_library(
        "interface.go",
        "storageclass.go",
    ],
+    importpath = "k8s.io/client-go/informers/storage/v1",
    deps = [
        "//vendor/k8s.io/api/storage/v1:go_default_library",
        "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
--- a/informers/storage/v1beta1/BUILD
+++ b/informers/storage/v1beta1/BUILD
@@ -11,6 +11,7 @@ go_library(
        "interface.go",
        "storageclass.go",
    ],
+    importpath = "k8s.io/client-go/informers/storage/v1beta1",
    deps = [
        "//vendor/k8s.io/api/storage/v1beta1:go_default_library",
        "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
--- a/kubernetes/BUILD
+++ b/kubernetes/BUILD
@@ -12,10 +12,12 @@ go_library(
        "doc.go",
        "import.go",
    ],
+    importpath = "k8s.io/client-go/kubernetes",
    deps = [
        "//vendor/github.com/golang/glog:go_default_library",
        "//vendor/k8s.io/client-go/discovery:go_default_library",
        "//vendor/k8s.io/client-go/kubernetes/typed/admissionregistration/v1alpha1:go_default_library",
+        "//vendor/k8s.io/client-go/kubernetes/typed/apps/v1:go_default_library",
        "//vendor/k8s.io/client-go/kubernetes/typed/apps/v1beta1:go_default_library",
        "//vendor/k8s.io/client-go/kubernetes/typed/apps/v1beta2:go_default_library",
        "//vendor/k8s.io/client-go/kubernetes/typed/authentication/v1:go_default_library",
@@ -23,7 +25,7 @@ go_library(
        "//vendor/k8s.io/client-go/kubernetes/typed/authorization/v1:go_default_library",
        "//vendor/k8s.io/client-go/kubernetes/typed/authorization/v1beta1:go_default_library",
        "//vendor/k8s.io/client-go/kubernetes/typed/autoscaling/v1:go_default_library",
-        "//vendor/k8s.io/client-go/kubernetes/typed/autoscaling/v2alpha1:go_default_library",
+        "//vendor/k8s.io/client-go/kubernetes/typed/autoscaling/v2beta1:go_default_library",
        "//vendor/k8s.io/client-go/kubernetes/typed/batch/v1:go_default_library",
        "//vendor/k8s.io/client-go/kubernetes/typed/batch/v1beta1:go_default_library",
        "//vendor/k8s.io/client-go/kubernetes/typed/batch/v2alpha1:go_default_library",
@@ -58,6 +60,7 @@ filegroup(
        "//staging/src/k8s.io/client-go/kubernetes/fake:all-srcs",
        "//staging/src/k8s.io/client-go/kubernetes/scheme:all-srcs",
        "//staging/src/k8s.io/client-go/kubernetes/typed/admissionregistration/v1alpha1:all-srcs",
+        "//staging/src/k8s.io/client-go/kubernetes/typed/apps/v1:all-srcs",
        "//staging/src/k8s.io/client-go/kubernetes/typed/apps/v1beta1:all-srcs",
        "//staging/src/k8s.io/client-go/kubernetes/typed/apps/v1beta2:all-srcs",
        "//staging/src/k8s.io/client-go/kubernetes/typed/authentication/v1:all-srcs",
@@ -65,7 +68,7 @@ filegroup(
        "//staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1:all-srcs",
        "//staging/src/k8s.io/client-go/kubernetes/typed/authorization/v1beta1:all-srcs",
        "//staging/src/k8s.io/client-go/kubernetes/typed/autoscaling/v1:all-srcs",
-        "//staging/src/k8s.io/client-go/kubernetes/typed/autoscaling/v2alpha1:all-srcs",
+        "//staging/src/k8s.io/client-go/kubernetes/typed/autoscaling/v2beta1:all-srcs",
        "//staging/src/k8s.io/client-go/kubernetes/typed/batch/v1:all-srcs",
        "//staging/src/k8s.io/client-go/kubernetes/typed/batch/v1beta1:all-srcs",
        "//staging/src/k8s.io/client-go/kubernetes/typed/batch/v2alpha1:all-srcs",
--- a/kubernetes/clientset.go
+++ b/kubernetes/clientset.go
@@ -20,6 +20,7 @@ import (
 	glog "github.com/golang/glog"
 	discovery "k8s.io/client-go/discovery"
 	admissionregistrationv1alpha1 "k8s.io/client-go/kubernetes/typed/admissionregistration/v1alpha1"
+	appsv1 "k8s.io/client-go/kubernetes/typed/apps/v1"
 	appsv1beta1 "k8s.io/client-go/kubernetes/typed/apps/v1beta1"
 	appsv1beta2 "k8s.io/client-go/kubernetes/typed/apps/v1beta2"
 	authenticationv1 "k8s.io/client-go/kubernetes/typed/authentication/v1"
@@ -27,7 +28,7 @@ import (
 	authorizationv1 "k8s.io/client-go/kubernetes/typed/authorization/v1"
 	authorizationv1beta1 "k8s.io/client-go/kubernetes/typed/authorization/v1beta1"
 	autoscalingv1 "k8s.io/client-go/kubernetes/typed/autoscaling/v1"
-	autoscalingv2alpha1 "k8s.io/client-go/kubernetes/typed/autoscaling/v2alpha1"
+	autoscalingv2beta1 "k8s.io/client-go/kubernetes/typed/autoscaling/v2beta1"
 	batchv1 "k8s.io/client-go/kubernetes/typed/batch/v1"
 	batchv1beta1 "k8s.io/client-go/kubernetes/typed/batch/v1beta1"
 	batchv2alpha1 "k8s.io/client-go/kubernetes/typed/batch/v2alpha1"
@@ -54,8 +55,9 @@ type Interface interface {
 	Admissionregistration() admissionregistrationv1alpha1.AdmissionregistrationV1alpha1Interface
 	AppsV1beta1() appsv1beta1.AppsV1beta1Interface
 	AppsV1beta2() appsv1beta2.AppsV1beta2Interface
+	AppsV1() appsv1.AppsV1Interface
 	// Deprecated: please explicitly pick a version if possible.
-	Apps() appsv1beta2.AppsV1beta2Interface
+	Apps() appsv1.AppsV1Interface
 	AuthenticationV1() authenticationv1.AuthenticationV1Interface
 	// Deprecated: please explicitly pick a version if possible.
 	Authentication() authenticationv1.AuthenticationV1Interface
@@ -67,7 +69,7 @@ type Interface interface {
 	AutoscalingV1() autoscalingv1.AutoscalingV1Interface
 	// Deprecated: please explicitly pick a version if possible.
 	Autoscaling() autoscalingv1.AutoscalingV1Interface
-	AutoscalingV2alpha1() autoscalingv2alpha1.AutoscalingV2alpha1Interface
+	AutoscalingV2beta1() autoscalingv2beta1.AutoscalingV2beta1Interface
 	BatchV1() batchv1.BatchV1Interface
 	// Deprecated: please explicitly pick a version if possible.
 	Batch() batchv1.BatchV1Interface
@@ -112,12 +114,13 @@ type Clientset struct {
 	admissionregistrationV1alpha1 *admissionregistrationv1alpha1.AdmissionregistrationV1alpha1Client
 	appsV1beta1                   *appsv1beta1.AppsV1beta1Client
 	appsV1beta2                   *appsv1beta2.AppsV1beta2Client
+	appsV1                        *appsv1.AppsV1Client
 	authenticationV1              *authenticationv1.AuthenticationV1Client
 	authenticationV1beta1         *authenticationv1beta1.AuthenticationV1beta1Client
 	authorizationV1               *authorizationv1.AuthorizationV1Client
 	authorizationV1beta1          *authorizationv1beta1.AuthorizationV1beta1Client
 	autoscalingV1                 *autoscalingv1.AutoscalingV1Client
-	autoscalingV2alpha1           *autoscalingv2alpha1.AutoscalingV2alpha1Client
+	autoscalingV2beta1            *autoscalingv2beta1.AutoscalingV2beta1Client
 	batchV1                       *batchv1.BatchV1Client
 	batchV1beta1                  *batchv1beta1.BatchV1beta1Client
 	batchV2alpha1                 *batchv2alpha1.BatchV2alpha1Client
@@ -156,10 +159,15 @@ func (c *Clientset) AppsV1beta2() appsv1beta2.AppsV1beta2Interface {
 	return c.appsV1beta2
 }

+// AppsV1 retrieves the AppsV1Client
+func (c *Clientset) AppsV1() appsv1.AppsV1Interface {
+	return c.appsV1
+}
+
 // Deprecated: Apps retrieves the default version of AppsClient.
 // Please explicitly pick a version.
-func (c *Clientset) Apps() appsv1beta2.AppsV1beta2Interface {
-	return c.appsV1beta2
+func (c *Clientset) Apps() appsv1.AppsV1Interface {
+	return c.appsV1
 }

 // AuthenticationV1 retrieves the AuthenticationV1Client
@@ -205,9 +213,9 @@ func (c *Clientset) Autoscaling() autoscalingv1.AutoscalingV1Interface {
 	return c.autoscalingV1
 }

-// AutoscalingV2alpha1 retrieves the AutoscalingV2alpha1Client
-func (c *Clientset) AutoscalingV2alpha1() autoscalingv2alpha1.AutoscalingV2alpha1Interface {
-	return c.autoscalingV2alpha1
+// AutoscalingV2beta1 retrieves the AutoscalingV2beta1Client
+func (c *Clientset) AutoscalingV2beta1() autoscalingv2beta1.AutoscalingV2beta1Interface {
+	return c.autoscalingV2beta1
 }

 // BatchV1 retrieves the BatchV1Client
@@ -373,6 +381,10 @@ func NewForConfig(c *rest.Config) (*Clientset, error) {
 	if err != nil {
 		return nil, err
 	}
+	cs.appsV1, err = appsv1.NewForConfig(&configShallowCopy)
+	if err != nil {
+		return nil, err
+	}
 	cs.authenticationV1, err = authenticationv1.NewForConfig(&configShallowCopy)
 	if err != nil {
 		return nil, err
@@ -393,7 +405,7 @@ func NewForConfig(c *rest.Config) (*Clientset, error) {
 	if err != nil {
 		return nil, err
 	}
-	cs.autoscalingV2alpha1, err = autoscalingv2alpha1.NewForConfig(&configShallowCopy)
+	cs.autoscalingV2beta1, err = autoscalingv2beta1.NewForConfig(&configShallowCopy)
 	if err != nil {
 		return nil, err
 	}
@@ -473,12 +485,13 @@ func NewForConfigOrDie(c *rest.Config) *Clientset {
 	cs.admissionregistrationV1alpha1 = admissionregistrationv1alpha1.NewForConfigOrDie(c)
 	cs.appsV1beta1 = appsv1beta1.NewForConfigOrDie(c)
 	cs.appsV1beta2 = appsv1beta2.NewForConfigOrDie(c)
+	cs.appsV1 = appsv1.NewForConfigOrDie(c)
 	cs.authenticationV1 = authenticationv1.NewForConfigOrDie(c)
 	cs.authenticationV1beta1 = authenticationv1beta1.NewForConfigOrDie(c)
 	cs.authorizationV1 = authorizationv1.NewForConfigOrDie(c)
 	cs.authorizationV1beta1 = authorizationv1beta1.NewForConfigOrDie(c)
 	cs.autoscalingV1 = autoscalingv1.NewForConfigOrDie(c)
-	cs.autoscalingV2alpha1 = autoscalingv2alpha1.NewForConfigOrDie(c)
+	cs.autoscalingV2beta1 = autoscalingv2beta1.NewForConfigOrDie(c)
 	cs.batchV1 = batchv1.NewForConfigOrDie(c)
 	cs.batchV1beta1 = batchv1beta1.NewForConfigOrDie(c)
 	cs.batchV2alpha1 = batchv2alpha1.NewForConfigOrDie(c)
@@ -505,12 +518,13 @@ func New(c rest.Interface) *Clientset {
 	cs.admissionregistrationV1alpha1 = admissionregistrationv1alpha1.New(c)
 	cs.appsV1beta1 = appsv1beta1.New(c)
 	cs.appsV1beta2 = appsv1beta2.New(c)
+	cs.appsV1 = appsv1.New(c)
 	cs.authenticationV1 = authenticationv1.New(c)
 	cs.authenticationV1beta1 = authenticationv1beta1.New(c)
 	cs.authorizationV1 = authorizationv1.New(c)
 	cs.authorizationV1beta1 = authorizationv1beta1.New(c)
 	cs.autoscalingV1 = autoscalingv1.New(c)
-	cs.autoscalingV2alpha1 = autoscalingv2alpha1.New(c)
+	cs.autoscalingV2beta1 = autoscalingv2beta1.New(c)
 	cs.batchV1 = batchv1.New(c)
 	cs.batchV1beta1 = batchv1beta1.New(c)
 	cs.batchV2alpha1 = batchv2alpha1.New(c)
--- a/kubernetes/doc.go
+++ b/kubernetes/doc.go
@@ -14,7 +14,5 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-// This package is generated by client-gen with custom arguments.
-
 // This package has the automatically generated clientset.
 package kubernetes
--- a/kubernetes/fake/BUILD
+++ b/kubernetes/fake/BUILD
@@ -12,8 +12,10 @@ go_library(
        "doc.go",
        "register.go",
    ],
+    importpath = "k8s.io/client-go/kubernetes/fake",
    deps = [
        "//vendor/k8s.io/api/admissionregistration/v1alpha1:go_default_library",
+        "//vendor/k8s.io/api/apps/v1:go_default_library",
        "//vendor/k8s.io/api/apps/v1beta1:go_default_library",
        "//vendor/k8s.io/api/apps/v1beta2:go_default_library",
        "//vendor/k8s.io/api/authentication/v1:go_default_library",
@@ -21,7 +23,7 @@ go_library(
        "//vendor/k8s.io/api/authorization/v1:go_default_library",
        "//vendor/k8s.io/api/authorization/v1beta1:go_default_library",
        "//vendor/k8s.io/api/autoscaling/v1:go_default_library",
-        "//vendor/k8s.io/api/autoscaling/v2alpha1:go_default_library",
+        "//vendor/k8s.io/api/autoscaling/v2beta1:go_default_library",
        "//vendor/k8s.io/api/batch/v1:go_default_library",
        "//vendor/k8s.io/api/batch/v1beta1:go_default_library",
        "//vendor/k8s.io/api/batch/v2alpha1:go_default_library",
@@ -47,6 +49,8 @@ go_library(
        "//vendor/k8s.io/client-go/kubernetes:go_default_library",
        "//vendor/k8s.io/client-go/kubernetes/typed/admissionregistration/v1alpha1:go_default_library",
        "//vendor/k8s.io/client-go/kubernetes/typed/admissionregistration/v1alpha1/fake:go_default_library",
+        "//vendor/k8s.io/client-go/kubernetes/typed/apps/v1:go_default_library",
+        "//vendor/k8s.io/client-go/kubernetes/typed/apps/v1/fake:go_default_library",
        "//vendor/k8s.io/client-go/kubernetes/typed/apps/v1beta1:go_default_library",
        "//vendor/k8s.io/client-go/kubernetes/typed/apps/v1beta1/fake:go_default_library",
        "//vendor/k8s.io/client-go/kubernetes/typed/apps/v1beta2:go_default_library",
@@ -61,8 +65,8 @@ go_library(
        "//vendor/k8s.io/client-go/kubernetes/typed/authorization/v1beta1/fake:go_default_library",
        "//vendor/k8s.io/client-go/kubernetes/typed/autoscaling/v1:go_default_library",
        "//vendor/k8s.io/client-go/kubernetes/typed/autoscaling/v1/fake:go_default_library",
-        "//vendor/k8s.io/client-go/kubernetes/typed/autoscaling/v2alpha1:go_default_library",
-        "//vendor/k8s.io/client-go/kubernetes/typed/autoscaling/v2alpha1/fake:go_default_library",
+        "//vendor/k8s.io/client-go/kubernetes/typed/autoscaling/v2beta1:go_default_library",
+        "//vendor/k8s.io/client-go/kubernetes/typed/autoscaling/v2beta1/fake:go_default_library",
        "//vendor/k8s.io/client-go/kubernetes/typed/batch/v1:go_default_library",
        "//vendor/k8s.io/client-go/kubernetes/typed/batch/v1/fake:go_default_library",
        "//vendor/k8s.io/client-go/kubernetes/typed/batch/v1beta1:go_default_library",
--- a/kubernetes/fake/clientset_generated.go
+++ b/kubernetes/fake/clientset_generated.go
@@ -24,6 +24,8 @@ import (
 	clientset "k8s.io/client-go/kubernetes"
 	admissionregistrationv1alpha1 "k8s.io/client-go/kubernetes/typed/admissionregistration/v1alpha1"
 	fakeadmissionregistrationv1alpha1 "k8s.io/client-go/kubernetes/typed/admissionregistration/v1alpha1/fake"
+	appsv1 "k8s.io/client-go/kubernetes/typed/apps/v1"
+	fakeappsv1 "k8s.io/client-go/kubernetes/typed/apps/v1/fake"
 	appsv1beta1 "k8s.io/client-go/kubernetes/typed/apps/v1beta1"
 	fakeappsv1beta1 "k8s.io/client-go/kubernetes/typed/apps/v1beta1/fake"
 	appsv1beta2 "k8s.io/client-go/kubernetes/typed/apps/v1beta2"
@@ -38,8 +40,8 @@ import (
 	fakeauthorizationv1beta1 "k8s.io/client-go/kubernetes/typed/authorization/v1beta1/fake"
 	autoscalingv1 "k8s.io/client-go/kubernetes/typed/autoscaling/v1"
 	fakeautoscalingv1 "k8s.io/client-go/kubernetes/typed/autoscaling/v1/fake"
-	autoscalingv2alpha1 "k8s.io/client-go/kubernetes/typed/autoscaling/v2alpha1"
-	fakeautoscalingv2alpha1 "k8s.io/client-go/kubernetes/typed/autoscaling/v2alpha1/fake"
+	autoscalingv2beta1 "k8s.io/client-go/kubernetes/typed/autoscaling/v2beta1"
+	fakeautoscalingv2beta1 "k8s.io/client-go/kubernetes/typed/autoscaling/v2beta1/fake"
 	batchv1 "k8s.io/client-go/kubernetes/typed/batch/v1"
 	fakebatchv1 "k8s.io/client-go/kubernetes/typed/batch/v1/fake"
 	batchv1beta1 "k8s.io/client-go/kubernetes/typed/batch/v1beta1"
@@ -87,10 +89,9 @@ func NewSimpleClientset(objects ...runtime.Object) *Clientset {

 	fakePtr := testing.Fake{}
 	fakePtr.AddReactor("*", "*", testing.ObjectReaction(o))
-
 	fakePtr.AddWatchReactor("*", testing.DefaultWatchReactor(watch.NewFake(), nil))

-	return &Clientset{fakePtr}
+	return &Clientset{fakePtr, &fakediscovery.FakeDiscovery{Fake: &fakePtr}}
 }

 // Clientset implements clientset.Interface. Meant to be embedded into a
@@ -98,10 +99,11 @@ func NewSimpleClientset(objects ...runtime.Object) *Clientset {
 // you want to test easier.
 type Clientset struct {
 	testing.Fake
+	discovery *fakediscovery.FakeDiscovery
 }

 func (c *Clientset) Discovery() discovery.DiscoveryInterface {
-	return &fakediscovery.FakeDiscovery{Fake: &c.Fake}
+	return c.discovery
 }

 var _ clientset.Interface = &Clientset{}
@@ -126,9 +128,14 @@ func (c *Clientset) AppsV1beta2() appsv1beta2.AppsV1beta2Interface {
 	return &fakeappsv1beta2.FakeAppsV1beta2{Fake: &c.Fake}
 }

-// Apps retrieves the AppsV1beta2Client
-func (c *Clientset) Apps() appsv1beta2.AppsV1beta2Interface {
-	return &fakeappsv1beta2.FakeAppsV1beta2{Fake: &c.Fake}
+// AppsV1 retrieves the AppsV1Client
+func (c *Clientset) AppsV1() appsv1.AppsV1Interface {
+	return &fakeappsv1.FakeAppsV1{Fake: &c.Fake}
+}
+
+// Apps retrieves the AppsV1Client
+func (c *Clientset) Apps() appsv1.AppsV1Interface {
+	return &fakeappsv1.FakeAppsV1{Fake: &c.Fake}
 }

 // AuthenticationV1 retrieves the AuthenticationV1Client
@@ -171,9 +178,9 @@ func (c *Clientset) Autoscaling() autoscalingv1.AutoscalingV1Interface {
 	return &fakeautoscalingv1.FakeAutoscalingV1{Fake: &c.Fake}
 }

-// AutoscalingV2alpha1 retrieves the AutoscalingV2alpha1Client
-func (c *Clientset) AutoscalingV2alpha1() autoscalingv2alpha1.AutoscalingV2alpha1Interface {
-	return &fakeautoscalingv2alpha1.FakeAutoscalingV2alpha1{Fake: &c.Fake}
+// AutoscalingV2beta1 retrieves the AutoscalingV2beta1Client
+func (c *Clientset) AutoscalingV2beta1() autoscalingv2beta1.AutoscalingV2beta1Interface {
+	return &fakeautoscalingv2beta1.FakeAutoscalingV2beta1{Fake: &c.Fake}
 }

 // BatchV1 retrieves the BatchV1Client
--- a/kubernetes/fake/doc.go
+++ b/kubernetes/fake/doc.go
@@ -14,7 +14,5 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-// This package is generated by client-gen with custom arguments.
-
 // This package has the automatically generated fake clientset.
 package fake
--- a/kubernetes/fake/register.go
+++ b/kubernetes/fake/register.go
@@ -18,6 +18,7 @@ package fake

 import (
 	admissionregistrationv1alpha1 "k8s.io/api/admissionregistration/v1alpha1"
+	appsv1 "k8s.io/api/apps/v1"
 	appsv1beta1 "k8s.io/api/apps/v1beta1"
 	appsv1beta2 "k8s.io/api/apps/v1beta2"
 	authenticationv1 "k8s.io/api/authentication/v1"
@@ -25,7 +26,7 @@ import (
 	authorizationv1 "k8s.io/api/authorization/v1"
 	authorizationv1beta1 "k8s.io/api/authorization/v1beta1"
 	autoscalingv1 "k8s.io/api/autoscaling/v1"
-	autoscalingv2alpha1 "k8s.io/api/autoscaling/v2alpha1"
+	autoscalingv2beta1 "k8s.io/api/autoscaling/v2beta1"
 	batchv1 "k8s.io/api/batch/v1"
 	batchv1beta1 "k8s.io/api/batch/v1beta1"
 	batchv2alpha1 "k8s.io/api/batch/v2alpha1"
@@ -74,12 +75,13 @@ func AddToScheme(scheme *runtime.Scheme) {
 	admissionregistrationv1alpha1.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)
-	autoscalingv2alpha1.AddToScheme(scheme)
+	autoscalingv2beta1.AddToScheme(scheme)
 	batchv1.AddToScheme(scheme)
 	batchv1beta1.AddToScheme(scheme)
 	batchv2alpha1.AddToScheme(scheme)
--- a/kubernetes/scheme/BUILD
+++ b/kubernetes/scheme/BUILD
@@ -11,8 +11,10 @@ go_library(
        "doc.go",
        "register.go",
    ],
+    importpath = "k8s.io/client-go/kubernetes/scheme",
    deps = [
        "//vendor/k8s.io/api/admissionregistration/v1alpha1:go_default_library",
+        "//vendor/k8s.io/api/apps/v1:go_default_library",
        "//vendor/k8s.io/api/apps/v1beta1:go_default_library",
        "//vendor/k8s.io/api/apps/v1beta2:go_default_library",
        "//vendor/k8s.io/api/authentication/v1:go_default_library",
@@ -20,7 +22,7 @@ go_library(
        "//vendor/k8s.io/api/authorization/v1:go_default_library",
        "//vendor/k8s.io/api/authorization/v1beta1:go_default_library",
        "//vendor/k8s.io/api/autoscaling/v1:go_default_library",
-        "//vendor/k8s.io/api/autoscaling/v2alpha1:go_default_library",
+        "//vendor/k8s.io/api/autoscaling/v2beta1:go_default_library",
        "//vendor/k8s.io/api/batch/v1:go_default_library",
        "//vendor/k8s.io/api/batch/v1beta1:go_default_library",
        "//vendor/k8s.io/api/batch/v2alpha1:go_default_library",
--- a/kubernetes/scheme/doc.go
+++ b/kubernetes/scheme/doc.go
@@ -14,7 +14,5 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-// This package is generated by client-gen with custom arguments.
-
 // This package contains the scheme of the automatically generated clientset.
 package scheme
--- a/kubernetes/scheme/register.go
+++ b/kubernetes/scheme/register.go
@@ -18,6 +18,7 @@ package scheme

 import (
 	admissionregistrationv1alpha1 "k8s.io/api/admissionregistration/v1alpha1"
+	appsv1 "k8s.io/api/apps/v1"
 	appsv1beta1 "k8s.io/api/apps/v1beta1"
 	appsv1beta2 "k8s.io/api/apps/v1beta2"
 	authenticationv1 "k8s.io/api/authentication/v1"
@@ -25,7 +26,7 @@ import (
 	authorizationv1 "k8s.io/api/authorization/v1"
 	authorizationv1beta1 "k8s.io/api/authorization/v1beta1"
 	autoscalingv1 "k8s.io/api/autoscaling/v1"
-	autoscalingv2alpha1 "k8s.io/api/autoscaling/v2alpha1"
+	autoscalingv2beta1 "k8s.io/api/autoscaling/v2beta1"
 	batchv1 "k8s.io/api/batch/v1"
 	batchv1beta1 "k8s.io/api/batch/v1beta1"
 	batchv2alpha1 "k8s.io/api/batch/v2alpha1"
@@ -74,12 +75,13 @@ func AddToScheme(scheme *runtime.Scheme) {
 	admissionregistrationv1alpha1.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)
-	autoscalingv2alpha1.AddToScheme(scheme)
+	autoscalingv2beta1.AddToScheme(scheme)
 	batchv1.AddToScheme(scheme)
 	batchv1beta1.AddToScheme(scheme)
 	batchv2alpha1.AddToScheme(scheme)
--- a/kubernetes/typed/admissionregistration/v1alpha1/BUILD
+++ b/kubernetes/typed/admissionregistration/v1alpha1/BUILD
@@ -14,6 +14,7 @@ go_library(
        "generated_expansion.go",
        "initializerconfiguration.go",
    ],
+    importpath = "k8s.io/client-go/kubernetes/typed/admissionregistration/v1alpha1",
    deps = [
        "//vendor/k8s.io/api/admissionregistration/v1alpha1:go_default_library",
        "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
--- a/kubernetes/typed/admissionregistration/v1alpha1/doc.go
+++ b/kubernetes/typed/admissionregistration/v1alpha1/doc.go
@@ -14,7 +14,5 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-// This package is generated by client-gen with custom arguments.
-
 // This package has the automatically generated typed clients.
 package v1alpha1
--- a/kubernetes/typed/admissionregistration/v1alpha1/fake/BUILD
+++ b/kubernetes/typed/admissionregistration/v1alpha1/fake/BUILD
@@ -13,6 +13,7 @@ go_library(
        "fake_externaladmissionhookconfiguration.go",
        "fake_initializerconfiguration.go",
    ],
+    importpath = "k8s.io/client-go/kubernetes/typed/admissionregistration/v1alpha1/fake",
    deps = [
        "//vendor/k8s.io/api/admissionregistration/v1alpha1:go_default_library",
        "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
--- a/kubernetes/typed/admissionregistration/v1alpha1/fake/doc.go
+++ b/kubernetes/typed/admissionregistration/v1alpha1/fake/doc.go
@@ -14,7 +14,5 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-// This package is generated by client-gen with custom arguments.
-
 // Package fake has the automatically generated clients.
 package fake
--- a/kubernetes/typed/apps/v1/BUILD
+++ b/kubernetes/typed/apps/v1/BUILD
@@ -0,0 +1,39 @@
+load("@io_bazel_rules_go//go:def.bzl", "go_library")
+
+go_library(
+    name = "go_default_library",
+    srcs = [
+        "apps_client.go",
+        "daemonset.go",
+        "doc.go",
+        "generated_expansion.go",
+    ],
+    importpath = "k8s.io/client-go/kubernetes/typed/apps/v1",
+    visibility = ["//visibility:public"],
+    deps = [
+        "//vendor/k8s.io/api/apps/v1:go_default_library",
+        "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
+        "//vendor/k8s.io/apimachinery/pkg/runtime/serializer:go_default_library",
+        "//vendor/k8s.io/apimachinery/pkg/types:go_default_library",
+        "//vendor/k8s.io/apimachinery/pkg/watch:go_default_library",
+        "//vendor/k8s.io/client-go/kubernetes/scheme:go_default_library",
+        "//vendor/k8s.io/client-go/rest:go_default_library",
+    ],
+)
+
+filegroup(
+    name = "package-srcs",
+    srcs = glob(["**"]),
+    tags = ["automanaged"],
+    visibility = ["//visibility:private"],
+)
+
+filegroup(
+    name = "all-srcs",
+    srcs = [
+        ":package-srcs",
+        "//staging/src/k8s.io/client-go/kubernetes/typed/apps/v1/fake:all-srcs",
+    ],
+    tags = ["automanaged"],
+    visibility = ["//visibility:public"],
+)
--- a/kubernetes/typed/apps/v1/apps_client.go
+++ b/kubernetes/typed/apps/v1/apps_client.go
@@ -0,0 +1,88 @@
+/*
+Copyright 2017 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package v1
+
+import (
+	v1 "k8s.io/api/apps/v1"
+	serializer "k8s.io/apimachinery/pkg/runtime/serializer"
+	"k8s.io/client-go/kubernetes/scheme"
+	rest "k8s.io/client-go/rest"
+)
+
+type AppsV1Interface interface {
+	RESTClient() rest.Interface
+	DaemonSetsGetter
+}
+
+// AppsV1Client is used to interact with features provided by the apps group.
+type AppsV1Client struct {
+	restClient rest.Interface
+}
+
+func (c *AppsV1Client) DaemonSets(namespace string) DaemonSetInterface {
+	return newDaemonSets(c, namespace)
+}
+
+// NewForConfig creates a new AppsV1Client for the given config.
+func NewForConfig(c *rest.Config) (*AppsV1Client, error) {
+	config := *c
+	if err := setConfigDefaults(&config); err != nil {
+		return nil, err
+	}
+	client, err := rest.RESTClientFor(&config)
+	if err != nil {
+		return nil, err
+	}
+	return &AppsV1Client{client}, nil
+}
+
+// NewForConfigOrDie creates a new AppsV1Client for the given config and
+// panics if there is an error in the config.
+func NewForConfigOrDie(c *rest.Config) *AppsV1Client {
+	client, err := NewForConfig(c)
+	if err != nil {
+		panic(err)
+	}
+	return client
+}
+
+// New creates a new AppsV1Client for the given RESTClient.
+func New(c rest.Interface) *AppsV1Client {
+	return &AppsV1Client{c}
+}
+
+func setConfigDefaults(config *rest.Config) error {
+	gv := v1.SchemeGroupVersion
+	config.GroupVersion = &gv
+	config.APIPath = "/apis"
+	config.NegotiatedSerializer = serializer.DirectCodecFactory{CodecFactory: scheme.Codecs}
+
+	if config.UserAgent == "" {
+		config.UserAgent = rest.DefaultKubernetesUserAgent()
+	}
+
+	return nil
+}
+
+// RESTClient returns a RESTClient that is used to communicate
+// with API server by this client implementation.
+func (c *AppsV1Client) RESTClient() rest.Interface {
+	if c == nil {
+		return nil
+	}
+	return c.restClient
+}
--- a/kubernetes/typed/apps/v1/daemonset.go
+++ b/kubernetes/typed/apps/v1/daemonset.go
@@ -0,0 +1,172 @@
+/*
+Copyright 2017 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package v1
+
+import (
+	v1 "k8s.io/api/apps/v1"
+	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	types "k8s.io/apimachinery/pkg/types"
+	watch "k8s.io/apimachinery/pkg/watch"
+	scheme "k8s.io/client-go/kubernetes/scheme"
+	rest "k8s.io/client-go/rest"
+)
+
+// DaemonSetsGetter has a method to return a DaemonSetInterface.
+// A group's client should implement this interface.
+type DaemonSetsGetter interface {
+	DaemonSets(namespace string) DaemonSetInterface
+}
+
+// DaemonSetInterface has methods to work with DaemonSet resources.
+type DaemonSetInterface interface {
+	Create(*v1.DaemonSet) (*v1.DaemonSet, error)
+	Update(*v1.DaemonSet) (*v1.DaemonSet, error)
+	UpdateStatus(*v1.DaemonSet) (*v1.DaemonSet, error)
+	Delete(name string, options *meta_v1.DeleteOptions) error
+	DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error
+	Get(name string, options meta_v1.GetOptions) (*v1.DaemonSet, error)
+	List(opts meta_v1.ListOptions) (*v1.DaemonSetList, error)
+	Watch(opts meta_v1.ListOptions) (watch.Interface, error)
+	Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1.DaemonSet, err error)
+	DaemonSetExpansion
+}
+
+// daemonSets implements DaemonSetInterface
+type daemonSets struct {
+	client rest.Interface
+	ns     string
+}
+
+// newDaemonSets returns a DaemonSets
+func newDaemonSets(c *AppsV1Client, namespace string) *daemonSets {
+	return &daemonSets{
+		client: c.RESTClient(),
+		ns:     namespace,
+	}
+}
+
+// Get takes name of the daemonSet, and returns the corresponding daemonSet object, and an error if there is any.
+func (c *daemonSets) Get(name string, options meta_v1.GetOptions) (result *v1.DaemonSet, err error) {
+	result = &v1.DaemonSet{}
+	err = c.client.Get().
+		Namespace(c.ns).
+		Resource("daemonsets").
+		Name(name).
+		VersionedParams(&options, scheme.ParameterCodec).
+		Do().
+		Into(result)
+	return
+}
+
+// List takes label and field selectors, and returns the list of DaemonSets that match those selectors.
+func (c *daemonSets) List(opts meta_v1.ListOptions) (result *v1.DaemonSetList, err error) {
+	result = &v1.DaemonSetList{}
+	err = c.client.Get().
+		Namespace(c.ns).
+		Resource("daemonsets").
+		VersionedParams(&opts, scheme.ParameterCodec).
+		Do().
+		Into(result)
+	return
+}
+
+// Watch returns a watch.Interface that watches the requested daemonSets.
+func (c *daemonSets) Watch(opts meta_v1.ListOptions) (watch.Interface, error) {
+	opts.Watch = true
+	return c.client.Get().
+		Namespace(c.ns).
+		Resource("daemonsets").
+		VersionedParams(&opts, scheme.ParameterCodec).
+		Watch()
+}
+
+// Create takes the representation of a daemonSet and creates it.  Returns the server's representation of the daemonSet, and an error, if there is any.
+func (c *daemonSets) Create(daemonSet *v1.DaemonSet) (result *v1.DaemonSet, err error) {
+	result = &v1.DaemonSet{}
+	err = c.client.Post().
+		Namespace(c.ns).
+		Resource("daemonsets").
+		Body(daemonSet).
+		Do().
+		Into(result)
+	return
+}
+
+// Update takes the representation of a daemonSet and updates it. Returns the server's representation of the daemonSet, and an error, if there is any.
+func (c *daemonSets) Update(daemonSet *v1.DaemonSet) (result *v1.DaemonSet, err error) {
+	result = &v1.DaemonSet{}
+	err = c.client.Put().
+		Namespace(c.ns).
+		Resource("daemonsets").
+		Name(daemonSet.Name).
+		Body(daemonSet).
+		Do().
+		Into(result)
+	return
+}
+
+// UpdateStatus was generated because the type contains a Status member.
+// Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus().
+
+func (c *daemonSets) UpdateStatus(daemonSet *v1.DaemonSet) (result *v1.DaemonSet, err error) {
+	result = &v1.DaemonSet{}
+	err = c.client.Put().
+		Namespace(c.ns).
+		Resource("daemonsets").
+		Name(daemonSet.Name).
+		SubResource("status").
+		Body(daemonSet).
+		Do().
+		Into(result)
+	return
+}
+
+// Delete takes name of the daemonSet and deletes it. Returns an error if one occurs.
+func (c *daemonSets) Delete(name string, options *meta_v1.DeleteOptions) error {
+	return c.client.Delete().
+		Namespace(c.ns).
+		Resource("daemonsets").
+		Name(name).
+		Body(options).
+		Do().
+		Error()
+}
+
+// DeleteCollection deletes a collection of objects.
+func (c *daemonSets) DeleteCollection(options *meta_v1.DeleteOptions, listOptions meta_v1.ListOptions) error {
+	return c.client.Delete().
+		Namespace(c.ns).
+		Resource("daemonsets").
+		VersionedParams(&listOptions, scheme.ParameterCodec).
+		Body(options).
+		Do().
+		Error()
+}
+
+// Patch applies the patch and returns the patched daemonSet.
+func (c *daemonSets) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1.DaemonSet, err error) {
+	result = &v1.DaemonSet{}
+	err = c.client.Patch(pt).
+		Namespace(c.ns).
+		Resource("daemonsets").
+		SubResource(subresources...).
+		Name(name).
+		Body(data).
+		Do().
+		Into(result)
+	return
+}
--- a/kubernetes/typed/autoscaling/v2alpha1/doc.go
+++ b/kubernetes/typed/autoscaling/v2alpha1/doc.go
@@ -14,7 +14,5 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-// This package is generated by client-gen with custom arguments.
-
 // This package has the automatically generated typed clients.
-package v2alpha1
+package v1
--- a/kubernetes/typed/apps/v1/fake/BUILD
+++ b/kubernetes/typed/apps/v1/fake/BUILD
@@ -0,0 +1,37 @@
+load("@io_bazel_rules_go//go:def.bzl", "go_library")
+
+go_library(
+    name = "go_default_library",
+    srcs = [
+        "doc.go",
+        "fake_apps_client.go",
+        "fake_daemonset.go",
+    ],
+    importpath = "k8s.io/client-go/kubernetes/typed/apps/v1/fake",
+    visibility = ["//visibility:public"],
+    deps = [
+        "//vendor/k8s.io/api/apps/v1:go_default_library",
+        "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
+        "//vendor/k8s.io/apimachinery/pkg/labels:go_default_library",
+        "//vendor/k8s.io/apimachinery/pkg/runtime/schema:go_default_library",
+        "//vendor/k8s.io/apimachinery/pkg/types:go_default_library",
+        "//vendor/k8s.io/apimachinery/pkg/watch:go_default_library",
+        "//vendor/k8s.io/client-go/kubernetes/typed/apps/v1:go_default_library",
+        "//vendor/k8s.io/client-go/rest:go_default_library",
+        "//vendor/k8s.io/client-go/testing:go_default_library",
+    ],
+)
+
+filegroup(
+    name = "package-srcs",
+    srcs = glob(["**"]),
+    tags = ["automanaged"],
+    visibility = ["//visibility:private"],
+)
+
+filegroup(
+    name = "all-srcs",
+    srcs = [":package-srcs"],
+    tags = ["automanaged"],
+    visibility = ["//visibility:public"],
+)
--- a/kubernetes/typed/autoscaling/v2alpha1/fake/doc.go
+++ b/kubernetes/typed/autoscaling/v2alpha1/fake/doc.go
@@ -14,7 +14,5 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-// This package is generated by client-gen with custom arguments.
-
 // Package fake has the automatically generated clients.
 package fake
--- a/kubernetes/typed/apps/v1/fake/fake_apps_client.go
+++ b/kubernetes/typed/apps/v1/fake/fake_apps_client.go
@@ -0,0 +1,38 @@
+/*
+Copyright 2017 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package fake
+
+import (
+	v1 "k8s.io/client-go/kubernetes/typed/apps/v1"
+	rest "k8s.io/client-go/rest"
+	testing "k8s.io/client-go/testing"
+)
+
+type FakeAppsV1 struct {
+	*testing.Fake
+}
+
+func (c *FakeAppsV1) DaemonSets(namespace string) v1.DaemonSetInterface {
+	return &FakeDaemonSets{c, namespace}
+}
+
+// RESTClient returns a RESTClient that is used to communicate
+// with API server by this client implementation.
+func (c *FakeAppsV1) RESTClient() rest.Interface {
+	var ret *rest.RESTClient
+	return ret
+}
--- a/kubernetes/typed/apps/v1/fake/fake_daemonset.go
+++ b/kubernetes/typed/apps/v1/fake/fake_daemonset.go
@@ -0,0 +1,138 @@
+/*
+Copyright 2017 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package fake
+
+import (
+	apps_v1 "k8s.io/api/apps/v1"
+	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	labels "k8s.io/apimachinery/pkg/labels"
+	schema "k8s.io/apimachinery/pkg/runtime/schema"
+	types "k8s.io/apimachinery/pkg/types"
+	watch "k8s.io/apimachinery/pkg/watch"
+	testing "k8s.io/client-go/testing"
+)
+
+// FakeDaemonSets implements DaemonSetInterface
+type FakeDaemonSets struct {
+	Fake *FakeAppsV1
+	ns   string
+}
+
+var daemonsetsResource = schema.GroupVersionResource{Group: "apps", Version: "v1", Resource: "daemonsets"}
+
+var daemonsetsKind = schema.GroupVersionKind{Group: "apps", Version: "v1", Kind: "DaemonSet"}
+
+// Get takes name of the daemonSet, and returns the corresponding daemonSet object, and an error if there is any.
+func (c *FakeDaemonSets) Get(name string, options v1.GetOptions) (result *apps_v1.DaemonSet, err error) {
+	obj, err := c.Fake.
+		Invokes(testing.NewGetAction(daemonsetsResource, c.ns, name), &apps_v1.DaemonSet{})
+
+	if obj == nil {
+		return nil, err
+	}
+	return obj.(*apps_v1.DaemonSet), err
+}
+
+// List takes label and field selectors, and returns the list of DaemonSets that match those selectors.
+func (c *FakeDaemonSets) List(opts v1.ListOptions) (result *apps_v1.DaemonSetList, err error) {
+	obj, err := c.Fake.
+		Invokes(testing.NewListAction(daemonsetsResource, daemonsetsKind, c.ns, opts), &apps_v1.DaemonSetList{})
+
+	if obj == nil {
+		return nil, err
+	}
+
+	label, _, _ := testing.ExtractFromListOptions(opts)
+	if label == nil {
+		label = labels.Everything()
+	}
+	list := &apps_v1.DaemonSetList{}
+	for _, item := range obj.(*apps_v1.DaemonSetList).Items {
+		if label.Matches(labels.Set(item.Labels)) {
+			list.Items = append(list.Items, item)
+		}
+	}
+	return list, err
+}
+
+// Watch returns a watch.Interface that watches the requested daemonSets.
+func (c *FakeDaemonSets) Watch(opts v1.ListOptions) (watch.Interface, error) {
+	return c.Fake.
+		InvokesWatch(testing.NewWatchAction(daemonsetsResource, c.ns, opts))
+
+}
+
+// Create takes the representation of a daemonSet and creates it.  Returns the server's representation of the daemonSet, and an error, if there is any.
+func (c *FakeDaemonSets) Create(daemonSet *apps_v1.DaemonSet) (result *apps_v1.DaemonSet, err error) {
+	obj, err := c.Fake.
+		Invokes(testing.NewCreateAction(daemonsetsResource, c.ns, daemonSet), &apps_v1.DaemonSet{})
+
+	if obj == nil {
+		return nil, err
+	}
+	return obj.(*apps_v1.DaemonSet), err
+}
+
+// Update takes the representation of a daemonSet and updates it. Returns the server's representation of the daemonSet, and an error, if there is any.
+func (c *FakeDaemonSets) Update(daemonSet *apps_v1.DaemonSet) (result *apps_v1.DaemonSet, err error) {
+	obj, err := c.Fake.
+		Invokes(testing.NewUpdateAction(daemonsetsResource, c.ns, daemonSet), &apps_v1.DaemonSet{})
+
+	if obj == nil {
+		return nil, err
+	}
+	return obj.(*apps_v1.DaemonSet), err
+}
+
+// UpdateStatus was generated because the type contains a Status member.
+// Add a +genclient:noStatus comment above the type to avoid generating UpdateStatus().
+func (c *FakeDaemonSets) UpdateStatus(daemonSet *apps_v1.DaemonSet) (*apps_v1.DaemonSet, error) {
+	obj, err := c.Fake.
+		Invokes(testing.NewUpdateSubresourceAction(daemonsetsResource, "status", c.ns, daemonSet), &apps_v1.DaemonSet{})
+
+	if obj == nil {
+		return nil, err
+	}
+	return obj.(*apps_v1.DaemonSet), err
+}
+
+// Delete takes name of the daemonSet and deletes it. Returns an error if one occurs.
+func (c *FakeDaemonSets) Delete(name string, options *v1.DeleteOptions) error {
+	_, err := c.Fake.
+		Invokes(testing.NewDeleteAction(daemonsetsResource, c.ns, name), &apps_v1.DaemonSet{})
+
+	return err
+}
+
+// DeleteCollection deletes a collection of objects.
+func (c *FakeDaemonSets) DeleteCollection(options *v1.DeleteOptions, listOptions v1.ListOptions) error {
+	action := testing.NewDeleteCollectionAction(daemonsetsResource, c.ns, listOptions)
+
+	_, err := c.Fake.Invokes(action, &apps_v1.DaemonSetList{})
+	return err
+}
+
+// Patch applies the patch and returns the patched daemonSet.
+func (c *FakeDaemonSets) Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *apps_v1.DaemonSet, err error) {
+	obj, err := c.Fake.
+		Invokes(testing.NewPatchSubresourceAction(daemonsetsResource, c.ns, name, data, subresources...), &apps_v1.DaemonSet{})
+
+	if obj == nil {
+		return nil, err
+	}
+	return obj.(*apps_v1.DaemonSet), err
+}
--- a/kubernetes/typed/apps/v1/generated_expansion.go
+++ b/kubernetes/typed/apps/v1/generated_expansion.go
@@ -0,0 +1,19 @@
+/*
+Copyright 2017 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package v1
+
+type DaemonSetExpansion interface{}
--- a/kubernetes/typed/apps/v1beta1/BUILD
+++ b/kubernetes/typed/apps/v1beta1/BUILD
@@ -16,6 +16,7 @@ go_library(
        "scale.go",
        "statefulset.go",
    ],
+    importpath = "k8s.io/client-go/kubernetes/typed/apps/v1beta1",
    deps = [
        "//vendor/k8s.io/api/apps/v1beta1:go_default_library",
        "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
--- a/kubernetes/typed/apps/v1beta1/doc.go
+++ b/kubernetes/typed/apps/v1beta1/doc.go
@@ -14,7 +14,5 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-// This package is generated by client-gen with custom arguments.
-
 // This package has the automatically generated typed clients.
 package v1beta1
--- a/kubernetes/typed/apps/v1beta1/fake/BUILD
+++ b/kubernetes/typed/apps/v1beta1/fake/BUILD
@@ -15,6 +15,7 @@ go_library(
        "fake_scale.go",
        "fake_statefulset.go",
    ],
+    importpath = "k8s.io/client-go/kubernetes/typed/apps/v1beta1/fake",
    deps = [
        "//vendor/k8s.io/api/apps/v1beta1:go_default_library",
        "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
--- a/kubernetes/typed/apps/v1beta1/fake/doc.go
+++ b/kubernetes/typed/apps/v1beta1/fake/doc.go
@@ -14,7 +14,5 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-// This package is generated by client-gen with custom arguments.
-
 // Package fake has the automatically generated clients.
 package fake
--- a/kubernetes/typed/apps/v1beta2/BUILD
+++ b/kubernetes/typed/apps/v1beta2/BUILD
@@ -18,6 +18,7 @@ go_library(
        "scale.go",
        "statefulset.go",
    ],
+    importpath = "k8s.io/client-go/kubernetes/typed/apps/v1beta2",
    deps = [
        "//vendor/k8s.io/api/apps/v1beta2:go_default_library",
        "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
--- a/kubernetes/typed/apps/v1beta2/doc.go
+++ b/kubernetes/typed/apps/v1beta2/doc.go
@@ -14,7 +14,5 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-// This package is generated by client-gen with custom arguments.
-
 // This package has the automatically generated typed clients.
 package v1beta2
--- a/kubernetes/typed/apps/v1beta2/fake/BUILD
+++ b/kubernetes/typed/apps/v1beta2/fake/BUILD
@@ -17,6 +17,7 @@ go_library(
        "fake_scale.go",
        "fake_statefulset.go",
    ],
+    importpath = "k8s.io/client-go/kubernetes/typed/apps/v1beta2/fake",
    deps = [
        "//vendor/k8s.io/api/apps/v1beta2:go_default_library",
        "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
--- a/kubernetes/typed/apps/v1beta2/fake/doc.go
+++ b/kubernetes/typed/apps/v1beta2/fake/doc.go
@@ -14,7 +14,5 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-// This package is generated by client-gen with custom arguments.
-
 // Package fake has the automatically generated clients.
 package fake
--- a/kubernetes/typed/apps/v1beta2/fake/fake_statefulset.go
+++ b/kubernetes/typed/apps/v1beta2/fake/fake_statefulset.go
@@ -136,3 +136,25 @@ func (c *FakeStatefulSets) Patch(name string, pt types.PatchType, data []byte, s
 	}
 	return obj.(*v1beta2.StatefulSet), err
 }
+
+// GetScale takes name of the statefulSet, and returns the corresponding scale object, and an error if there is any.
+func (c *FakeStatefulSets) GetScale(statefulSetName string, options v1.GetOptions) (result *v1beta2.Scale, err error) {
+	obj, err := c.Fake.
+		Invokes(testing.NewGetSubresourceAction(statefulsetsResource, c.ns, "scale", statefulSetName), &v1beta2.Scale{})
+
+	if obj == nil {
+		return nil, err
+	}
+	return obj.(*v1beta2.Scale), err
+}
+
+// UpdateScale takes the representation of a scale and updates it. Returns the server's representation of the scale, and an error, if there is any.
+func (c *FakeStatefulSets) UpdateScale(statefulSetName string, scale *v1beta2.Scale) (result *v1beta2.Scale, err error) {
+	obj, err := c.Fake.
+		Invokes(testing.NewUpdateSubresourceAction(statefulsetsResource, "scale", c.ns, scale), &v1beta2.Scale{})
+
+	if obj == nil {
+		return nil, err
+	}
+	return obj.(*v1beta2.Scale), err
+}
--- a/kubernetes/typed/apps/v1beta2/statefulset.go
+++ b/kubernetes/typed/apps/v1beta2/statefulset.go
@@ -42,6 +42,9 @@ type StatefulSetInterface interface {
 	List(opts v1.ListOptions) (*v1beta2.StatefulSetList, error)
 	Watch(opts v1.ListOptions) (watch.Interface, error)
 	Patch(name string, pt types.PatchType, data []byte, subresources ...string) (result *v1beta2.StatefulSet, err error)
+	GetScale(statefulSetName string, options v1.GetOptions) (*v1beta2.Scale, error)
+	UpdateScale(statefulSetName string, scale *v1beta2.Scale) (*v1beta2.Scale, error)
+
 	StatefulSetExpansion
 }

@@ -170,3 +173,31 @@ func (c *statefulSets) Patch(name string, pt types.PatchType, data []byte, subre
 		Into(result)
 	return
 }
+
+// GetScale takes name of the statefulSet, and returns the corresponding v1beta2.Scale object, and an error if there is any.
+func (c *statefulSets) GetScale(statefulSetName string, options v1.GetOptions) (result *v1beta2.Scale, err error) {
+	result = &v1beta2.Scale{}
+	err = c.client.Get().
+		Namespace(c.ns).
+		Resource("statefulsets").
+		Name(statefulSetName).
+		SubResource("scale").
+		VersionedParams(&options, scheme.ParameterCodec).
+		Do().
+		Into(result)
+	return
+}
+
+// UpdateScale takes the top resource name and the representation of a scale and updates it. Returns the server's representation of the scale, and an error, if there is any.
+func (c *statefulSets) UpdateScale(statefulSetName string, scale *v1beta2.Scale) (result *v1beta2.Scale, err error) {
+	result = &v1beta2.Scale{}
+	err = c.client.Put().
+		Namespace(c.ns).
+		Resource("statefulsets").
+		Name(statefulSetName).
+		SubResource("scale").
+		Body(scale).
+		Do().
+		Into(result)
+	return
+}
--- a/kubernetes/typed/authentication/v1/BUILD
+++ b/kubernetes/typed/authentication/v1/BUILD
@@ -14,6 +14,7 @@ go_library(
        "tokenreview.go",
        "tokenreview_expansion.go",
    ],
+    importpath = "k8s.io/client-go/kubernetes/typed/authentication/v1",
    deps = [
        "//vendor/k8s.io/api/authentication/v1:go_default_library",
        "//vendor/k8s.io/apimachinery/pkg/runtime/serializer:go_default_library",
--- a/Show More
+++ b/Show More