Merge pull request #61751 from maisem/automated-cherry-pick-of-#59828-upstream-release-1.9

Automatic merge from submit-queue. Automated cherry pick of #59828 upstream release 1.9 Cherry pick of #59828 on release-1.9. #59828 : Fix a race condition in SharedInformer Kubernetes-commit: c996d0406ac15a14937a837ad51b241a7ab6e526
sync: initially remove files BUILD */BUILD BUILD.bazel */BUILD.bazel
2026-06-17 07:15:34 +00:00 · 2018-03-27 23:10:50 +00:00 · 2018-03-15 09:30:20 +00:00 · 2018-02-13 11:33:21 -08:00 · 2018-02-13 11:32:36 -08:00 · 2018-01-03 01:58:15 +00:00
625 changed files with 1377 additions and 5353 deletions
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,2 +1,4 @@
-Sorry, we do not accept changes directly against this repository. Please see 
-CONTRIBUTING.md for information on where and how to contribute instead.
+Sorry, client-go does not accept changes via pull requests at this time. Please
+submit your pull request to the main repository:
+https://github.com/kubernetes/kubernetes.  See the guidance here:
+https://github.com/kubernetes/client-go#contributing-code.
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,111 +2,6 @@ TODO: This document was manually maintained so might be incomplete. The
 automation effort is tracked in
 https://github.com/kubernetes/client-go/issues/234.

-Changes in `k8s.io/api` and `k8s.io/apimachinery` are mentioned here
-because `k8s.io/client-go` depends on them.
-
-# v6.0.0
-
-**Breaking Changes:**
-
-* If you upgrade your client-go libs and use the `AppsV1() or Apps()` interface, please note that the default garbage collection behavior is changed.
-
-    * [https://github.com/kubernetes/kubernetes/pull/55148](https://github.com/kubernetes/kubernetes/pull/55148)
-
-* Swagger 1.2 retriever `DiscoveryClient.SwaggerSchema` was removed from the discovery client
-
-    * [https://github.com/kubernetes/kubernetes/pull/53441](https://github.com/kubernetes/kubernetes/pull/53441)
-
-* Informers got a NewFilteredSharedInformerFactory to e.g. filter by namespace
-
-    * [https://github.com/kubernetes/kubernetes/pull/54660](https://github.com/kubernetes/kubernetes/pull/54660)
-
-* [k8s.io/api] The dynamic admission webhook is split into two kinds, mutating and validating. 
-The kinds have changed completely and old code must be ported to `admissionregistration.k8s.io/v1beta1` - 
-`MutatingWebhookConfiguration` and `ValidatingWebhookConfiguration`
-
-    * [https://github.com/kubernetes/kubernetes/pull/55282](https://github.com/kubernetes/kubernetes/pull/55282)
-
-* [k8s.io/api] Renamed `core/v1.ScaleIOVolumeSource` to `ScaleIOPersistentVolumeSource`
-
-    * [https://github.com/kubernetes/kubernetes/pull/54013](https://github.com/kubernetes/kubernetes/pull/54013)
-
-* [k8s.io/api] Renamed `core/v1.RBDVolumeSource` to `RBDPersistentVolumeSource`
-
-    * [https://github.com/kubernetes/kubernetes/pull/54302](https://github.com/kubernetes/kubernetes/pull/54302)
-
-* [k8s.io/api] Removed `core/v1.CreatedByAnnotation`
-
-    * [https://github.com/kubernetes/kubernetes/pull/54445](https://github.com/kubernetes/kubernetes/pull/54445)
-
-* [k8s.io/api] Renamed `core/v1.StorageMediumHugepages` to `StorageMediumHugePages`
-
-    * [https://github.com/kubernetes/kubernetes/pull/54748](https://github.com/kubernetes/kubernetes/pull/54748)
-
-* [k8s.io/api] `core/v1.Taint.TimeAdded` became a pointer
-
-   * [https://github.com/kubernetes/kubernetes/pull/43016](https://github.com/kubernetes/kubernetes/pull/43016)
-
-* [k8s.io/api] `core/v1.DefaultHardPodAffinitySymmetricWeight` type changed from int to int32
-
-    * [https://github.com/kubernetes/kubernetes/pull/53850](https://github.com/kubernetes/kubernetes/pull/53850)
-
-* [k8s.io/apimachinery] `ObjectCopier` interface was removed (requires switch to new generators with DeepCopy methods)
-
-    * [https://github.com/kubernetes/kubernetes/pull/53525](https://github.com/kubernetes/kubernetes/pull/53525)
-
-**New Features:**
-
-* Certificate manager was moved from kubelet to `k8s.io/client-go/util/certificates`
-
-   * [https://github.com/kubernetes/kubernetes/pull/49654](https://github.com/kubernetes/kubernetes/pull/49654)
-
-* [k8s.io/api] Workloads api types are promoted to `apps/v1` version
-
-    * [https://github.com/kubernetes/kubernetes/pull/53679](https://github.com/kubernetes/kubernetes/pull/53679)
-
-* [k8s.io/api] Added `storage.k8s.io/v1alpha1` API group
-
-    * [https://github.com/kubernetes/kubernetes/pull/54463](https://github.com/kubernetes/kubernetes/pull/54463)
-
-* [k8s.io/api] Added support for conditions in StatefulSet status
-
-    * [https://github.com/kubernetes/kubernetes/pull/55268](https://github.com/kubernetes/kubernetes/pull/55268)
-
-* [k8s.io/api] Added support for conditions in DaemonSet status
-
-    * [https://github.com/kubernetes/kubernetes/pull/55272](https://github.com/kubernetes/kubernetes/pull/55272)
-
-* [k8s.io/apimachinery] Added polymorphic scale client in `k8s.io/client-go/scale`, which supports scaling of resources in arbitrary API groups
-
-    * [https://github.com/kubernetes/kubernetes/pull/53743](https://github.com/kubernetes/kubernetes/pull/53743)
-
-* [k8s.io/apimachinery] `meta.MetadataAccessor` got API chunking support
-
-    * [https://github.com/kubernetes/kubernetes/pull/53768](https://github.com/kubernetes/kubernetes/pull/53768)
-
-* [k8s.io/apimachinery] `unstructured.Unstructured` got getters and setters
-
-    * [https://github.com/kubernetes/kubernetes/pull/51940](https://github.com/kubernetes/kubernetes/pull/51940)
-
-**Bug fixes and Improvements:**
-
-* The body in glog output is not truncated with log level 10
-
-    * [https://github.com/kubernetes/kubernetes/pull/54801](https://github.com/kubernetes/kubernetes/pull/54801)
-
-* [k8s.io/api] Unset `creationTimestamp` field is output as null if encoded from an unstructured object
-
-    * [https://github.com/kubernetes/kubernetes/pull/53464](https://github.com/kubernetes/kubernetes/pull/53464)
-
-* [k8s.io/apimachinery] Redirect behavior is restored for proxy subresources
-
-    * [https://github.com/kubernetes/kubernetes/pull/52933](https://github.com/kubernetes/kubernetes/pull/52933)
-
-* [k8s.io/apimachinery] Random string generation functions are optimized
-
-    * [https://github.com/kubernetes/kubernetes/pull/53720](https://github.com/kubernetes/kubernetes/pull/53720)
-
 # v5.0.1

 Bug fix: picked up a security fix [kubernetes/kubernetes#53443](https://github.com/kubernetes/kubernetes/pull/53443) for `PodSecurityPolicy`.
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,7 +0,0 @@
-# Contributing guidelines
-
-Do not open pull requests directly against this repository, they will be ignored. Instead, please open pull requests against [kubernetes/kubernetes](https://git.k8s.io/kubernetes/).  Please follow the same [contributing guide](https://git.k8s.io/kubernetes/CONTRIBUTING.md) you would follow for any other pull request made to kubernetes/kubernetes.
-
-This repository is published from [kubernetes/kubernetes/staging/src/k8s.io/client-go](https://git.k8s.io/kubernetes/staging/src/k8s.io/client-go) by the [kubernetes publishing-bot](https://git.k8s.io/publishing-bot). 
-
-Please see [Staging Directory and Publishing](https://git.k8s.io/community/contributors/devel/staging.md) for more information
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -1,7 +1,7 @@
 {
 	"ImportPath": "k8s.io/client-go",
 	"GoVersion": "go1.9",
-	"GodepVersion": "v80",
+	"GodepVersion": "v79",
 	"Packages": [
 		"./..."
 	],
@@ -16,19 +16,59 @@
 		},
 		{
 			"ImportPath": "github.com/Azure/go-autorest/autorest",
-			"Rev": "d4e6b95c12a08b4de2d48b45d5b4d594e5d32fab"
+			"Rev": "e14a70c556c8e0db173358d1a903dca345a8e75e"
 		},
 		{
 			"ImportPath": "github.com/Azure/go-autorest/autorest/adal",
-			"Rev": "d4e6b95c12a08b4de2d48b45d5b4d594e5d32fab"
+			"Rev": "e14a70c556c8e0db173358d1a903dca345a8e75e"
 		},
 		{
 			"ImportPath": "github.com/Azure/go-autorest/autorest/azure",
-			"Rev": "d4e6b95c12a08b4de2d48b45d5b4d594e5d32fab"
+			"Rev": "e14a70c556c8e0db173358d1a903dca345a8e75e"
 		},
 		{
 			"ImportPath": "github.com/Azure/go-autorest/autorest/date",
-			"Rev": "d4e6b95c12a08b4de2d48b45d5b4d594e5d32fab"
+			"Rev": "e14a70c556c8e0db173358d1a903dca345a8e75e"
+		},
+		{
+			"ImportPath": "github.com/PuerkitoBio/purell",
+			"Rev": "8a290539e2e8629dbc4e6bad948158f790ec31f4"
+		},
+		{
+			"ImportPath": "github.com/PuerkitoBio/urlesc",
+			"Rev": "5bd2802263f21d8788851d5305584c82a5c75d7e"
+		},
+		{
+			"ImportPath": "github.com/coreos/go-oidc/http",
+			"Rev": "a4973d9a4225417aecf5d450a9522f00c1f7130f"
+		},
+		{
+			"ImportPath": "github.com/coreos/go-oidc/jose",
+			"Rev": "a4973d9a4225417aecf5d450a9522f00c1f7130f"
+		},
+		{
+			"ImportPath": "github.com/coreos/go-oidc/key",
+			"Rev": "a4973d9a4225417aecf5d450a9522f00c1f7130f"
+		},
+		{
+			"ImportPath": "github.com/coreos/go-oidc/oauth2",
+			"Rev": "a4973d9a4225417aecf5d450a9522f00c1f7130f"
+		},
+		{
+			"ImportPath": "github.com/coreos/go-oidc/oidc",
+			"Rev": "a4973d9a4225417aecf5d450a9522f00c1f7130f"
+		},
+		{
+			"ImportPath": "github.com/coreos/pkg/health",
+			"Rev": "fa29b1d70f0beaddd4c7021607cc3c3be8ce94b8"
+		},
+		{
+			"ImportPath": "github.com/coreos/pkg/httputil",
+			"Rev": "fa29b1d70f0beaddd4c7021607cc3c3be8ce94b8"
+		},
+		{
+			"ImportPath": "github.com/coreos/pkg/timeutil",
+			"Rev": "fa29b1d70f0beaddd4c7021607cc3c3be8ce94b8"
 		},
 		{
 			"ImportPath": "github.com/davecgh/go-spew/spew",
@@ -46,10 +86,34 @@
 			"ImportPath": "github.com/docker/spdystream/spdy",
 			"Rev": "449fdfce4d962303d702fec724ef0ad181c92528"
 		},
+		{
+			"ImportPath": "github.com/emicklei/go-restful",
+			"Rev": "ff4f55a206334ef123e4f79bbf348980da81ca46"
+		},
+		{
+			"ImportPath": "github.com/emicklei/go-restful/log",
+			"Rev": "ff4f55a206334ef123e4f79bbf348980da81ca46"
+		},
 		{
 			"ImportPath": "github.com/ghodss/yaml",
 			"Rev": "73d445a93680fa1a78ae23a5839bad48f32ba1ee"
 		},
+		{
+			"ImportPath": "github.com/go-openapi/jsonpointer",
+			"Rev": "46af16f9f7b149af66e5d1bd010e3574dc06de98"
+		},
+		{
+			"ImportPath": "github.com/go-openapi/jsonreference",
+			"Rev": "13c6e3589ad90f49bd3e3bbe2c2cb3d7a4142272"
+		},
+		{
+			"ImportPath": "github.com/go-openapi/spec",
+			"Rev": "7abd5745472fff5eb3685386d5fb8bf38683154d"
+		},
+		{
+			"ImportPath": "github.com/go-openapi/swag",
+			"Rev": "f3f9494671f93fcff853e3c6e9e948b3eb71e590"
+		},
 		{
 			"ImportPath": "github.com/gogo/protobuf/proto",
 			"Rev": "c0656edd0d9eab7c66d1eb0c568f9039345796f7"
@@ -86,6 +150,10 @@
 			"ImportPath": "github.com/golang/protobuf/ptypes/timestamp",
 			"Rev": "1643683e1b54a9e88ad26d98f81400c8c9d9f4f9"
 		},
+		{
+			"ImportPath": "github.com/google/btree",
+			"Rev": "7d79101e329e5a3adf994758c578dab82b90c017"
+		},
 		{
 			"ImportPath": "github.com/google/gofuzz",
 			"Rev": "44d81051d367757e1c7c6a5a86423ece9afcf63c"
@@ -104,31 +172,39 @@
 		},
 		{
 			"ImportPath": "github.com/gophercloud/gophercloud",
-			"Rev": "6da026c32e2d622cc242d32984259c77237aefe1"
+			"Rev": "8183543f90d1aef267a5ecc209f2e0715b355acb"
 		},
 		{
 			"ImportPath": "github.com/gophercloud/gophercloud/openstack",
-			"Rev": "6da026c32e2d622cc242d32984259c77237aefe1"
+			"Rev": "8183543f90d1aef267a5ecc209f2e0715b355acb"
 		},
 		{
 			"ImportPath": "github.com/gophercloud/gophercloud/openstack/identity/v2/tenants",
-			"Rev": "6da026c32e2d622cc242d32984259c77237aefe1"
+			"Rev": "8183543f90d1aef267a5ecc209f2e0715b355acb"
 		},
 		{
 			"ImportPath": "github.com/gophercloud/gophercloud/openstack/identity/v2/tokens",
-			"Rev": "6da026c32e2d622cc242d32984259c77237aefe1"
+			"Rev": "8183543f90d1aef267a5ecc209f2e0715b355acb"
 		},
 		{
 			"ImportPath": "github.com/gophercloud/gophercloud/openstack/identity/v3/tokens",
-			"Rev": "6da026c32e2d622cc242d32984259c77237aefe1"
+			"Rev": "8183543f90d1aef267a5ecc209f2e0715b355acb"
 		},
 		{
 			"ImportPath": "github.com/gophercloud/gophercloud/openstack/utils",
-			"Rev": "6da026c32e2d622cc242d32984259c77237aefe1"
+			"Rev": "8183543f90d1aef267a5ecc209f2e0715b355acb"
 		},
 		{
 			"ImportPath": "github.com/gophercloud/gophercloud/pagination",
-			"Rev": "6da026c32e2d622cc242d32984259c77237aefe1"
+			"Rev": "8183543f90d1aef267a5ecc209f2e0715b355acb"
+		},
+		{
+			"ImportPath": "github.com/gregjones/httpcache",
+			"Rev": "787624de3eb7bd915c329cba748687a3b22666a6"
+		},
+		{
+			"ImportPath": "github.com/gregjones/httpcache/diskcache",
+			"Rev": "787624de3eb7bd915c329cba748687a3b22666a6"
 		},
 		{
 			"ImportPath": "github.com/hashicorp/golang-lru",
@@ -146,9 +222,33 @@
 			"ImportPath": "github.com/imdario/mergo",
 			"Rev": "6633656539c1639d9d78127b7d47c622b5d7b6dc"
 		},
+		{
+			"ImportPath": "github.com/jonboulle/clockwork",
+			"Rev": "72f9bd7c4e0c2a40055ab3d0f09654f730cce982"
+		},
 		{
 			"ImportPath": "github.com/json-iterator/go",
-			"Rev": "13f86432b882000a51c6e610c620974462691a97"
+			"Rev": "36b14963da70d11297d313183d7e6388c8510e1e"
+		},
+		{
+			"ImportPath": "github.com/juju/ratelimit",
+			"Rev": "5b9ff866471762aa2ab2dced63c9fb6f53921342"
+		},
+		{
+			"ImportPath": "github.com/mailru/easyjson/buffer",
+			"Rev": "2f5df55504ebc322e4d52d34df6a1f5b503bf26d"
+		},
+		{
+			"ImportPath": "github.com/mailru/easyjson/jlexer",
+			"Rev": "2f5df55504ebc322e4d52d34df6a1f5b503bf26d"
+		},
+		{
+			"ImportPath": "github.com/mailru/easyjson/jwriter",
+			"Rev": "2f5df55504ebc322e4d52d34df6a1f5b503bf26d"
+		},
+		{
+			"ImportPath": "github.com/peterbourgon/diskv",
+			"Rev": "5f041e8faa004a95c88a202771f4cc3e991971e6"
 		},
 		{
 			"ImportPath": "github.com/pmezard/go-difflib/difflib",
@@ -156,7 +256,7 @@
 		},
 		{
 			"ImportPath": "github.com/spf13/pflag",
-			"Rev": "583c0c0531f06d5278b7d917446061adc344b5cd"
+			"Rev": "9ff6c6923cfffbcd502984b8e0c80539a94968b7"
 		},
 		{
 			"ImportPath": "github.com/stretchr/testify/assert",
@@ -218,10 +318,34 @@
 			"ImportPath": "golang.org/x/sys/windows",
 			"Rev": "95c6576299259db960f6c5b9b69ea52422860fce"
 		},
+		{
+			"ImportPath": "golang.org/x/text/cases",
+			"Rev": "b19bf474d317b857955b12035d2c5acb57ce8b01"
+		},
+		{
+			"ImportPath": "golang.org/x/text/internal",
+			"Rev": "b19bf474d317b857955b12035d2c5acb57ce8b01"
+		},
+		{
+			"ImportPath": "golang.org/x/text/internal/tag",
+			"Rev": "b19bf474d317b857955b12035d2c5acb57ce8b01"
+		},
+		{
+			"ImportPath": "golang.org/x/text/language",
+			"Rev": "b19bf474d317b857955b12035d2c5acb57ce8b01"
+		},
+		{
+			"ImportPath": "golang.org/x/text/runes",
+			"Rev": "b19bf474d317b857955b12035d2c5acb57ce8b01"
+		},
 		{
 			"ImportPath": "golang.org/x/text/secure/bidirule",
 			"Rev": "b19bf474d317b857955b12035d2c5acb57ce8b01"
 		},
+		{
+			"ImportPath": "golang.org/x/text/secure/precis",
+			"Rev": "b19bf474d317b857955b12035d2c5acb57ce8b01"
+		},
 		{
 			"ImportPath": "golang.org/x/text/transform",
 			"Rev": "b19bf474d317b857955b12035d2c5acb57ce8b01"
@@ -235,8 +359,8 @@
 			"Rev": "b19bf474d317b857955b12035d2c5acb57ce8b01"
 		},
 		{
-			"ImportPath": "golang.org/x/time/rate",
-			"Rev": "f51c12702a4d776e4c1fa9b0fabab841babae631"
+			"ImportPath": "golang.org/x/text/width",
+			"Rev": "b19bf474d317b857955b12035d2c5acb57ce8b01"
 		},
 		{
 			"ImportPath": "gopkg.in/inf.v0",
@@ -244,339 +368,343 @@
 		},
 		{
 			"ImportPath": "gopkg.in/yaml.v2",
-			"Rev": "670d4cfef0544295bc27a114dbac37980d83185a"
+			"Rev": "53feefa2559fb8dfa8d81baad31be332c97d6c77"
 		},
 		{
 			"ImportPath": "k8s.io/api/admissionregistration/v1alpha1",
-			"Rev": "8b7507fac302640dd5f1efbf9643199952cc58db"
+			"Rev": "acf347b865f29325eb61f4cd2df11e86e073a5ee"
 		},
 		{
 			"ImportPath": "k8s.io/api/admissionregistration/v1beta1",
-			"Rev": "8b7507fac302640dd5f1efbf9643199952cc58db"
+			"Rev": "acf347b865f29325eb61f4cd2df11e86e073a5ee"
 		},
 		{
 			"ImportPath": "k8s.io/api/apps/v1",
-			"Rev": "8b7507fac302640dd5f1efbf9643199952cc58db"
+			"Rev": "acf347b865f29325eb61f4cd2df11e86e073a5ee"
 		},
 		{
 			"ImportPath": "k8s.io/api/apps/v1beta1",
-			"Rev": "8b7507fac302640dd5f1efbf9643199952cc58db"
+			"Rev": "acf347b865f29325eb61f4cd2df11e86e073a5ee"
 		},
 		{
 			"ImportPath": "k8s.io/api/apps/v1beta2",
-			"Rev": "8b7507fac302640dd5f1efbf9643199952cc58db"
+			"Rev": "acf347b865f29325eb61f4cd2df11e86e073a5ee"
 		},
 		{
 			"ImportPath": "k8s.io/api/authentication/v1",
-			"Rev": "8b7507fac302640dd5f1efbf9643199952cc58db"
+			"Rev": "acf347b865f29325eb61f4cd2df11e86e073a5ee"
 		},
 		{
 			"ImportPath": "k8s.io/api/authentication/v1beta1",
-			"Rev": "8b7507fac302640dd5f1efbf9643199952cc58db"
+			"Rev": "acf347b865f29325eb61f4cd2df11e86e073a5ee"
 		},
 		{
 			"ImportPath": "k8s.io/api/authorization/v1",
-			"Rev": "8b7507fac302640dd5f1efbf9643199952cc58db"
+			"Rev": "acf347b865f29325eb61f4cd2df11e86e073a5ee"
 		},
 		{
 			"ImportPath": "k8s.io/api/authorization/v1beta1",
-			"Rev": "8b7507fac302640dd5f1efbf9643199952cc58db"
+			"Rev": "acf347b865f29325eb61f4cd2df11e86e073a5ee"
 		},
 		{
 			"ImportPath": "k8s.io/api/autoscaling/v1",
-			"Rev": "8b7507fac302640dd5f1efbf9643199952cc58db"
+			"Rev": "acf347b865f29325eb61f4cd2df11e86e073a5ee"
 		},
 		{
 			"ImportPath": "k8s.io/api/autoscaling/v2beta1",
-			"Rev": "8b7507fac302640dd5f1efbf9643199952cc58db"
+			"Rev": "acf347b865f29325eb61f4cd2df11e86e073a5ee"
 		},
 		{
 			"ImportPath": "k8s.io/api/batch/v1",
-			"Rev": "8b7507fac302640dd5f1efbf9643199952cc58db"
+			"Rev": "acf347b865f29325eb61f4cd2df11e86e073a5ee"
 		},
 		{
 			"ImportPath": "k8s.io/api/batch/v1beta1",
-			"Rev": "8b7507fac302640dd5f1efbf9643199952cc58db"
+			"Rev": "acf347b865f29325eb61f4cd2df11e86e073a5ee"
 		},
 		{
 			"ImportPath": "k8s.io/api/batch/v2alpha1",
-			"Rev": "8b7507fac302640dd5f1efbf9643199952cc58db"
+			"Rev": "acf347b865f29325eb61f4cd2df11e86e073a5ee"
 		},
 		{
 			"ImportPath": "k8s.io/api/certificates/v1beta1",
-			"Rev": "8b7507fac302640dd5f1efbf9643199952cc58db"
+			"Rev": "acf347b865f29325eb61f4cd2df11e86e073a5ee"
 		},
 		{
 			"ImportPath": "k8s.io/api/core/v1",
-			"Rev": "8b7507fac302640dd5f1efbf9643199952cc58db"
+			"Rev": "acf347b865f29325eb61f4cd2df11e86e073a5ee"
 		},
 		{
 			"ImportPath": "k8s.io/api/events/v1beta1",
-			"Rev": "8b7507fac302640dd5f1efbf9643199952cc58db"
+			"Rev": "acf347b865f29325eb61f4cd2df11e86e073a5ee"
 		},
 		{
 			"ImportPath": "k8s.io/api/extensions/v1beta1",
-			"Rev": "8b7507fac302640dd5f1efbf9643199952cc58db"
+			"Rev": "acf347b865f29325eb61f4cd2df11e86e073a5ee"
 		},
 		{
 			"ImportPath": "k8s.io/api/imagepolicy/v1alpha1",
-			"Rev": "8b7507fac302640dd5f1efbf9643199952cc58db"
+			"Rev": "acf347b865f29325eb61f4cd2df11e86e073a5ee"
 		},
 		{
 			"ImportPath": "k8s.io/api/networking/v1",
-			"Rev": "8b7507fac302640dd5f1efbf9643199952cc58db"
+			"Rev": "acf347b865f29325eb61f4cd2df11e86e073a5ee"
 		},
 		{
 			"ImportPath": "k8s.io/api/policy/v1beta1",
-			"Rev": "8b7507fac302640dd5f1efbf9643199952cc58db"
+			"Rev": "acf347b865f29325eb61f4cd2df11e86e073a5ee"
 		},
 		{
 			"ImportPath": "k8s.io/api/rbac/v1",
-			"Rev": "8b7507fac302640dd5f1efbf9643199952cc58db"
+			"Rev": "acf347b865f29325eb61f4cd2df11e86e073a5ee"
 		},
 		{
 			"ImportPath": "k8s.io/api/rbac/v1alpha1",
-			"Rev": "8b7507fac302640dd5f1efbf9643199952cc58db"
+			"Rev": "acf347b865f29325eb61f4cd2df11e86e073a5ee"
 		},
 		{
 			"ImportPath": "k8s.io/api/rbac/v1beta1",
-			"Rev": "8b7507fac302640dd5f1efbf9643199952cc58db"
+			"Rev": "acf347b865f29325eb61f4cd2df11e86e073a5ee"
 		},
 		{
 			"ImportPath": "k8s.io/api/scheduling/v1alpha1",
-			"Rev": "8b7507fac302640dd5f1efbf9643199952cc58db"
+			"Rev": "acf347b865f29325eb61f4cd2df11e86e073a5ee"
 		},
 		{
 			"ImportPath": "k8s.io/api/settings/v1alpha1",
-			"Rev": "8b7507fac302640dd5f1efbf9643199952cc58db"
+			"Rev": "acf347b865f29325eb61f4cd2df11e86e073a5ee"
 		},
 		{
 			"ImportPath": "k8s.io/api/storage/v1",
-			"Rev": "8b7507fac302640dd5f1efbf9643199952cc58db"
+			"Rev": "acf347b865f29325eb61f4cd2df11e86e073a5ee"
 		},
 		{
 			"ImportPath": "k8s.io/api/storage/v1alpha1",
-			"Rev": "8b7507fac302640dd5f1efbf9643199952cc58db"
+			"Rev": "acf347b865f29325eb61f4cd2df11e86e073a5ee"
 		},
 		{
 			"ImportPath": "k8s.io/api/storage/v1beta1",
-			"Rev": "8b7507fac302640dd5f1efbf9643199952cc58db"
+			"Rev": "acf347b865f29325eb61f4cd2df11e86e073a5ee"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/equality",
-			"Rev": "17529ec7eadb8de8e7dc835201455f53571f655a"
+			"Rev": "19e3f5aa3adca672c153d324e6b7d82ff8935f03"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/errors",
-			"Rev": "17529ec7eadb8de8e7dc835201455f53571f655a"
+			"Rev": "19e3f5aa3adca672c153d324e6b7d82ff8935f03"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/meta",
-			"Rev": "17529ec7eadb8de8e7dc835201455f53571f655a"
+			"Rev": "19e3f5aa3adca672c153d324e6b7d82ff8935f03"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/resource",
-			"Rev": "17529ec7eadb8de8e7dc835201455f53571f655a"
+			"Rev": "19e3f5aa3adca672c153d324e6b7d82ff8935f03"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/testing",
-			"Rev": "17529ec7eadb8de8e7dc835201455f53571f655a"
+			"Rev": "19e3f5aa3adca672c153d324e6b7d82ff8935f03"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/testing/fuzzer",
-			"Rev": "17529ec7eadb8de8e7dc835201455f53571f655a"
+			"Rev": "19e3f5aa3adca672c153d324e6b7d82ff8935f03"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/testing/roundtrip",
-			"Rev": "17529ec7eadb8de8e7dc835201455f53571f655a"
+			"Rev": "19e3f5aa3adca672c153d324e6b7d82ff8935f03"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apimachinery",
-			"Rev": "17529ec7eadb8de8e7dc835201455f53571f655a"
+			"Rev": "19e3f5aa3adca672c153d324e6b7d82ff8935f03"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apimachinery/announced",
-			"Rev": "17529ec7eadb8de8e7dc835201455f53571f655a"
+			"Rev": "19e3f5aa3adca672c153d324e6b7d82ff8935f03"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apimachinery/registered",
-			"Rev": "17529ec7eadb8de8e7dc835201455f53571f655a"
+			"Rev": "19e3f5aa3adca672c153d324e6b7d82ff8935f03"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/fuzzer",
-			"Rev": "17529ec7eadb8de8e7dc835201455f53571f655a"
+			"Rev": "19e3f5aa3adca672c153d324e6b7d82ff8935f03"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/internalversion",
-			"Rev": "17529ec7eadb8de8e7dc835201455f53571f655a"
+			"Rev": "19e3f5aa3adca672c153d324e6b7d82ff8935f03"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1",
-			"Rev": "17529ec7eadb8de8e7dc835201455f53571f655a"
+			"Rev": "19e3f5aa3adca672c153d324e6b7d82ff8935f03"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured",
-			"Rev": "17529ec7eadb8de8e7dc835201455f53571f655a"
+			"Rev": "19e3f5aa3adca672c153d324e6b7d82ff8935f03"
 		},
 		{
-			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1beta1",
-			"Rev": "17529ec7eadb8de8e7dc835201455f53571f655a"
+			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1alpha1",
+			"Rev": "19e3f5aa3adca672c153d324e6b7d82ff8935f03"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/conversion",
-			"Rev": "17529ec7eadb8de8e7dc835201455f53571f655a"
+			"Rev": "19e3f5aa3adca672c153d324e6b7d82ff8935f03"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/conversion/queryparams",
-			"Rev": "17529ec7eadb8de8e7dc835201455f53571f655a"
+			"Rev": "19e3f5aa3adca672c153d324e6b7d82ff8935f03"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/fields",
-			"Rev": "17529ec7eadb8de8e7dc835201455f53571f655a"
+			"Rev": "19e3f5aa3adca672c153d324e6b7d82ff8935f03"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/labels",
-			"Rev": "17529ec7eadb8de8e7dc835201455f53571f655a"
+			"Rev": "19e3f5aa3adca672c153d324e6b7d82ff8935f03"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime",
-			"Rev": "17529ec7eadb8de8e7dc835201455f53571f655a"
+			"Rev": "19e3f5aa3adca672c153d324e6b7d82ff8935f03"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/schema",
-			"Rev": "17529ec7eadb8de8e7dc835201455f53571f655a"
+			"Rev": "19e3f5aa3adca672c153d324e6b7d82ff8935f03"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer",
-			"Rev": "17529ec7eadb8de8e7dc835201455f53571f655a"
+			"Rev": "19e3f5aa3adca672c153d324e6b7d82ff8935f03"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/json",
-			"Rev": "17529ec7eadb8de8e7dc835201455f53571f655a"
+			"Rev": "19e3f5aa3adca672c153d324e6b7d82ff8935f03"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/protobuf",
-			"Rev": "17529ec7eadb8de8e7dc835201455f53571f655a"
+			"Rev": "19e3f5aa3adca672c153d324e6b7d82ff8935f03"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/recognizer",
-			"Rev": "17529ec7eadb8de8e7dc835201455f53571f655a"
+			"Rev": "19e3f5aa3adca672c153d324e6b7d82ff8935f03"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/streaming",
-			"Rev": "17529ec7eadb8de8e7dc835201455f53571f655a"
+			"Rev": "19e3f5aa3adca672c153d324e6b7d82ff8935f03"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/versioning",
-			"Rev": "17529ec7eadb8de8e7dc835201455f53571f655a"
+			"Rev": "19e3f5aa3adca672c153d324e6b7d82ff8935f03"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/selection",
-			"Rev": "17529ec7eadb8de8e7dc835201455f53571f655a"
+			"Rev": "19e3f5aa3adca672c153d324e6b7d82ff8935f03"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/types",
-			"Rev": "17529ec7eadb8de8e7dc835201455f53571f655a"
+			"Rev": "19e3f5aa3adca672c153d324e6b7d82ff8935f03"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/cache",
-			"Rev": "17529ec7eadb8de8e7dc835201455f53571f655a"
+			"Rev": "19e3f5aa3adca672c153d324e6b7d82ff8935f03"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/clock",
-			"Rev": "17529ec7eadb8de8e7dc835201455f53571f655a"
+			"Rev": "19e3f5aa3adca672c153d324e6b7d82ff8935f03"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/diff",
-			"Rev": "17529ec7eadb8de8e7dc835201455f53571f655a"
+			"Rev": "19e3f5aa3adca672c153d324e6b7d82ff8935f03"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/errors",
-			"Rev": "17529ec7eadb8de8e7dc835201455f53571f655a"
+			"Rev": "19e3f5aa3adca672c153d324e6b7d82ff8935f03"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/framer",
-			"Rev": "17529ec7eadb8de8e7dc835201455f53571f655a"
+			"Rev": "19e3f5aa3adca672c153d324e6b7d82ff8935f03"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream",
-			"Rev": "17529ec7eadb8de8e7dc835201455f53571f655a"
+			"Rev": "19e3f5aa3adca672c153d324e6b7d82ff8935f03"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream/spdy",
-			"Rev": "17529ec7eadb8de8e7dc835201455f53571f655a"
+			"Rev": "19e3f5aa3adca672c153d324e6b7d82ff8935f03"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/intstr",
-			"Rev": "17529ec7eadb8de8e7dc835201455f53571f655a"
+			"Rev": "19e3f5aa3adca672c153d324e6b7d82ff8935f03"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/json",
-			"Rev": "17529ec7eadb8de8e7dc835201455f53571f655a"
+			"Rev": "19e3f5aa3adca672c153d324e6b7d82ff8935f03"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/mergepatch",
-			"Rev": "17529ec7eadb8de8e7dc835201455f53571f655a"
+			"Rev": "19e3f5aa3adca672c153d324e6b7d82ff8935f03"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/net",
-			"Rev": "17529ec7eadb8de8e7dc835201455f53571f655a"
+			"Rev": "19e3f5aa3adca672c153d324e6b7d82ff8935f03"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/remotecommand",
-			"Rev": "17529ec7eadb8de8e7dc835201455f53571f655a"
+			"Rev": "19e3f5aa3adca672c153d324e6b7d82ff8935f03"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/runtime",
-			"Rev": "17529ec7eadb8de8e7dc835201455f53571f655a"
+			"Rev": "19e3f5aa3adca672c153d324e6b7d82ff8935f03"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/sets",
-			"Rev": "17529ec7eadb8de8e7dc835201455f53571f655a"
+			"Rev": "19e3f5aa3adca672c153d324e6b7d82ff8935f03"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/strategicpatch",
-			"Rev": "17529ec7eadb8de8e7dc835201455f53571f655a"
+			"Rev": "19e3f5aa3adca672c153d324e6b7d82ff8935f03"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/validation",
-			"Rev": "17529ec7eadb8de8e7dc835201455f53571f655a"
+			"Rev": "19e3f5aa3adca672c153d324e6b7d82ff8935f03"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/validation/field",
-			"Rev": "17529ec7eadb8de8e7dc835201455f53571f655a"
+			"Rev": "19e3f5aa3adca672c153d324e6b7d82ff8935f03"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/wait",
-			"Rev": "17529ec7eadb8de8e7dc835201455f53571f655a"
+			"Rev": "19e3f5aa3adca672c153d324e6b7d82ff8935f03"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/yaml",
-			"Rev": "17529ec7eadb8de8e7dc835201455f53571f655a"
+			"Rev": "19e3f5aa3adca672c153d324e6b7d82ff8935f03"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/version",
-			"Rev": "17529ec7eadb8de8e7dc835201455f53571f655a"
+			"Rev": "19e3f5aa3adca672c153d324e6b7d82ff8935f03"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/watch",
-			"Rev": "17529ec7eadb8de8e7dc835201455f53571f655a"
+			"Rev": "19e3f5aa3adca672c153d324e6b7d82ff8935f03"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/json",
-			"Rev": "17529ec7eadb8de8e7dc835201455f53571f655a"
+			"Rev": "19e3f5aa3adca672c153d324e6b7d82ff8935f03"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/netutil",
-			"Rev": "17529ec7eadb8de8e7dc835201455f53571f655a"
+			"Rev": "19e3f5aa3adca672c153d324e6b7d82ff8935f03"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect",
-			"Rev": "17529ec7eadb8de8e7dc835201455f53571f655a"
+			"Rev": "19e3f5aa3adca672c153d324e6b7d82ff8935f03"
+		},
+		{
+			"ImportPath": "k8s.io/kube-openapi/pkg/common",
+			"Rev": "39a7bf85c140f972372c2a0d1ee40adbf0c8bfe1"
 		},
 		{
 			"ImportPath": "k8s.io/kube-openapi/pkg/util/proto",
-			"Rev": "39cb288412c48cb533ba4be5d6c28620b9a0c1b4"
+			"Rev": "39a7bf85c140f972372c2a0d1ee40adbf0c8bfe1"
 		}
 	]
 }
--- a/Godeps/OWNERS
+++ b/Godeps/OWNERS
@@ -1,2 +0,0 @@
-approvers:
- dep-approvers
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -63,7 +63,7 @@ To install `client-go` and place its dependencies in your `$GOPATH`:
 ```sh
 go get k8s.io/client-go/...
 cd $GOPATH/src/k8s.io/client-go
-git checkout v6.0.0
+git checkout v2.0.0
 # cd 1.5 # only necessary with 1.5 and 1.4 clients.
 godep restore ./...
 ```
@@ -99,7 +99,7 @@ your project:
 package: ( your project's import path ) # e.g. github.com/foo/bar
 import:
 - package: k8s.io/client-go
-  version: v6.0.0
+  version: v2.0.0
 ```

 Second, add a Go file that imports `client-go` somewhere in your project,
@@ -132,7 +132,7 @@ requests can override the version manually in `glide.yaml`. For example:
 package: ( your project's import path ) # e.g. github.com/foo/bar
 import:
 - package: k8s.io/client-go
-  version: v6.0.0
+  version: v2.0.0
 # Use a newer version of go-spew even though client-go wants an old one.
 - package: github.com/davecgh/go-spew
  version: v1.1.0
--- a/README.md
+++ b/README.md
@@ -2,22 +2,12 @@

 Go clients for talking to a [kubernetes](http://kubernetes.io/) cluster.

-We currently recommend using the v6.0.0 tag. See [INSTALL.md](/INSTALL.md) for
+We currently recommend using the v4.0.0 tag. See [INSTALL.md](/INSTALL.md) for
 detailed installation instructions. `go get k8s.io/client-go/...` works, but
 will give you head and doesn't handle the dependencies well.

-[![BuildStatus Widget]][BuildStatus Result]
-[![GoReport Widget]][GoReport Status]
-[![GoDocWidget]][GoDocReference]
-
-[BuildStatus Result]: https://travis-ci.org/kubernetes/client-go
-[BuildStatus Widget]: https://travis-ci.org/kubernetes/client-go.svg?branch=master
-
-[GoReport Status]: https://goreportcard.com/report/github.com/kubernetes/client-go
-[GoReport Widget]: https://goreportcard.com/badge/github.com/kubernetes/client-go
-
-[GoDocWidget]: https://godoc.org/k8s.io/client-go?status.svg
-[GoDocReference]:https://godoc.org/k8s.io/client-go 
+[![Build Status](https://travis-ci.org/kubernetes/client-go.svg?branch=master)](https://travis-ci.org/kubernetes/client-go)
+[![GoDoc](https://godoc.org/k8s.io/client-go?status.svg)](https://godoc.org/k8s.io/client-go)

 ## Table of Contents

@@ -27,7 +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)
- [Kubernetes tags](#kubernetes-tags)
+- [Kuberentes tags](#kubernetes-tags)
 - [How to get it](#how-to-get-it)
 - [How to use it](#how-to-use-it)
 - [Dependency management](#dependency-management)
@@ -91,16 +81,15 @@ We will backport bugfixes--but not new features--into older versions of

 #### Compatibility matrix

-|                     | Kubernetes 1.4 | Kubernetes 1.5 | Kubernetes 1.6 | Kubernetes 1.7 | Kubernetes 1.8 | Kubernetes 1.9 |
-|---------------------|----------------|----------------|----------------|----------------|----------------|----------------|
-| 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 6.0       | +-             | +-             | +-             | +-             | +-             | ✓              |
-| client-go HEAD      | +-             | +-             | +-             | +-             | +-             | +              |
+|                     | 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 5.0       | +-             | +-             | +-             | +-             | ✓              |
+| client-go HEAD      | +-             | +-             | +-             | +-             | +              |

 Key:

@@ -123,11 +112,10 @@ between client-go versions.
 |----------------|--------------------------------------|-------------------------------|
 | client-go 1.4  | Kubernetes main repo, 1.4 branch     | = -                           |
 | client-go 1.5  | Kubernetes main repo, 1.5 branch     | = -                           |
-| client-go 2.0  | Kubernetes main repo, 1.5 branch     | = -                           |
-| client-go 3.0  | Kubernetes main repo, 1.6 branch     | = -                           |
+| 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 6.0  | Kubernetes main repo, 1.9 branch     | ✓                             |
 | client-go HEAD | Kubernetes main repo, master branch  | ✓                             |

 Key:
--- a/code-of-conduct.md
+++ b/code-of-conduct.md
@@ -1,3 +0,0 @@
-# Kubernetes Community Code of Conduct
-
-Please refer to our [Kubernetes Community Code of Conduct](https://git.k8s.io/community/code-of-conduct.md)
--- a/discovery/discovery_client.go
+++ b/discovery/discovery_client.go
@@ -36,12 +36,8 @@ import (
 	restclient "k8s.io/client-go/rest"
 )

-const (
-	// defaultRetries is the number of times a resource discovery is repeated if an api group disappears on the fly (e.g. ThirdPartyResources).
-	defaultRetries = 2
-	// protobuf mime type
-	mimePb = "application/com.github.proto-openapi.spec.v2@v1.0+protobuf"
-)
+// defaultRetries is the number of times a resource discovery is repeated if an api group disappears on the fly (e.g. ThirdPartyResources).
+const defaultRetries = 2

 // DiscoveryInterface holds the methods that discover server-supported API groups,
 // versions and resources.
@@ -149,9 +145,9 @@ func (d *DiscoveryClient) ServerGroups() (apiGroupList *metav1.APIGroupList, err
 		apiGroupList = &metav1.APIGroupList{}
 	}

-	// prepend the group retrieved from /api to the list if not empty
+	// append the group retrieved from /api to the list if not empty
 	if len(v.Versions) != 0 {
-		apiGroupList.Groups = append([]metav1.APIGroup{apiGroup}, apiGroupList.Groups...)
+		apiGroupList.Groups = append(apiGroupList.Groups, apiGroup)
 	}
 	return apiGroupList, nil
 }
@@ -333,18 +329,9 @@ func (d *DiscoveryClient) ServerVersion() (*version.Info, error) {

 // 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("/openapi/v2").SetHeader("Accept", mimePb).Do().Raw()
+	data, err := d.restClient.Get().AbsPath("/swagger-2.0.0.pb-v1").Do().Raw()
 	if err != nil {
-		if errors.IsForbidden(err) || errors.IsNotFound(err) || errors.IsNotAcceptable(err) {
-			// single endpoint not found/registered in old server, try to fetch old endpoint
-			// TODO(roycaihw): remove this in 1.11
-			data, err = d.restClient.Get().AbsPath("/swagger-2.0.0.pb-v1").Do().Raw()
-			if err != nil {
-				return nil, err
-			}
-		} else {
-			return nil, err
-		}
+		return nil, err
 	}
 	document := &openapi_v2.Document{}
 	err = proto.Unmarshal(data, document)
@@ -408,6 +395,15 @@ func NewDiscoveryClient(c restclient.Interface) *DiscoveryClient {
 	return &DiscoveryClient{restClient: c, LegacyPrefix: "/api"}
 }

+func stringDoesntExistIn(str string, slice []string) bool {
+	for _, s := range slice {
+		if s == str {
+			return false
+		}
+	}
+	return true
+}
+
 // RESTClient returns a RESTClient that is used to communicate
 // with API server by this client implementation.
 func (c *DiscoveryClient) RESTClient() restclient.Interface {
--- a/discovery/discovery_client_test.go
+++ b/discovery/discovery_client_test.go
@@ -74,17 +74,6 @@ func TestGetServerGroupsWithV1Server(t *testing.T) {
 					"v1",
 				},
 			}
-		case "/apis":
-			obj = &metav1.APIGroupList{
-				Groups: []metav1.APIGroup{
-					{
-						Name: "extensions",
-						Versions: []metav1.GroupVersionForDiscovery{
-							{GroupVersion: "extensions/v1beta1"},
-						},
-					},
-				},
-			}
 		default:
 			w.WriteHeader(http.StatusNotFound)
 			return
@@ -106,8 +95,8 @@ func TestGetServerGroupsWithV1Server(t *testing.T) {
 		t.Fatalf("unexpected error: %v", err)
 	}
 	groupVersions := metav1.ExtractGroupVersions(apiGroupList)
-	if !reflect.DeepEqual(groupVersions, []string{"v1", "extensions/v1beta1"}) {
-		t.Errorf("expected: %q, got: %q", []string{"v1", "extensions/v1beta1"}, groupVersions)
+	if !reflect.DeepEqual(groupVersions, []string{"v1"}) {
+		t.Errorf("expected: %q, got: %q", []string{"v1"}, groupVersions)
 	}
 }

@@ -326,14 +315,9 @@ var returnedOpenAPI = openapi_v2.Document{
 	},
 }

-func openapiSchemaDeprecatedFakeServer(status int) (*httptest.Server, error) {
+func openapiSchemaFakeServer() (*httptest.Server, error) {
 	var sErr error
 	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
-		if req.URL.Path == "/openapi/v2" {
-			// write the error status for the new endpoint request
-			w.WriteHeader(status)
-			return
-		}
 		if req.URL.Path != "/swagger-2.0.0.pb-v1" {
 			sErr = fmt.Errorf("Unexpected url %v", req.URL)
 		}
@@ -354,33 +338,6 @@ func openapiSchemaDeprecatedFakeServer(status int) (*httptest.Server, error) {
 	return server, sErr
 }

-func openapiSchemaFakeServer() (*httptest.Server, error) {
-	var sErr error
-	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
-		if req.URL.Path != "/openapi/v2" {
-			sErr = fmt.Errorf("Unexpected url %v", req.URL)
-		}
-		if req.Method != "GET" {
-			sErr = fmt.Errorf("Unexpected method %v", req.Method)
-		}
-		decipherableFormat := req.Header.Get("Accept")
-		if decipherableFormat != "application/com.github.proto-openapi.spec.v2@v1.0+protobuf" {
-			sErr = fmt.Errorf("Unexpected accept mime type %v", decipherableFormat)
-		}
-
-		mime.AddExtensionType(".pb-v1", "application/com.github.googleapis.gnostic.OpenAPIv2@68f4ded+protobuf")
-
-		output, err := proto.Marshal(&returnedOpenAPI)
-		if err != nil {
-			sErr = err
-			return
-		}
-		w.WriteHeader(http.StatusOK)
-		w.Write(output)
-	}))
-	return server, sErr
-}
-
 func TestGetOpenAPISchema(t *testing.T) {
 	server, err := openapiSchemaFakeServer()
 	if err != nil {
@@ -398,57 +355,6 @@ func TestGetOpenAPISchema(t *testing.T) {
 	}
 }

-func TestGetOpenAPISchemaForbiddenFallback(t *testing.T) {
-	server, err := openapiSchemaDeprecatedFakeServer(http.StatusForbidden)
-	if err != nil {
-		t.Errorf("unexpected error starting fake server: %v", err)
-	}
-	defer server.Close()
-
-	client := NewDiscoveryClientForConfigOrDie(&restclient.Config{Host: server.URL})
-	got, err := client.OpenAPISchema()
-	if err != nil {
-		t.Fatalf("unexpected error getting openapi: %v", err)
-	}
-	if e, a := returnedOpenAPI, *got; !reflect.DeepEqual(e, a) {
-		t.Errorf("expected %v, got %v", e, a)
-	}
-}
-
-func TestGetOpenAPISchemaNotFoundFallback(t *testing.T) {
-	server, err := openapiSchemaDeprecatedFakeServer(http.StatusNotFound)
-	if err != nil {
-		t.Errorf("unexpected error starting fake server: %v", err)
-	}
-	defer server.Close()
-
-	client := NewDiscoveryClientForConfigOrDie(&restclient.Config{Host: server.URL})
-	got, err := client.OpenAPISchema()
-	if err != nil {
-		t.Fatalf("unexpected error getting openapi: %v", err)
-	}
-	if e, a := returnedOpenAPI, *got; !reflect.DeepEqual(e, a) {
-		t.Errorf("expected %v, got %v", e, a)
-	}
-}
-
-func TestGetOpenAPISchemaNotAcceptableFallback(t *testing.T) {
-	server, err := openapiSchemaDeprecatedFakeServer(http.StatusNotAcceptable)
-	if err != nil {
-		t.Errorf("unexpected error starting fake server: %v", err)
-	}
-	defer server.Close()
-
-	client := NewDiscoveryClientForConfigOrDie(&restclient.Config{Host: server.URL})
-	got, err := client.OpenAPISchema()
-	if err != nil {
-		t.Fatalf("unexpected error getting openapi: %v", err)
-	}
-	if e, a := returnedOpenAPI, *got; !reflect.DeepEqual(e, a) {
-		t.Errorf("expected %v, got %v", e, a)
-	}
-}
-
 func TestServerPreferredResources(t *testing.T) {
 	stable := metav1.APIResourceList{
 		GroupVersion: "v1",
--- a/discovery/restmapper.go
+++ b/discovery/restmapper.go
@@ -18,7 +18,6 @@ package discovery

 import (
 	"fmt"
-	"strings"
 	"sync"

 	"k8s.io/apimachinery/pkg/api/meta"
@@ -109,7 +108,6 @@ func NewRESTMapper(groupResources []*APIGroupResources, versionInterfaces meta.V
 				plural := gv.WithResource(resource.Name)
 				singular := gv.WithResource(resource.SingularName)
 				versionMapper.AddSpecific(gv.WithKind(resource.Kind), plural, singular, scope)
-				versionMapper.AddSpecific(gv.WithKind(strings.ToLower(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)
 			}
--- a/dynamic/client.go
+++ b/dynamic/client.go
@@ -47,7 +47,7 @@ type Interface interface {
 	GetRateLimiter() flowcontrol.RateLimiter
 	// Resource returns an API interface to the specified resource for this client's
 	// group and version.  If resource is not a namespaced resource, then namespace
-	// is ignored.  The ResourceInterface inherits the parameter codec of this client.
+	// is ignored.  The ResourceInterface inherits the paramater codec of this client.
 	Resource(resource *metav1.APIResource, namespace string) ResourceInterface
 	// ParameterCodec returns a client with the provided parameter codec.
 	ParameterCodec(parameterCodec runtime.ParameterCodec) Interface
@@ -145,19 +145,6 @@ type ResourceClient struct {
 	parameterCodec runtime.ParameterCodec
 }

-func (rc *ResourceClient) parseResourceSubresourceName() (string, []string) {
-	var resourceName string
-	var subresourceName []string
-	if strings.Contains(rc.resource.Name, "/") {
-		resourceName = strings.Split(rc.resource.Name, "/")[0]
-		subresourceName = strings.Split(rc.resource.Name, "/")[1:]
-	} else {
-		resourceName = rc.resource.Name
-	}
-
-	return resourceName, subresourceName
-}
-
 // List returns a list of objects for this resource.
 func (rc *ResourceClient) List(opts metav1.ListOptions) (runtime.Object, error) {
 	parameterEncoder := rc.parameterCodec
@@ -179,11 +166,9 @@ func (rc *ResourceClient) Get(name string, opts metav1.GetOptions) (*unstructure
 		parameterEncoder = defaultParameterEncoder
 	}
 	result := new(unstructured.Unstructured)
-	resourceName, subresourceName := rc.parseResourceSubresourceName()
 	err := rc.cl.Get().
 		NamespaceIfScoped(rc.ns, rc.resource.Namespaced).
-		Resource(resourceName).
-		SubResource(subresourceName...).
+		Resource(rc.resource.Name).
 		VersionedParams(&opts, parameterEncoder).
 		Name(name).
 		Do().
@@ -220,26 +205,11 @@ func (rc *ResourceClient) DeleteCollection(deleteOptions *metav1.DeleteOptions,
 // Create creates the provided resource.
 func (rc *ResourceClient) Create(obj *unstructured.Unstructured) (*unstructured.Unstructured, error) {
 	result := new(unstructured.Unstructured)
-	resourceName, subresourceName := rc.parseResourceSubresourceName()
-	req := rc.cl.Post().
+	err := rc.cl.Post().
 		NamespaceIfScoped(rc.ns, rc.resource.Namespaced).
-		Resource(resourceName).
-		Body(obj)
-	if len(subresourceName) > 0 {
-		// If the provided resource is a subresource, the POST request should contain
-		// object name. Examples of subresources that support Create operation:
-		//	core/v1/pods/{name}/binding
-		//	core/v1/pods/{name}/eviction
-		//	extensions/v1beta1/deployments/{name}/rollback
-		//	apps/v1beta1/deployments/{name}/rollback
-		// NOTE: Currently our system assumes every subresource object has the same
-		//	 name as the parent resource object. E.g. a pods/binding object having
-		//	 metadada.name "foo" means pod "foo" is being bound. We may need to
-		//	 change this if we break the assumption in the future.
-		req = req.SubResource(subresourceName...).
-			Name(obj.GetName())
-	}
-	err := req.Do().
+		Resource(rc.resource.Name).
+		Body(obj).
+		Do().
 		Into(result)
 	return result, err
 }
@@ -250,15 +220,9 @@ func (rc *ResourceClient) Update(obj *unstructured.Unstructured) (*unstructured.
 	if len(obj.GetName()) == 0 {
 		return result, errors.New("object missing name")
 	}
-	resourceName, subresourceName := rc.parseResourceSubresourceName()
 	err := rc.cl.Put().
 		NamespaceIfScoped(rc.ns, rc.resource.Namespaced).
-		Resource(resourceName).
-		SubResource(subresourceName...).
-		// NOTE: Currently our system assumes every subresource object has the same
-		//	 name as the parent resource object. E.g. a pods/binding object having
-		//	 metadada.name "foo" means pod "foo" is being bound. We may need to
-		//	 change this if we break the assumption in the future.
+		Resource(rc.resource.Name).
 		Name(obj.GetName()).
 		Body(obj).
 		Do().
@@ -280,14 +244,11 @@ func (rc *ResourceClient) Watch(opts metav1.ListOptions) (watch.Interface, error
 		Watch()
 }

-// Patch applies the patch and returns the patched resource.
 func (rc *ResourceClient) Patch(name string, pt types.PatchType, data []byte) (*unstructured.Unstructured, error) {
 	result := new(unstructured.Unstructured)
-	resourceName, subresourceName := rc.parseResourceSubresourceName()
 	err := rc.cl.Patch(pt).
 		NamespaceIfScoped(rc.ns, rc.resource.Namespaced).
-		Resource(resourceName).
-		SubResource(subresourceName...).
+		Resource(rc.resource.Name).
 		Name(name).
 		Body(data).
 		Do().
--- a/dynamic/client_test.go
+++ b/dynamic/client_test.go
@@ -150,7 +150,6 @@ func TestList(t *testing.T) {

 func TestGet(t *testing.T) {
 	tcs := []struct {
-		resource  string
 		namespace string
 		name      string
 		path      string
@@ -158,39 +157,22 @@ func TestGet(t *testing.T) {
 		want      *unstructured.Unstructured
 	}{
 		{
-			resource: "rtest",
-			name:     "normal_get",
-			path:     "/api/gtest/vtest/rtest/normal_get",
-			resp:     getJSON("vTest", "rTest", "normal_get"),
-			want:     getObject("vTest", "rTest", "normal_get"),
+			name: "normal_get",
+			path: "/api/gtest/vtest/rtest/normal_get",
+			resp: getJSON("vTest", "rTest", "normal_get"),
+			want: getObject("vTest", "rTest", "normal_get"),
 		},
 		{
-			resource:  "rtest",
 			namespace: "nstest",
 			name:      "namespaced_get",
 			path:      "/api/gtest/vtest/namespaces/nstest/rtest/namespaced_get",
 			resp:      getJSON("vTest", "rTest", "namespaced_get"),
 			want:      getObject("vTest", "rTest", "namespaced_get"),
 		},
-		{
-			resource: "rtest/srtest",
-			name:     "normal_subresource_get",
-			path:     "/api/gtest/vtest/rtest/normal_subresource_get/srtest",
-			resp:     getJSON("vTest", "srTest", "normal_subresource_get"),
-			want:     getObject("vTest", "srTest", "normal_subresource_get"),
-		},
-		{
-			resource:  "rtest/srtest",
-			namespace: "nstest",
-			name:      "namespaced_subresource_get",
-			path:      "/api/gtest/vtest/namespaces/nstest/rtest/namespaced_subresource_get/srtest",
-			resp:      getJSON("vTest", "srTest", "namespaced_subresource_get"),
-			want:      getObject("vTest", "srTest", "namespaced_subresource_get"),
-		},
 	}
 	for _, tc := range tcs {
 		gv := &schema.GroupVersion{Group: "gtest", Version: "vtest"}
-		resource := &metav1.APIResource{Name: tc.resource, Namespaced: len(tc.namespace) != 0}
+		resource := &metav1.APIResource{Name: "rtest", Namespaced: len(tc.namespace) != 0}
 		cl, srv, err := getClientServer(gv, func(w http.ResponseWriter, r *http.Request) {
 			if r.Method != "GET" {
 				t.Errorf("Get(%q) got HTTP method %s. wanted GET", tc.name, r.Method)
@@ -321,42 +303,26 @@ func TestDeleteCollection(t *testing.T) {

 func TestCreate(t *testing.T) {
 	tcs := []struct {
-		resource  string
 		name      string
 		namespace string
 		obj       *unstructured.Unstructured
 		path      string
 	}{
 		{
-			resource: "rtest",
-			name:     "normal_create",
-			path:     "/api/gtest/vtest/rtest",
-			obj:      getObject("vTest", "rTest", "normal_create"),
+			name: "normal_create",
+			path: "/api/gtest/vtest/rtest",
+			obj:  getObject("vTest", "rTest", "normal_create"),
 		},
 		{
-			resource:  "rtest",
 			name:      "namespaced_create",
 			namespace: "nstest",
 			path:      "/api/gtest/vtest/namespaces/nstest/rtest",
 			obj:       getObject("vTest", "rTest", "namespaced_create"),
 		},
-		{
-			resource: "rtest/srtest",
-			name:     "normal_subresource_create",
-			path:     "/api/gtest/vtest/rtest/normal_subresource_create/srtest",
-			obj:      getObject("vTest", "srTest", "normal_subresource_create"),
-		},
-		{
-			resource:  "rtest/srtest",
-			name:      "namespaced_subresource_create",
-			namespace: "nstest",
-			path:      "/api/gtest/vtest/namespaces/nstest/rtest/namespaced_subresource_create/srtest",
-			obj:       getObject("vTest", "srTest", "namespaced_subresource_create"),
-		},
 	}
 	for _, tc := range tcs {
 		gv := &schema.GroupVersion{Group: "gtest", Version: "vtest"}
-		resource := &metav1.APIResource{Name: tc.resource, Namespaced: len(tc.namespace) != 0}
+		resource := &metav1.APIResource{Name: "rtest", Namespaced: len(tc.namespace) != 0}
 		cl, srv, err := getClientServer(gv, func(w http.ResponseWriter, r *http.Request) {
 			if r.Method != "POST" {
 				t.Errorf("Create(%q) got HTTP method %s. wanted POST", tc.name, r.Method)
@@ -396,42 +362,26 @@ func TestCreate(t *testing.T) {

 func TestUpdate(t *testing.T) {
 	tcs := []struct {
-		resource  string
 		name      string
 		namespace string
 		obj       *unstructured.Unstructured
 		path      string
 	}{
 		{
-			resource: "rtest",
-			name:     "normal_update",
-			path:     "/api/gtest/vtest/rtest/normal_update",
-			obj:      getObject("vTest", "rTest", "normal_update"),
+			name: "normal_update",
+			path: "/api/gtest/vtest/rtest/normal_update",
+			obj:  getObject("vTest", "rTest", "normal_update"),
 		},
 		{
-			resource:  "rtest",
 			name:      "namespaced_update",
 			namespace: "nstest",
 			path:      "/api/gtest/vtest/namespaces/nstest/rtest/namespaced_update",
 			obj:       getObject("vTest", "rTest", "namespaced_update"),
 		},
-		{
-			resource: "rtest/srtest",
-			name:     "normal_subresource_update",
-			path:     "/api/gtest/vtest/rtest/normal_update/srtest",
-			obj:      getObject("vTest", "srTest", "normal_update"),
-		},
-		{
-			resource:  "rtest/srtest",
-			name:      "namespaced_subresource_update",
-			namespace: "nstest",
-			path:      "/api/gtest/vtest/namespaces/nstest/rtest/namespaced_update/srtest",
-			obj:       getObject("vTest", "srTest", "namespaced_update"),
-		},
 	}
 	for _, tc := range tcs {
 		gv := &schema.GroupVersion{Group: "gtest", Version: "vtest"}
-		resource := &metav1.APIResource{Name: tc.resource, Namespaced: len(tc.namespace) != 0}
+		resource := &metav1.APIResource{Name: "rtest", Namespaced: len(tc.namespace) != 0}
 		cl, srv, err := getClientServer(gv, func(w http.ResponseWriter, r *http.Request) {
 			if r.Method != "PUT" {
 				t.Errorf("Update(%q) got HTTP method %s. wanted PUT", tc.name, r.Method)
@@ -542,7 +492,6 @@ func TestWatch(t *testing.T) {

 func TestPatch(t *testing.T) {
 	tcs := []struct {
-		resource  string
 		name      string
 		namespace string
 		patch     []byte
@@ -550,39 +499,22 @@ func TestPatch(t *testing.T) {
 		path      string
 	}{
 		{
-			resource: "rtest",
-			name:     "normal_patch",
-			path:     "/api/gtest/vtest/rtest/normal_patch",
-			patch:    getJSON("vTest", "rTest", "normal_patch"),
-			want:     getObject("vTest", "rTest", "normal_patch"),
+			name:  "normal_patch",
+			path:  "/api/gtest/vtest/rtest/normal_patch",
+			patch: getJSON("vTest", "rTest", "normal_patch"),
+			want:  getObject("vTest", "rTest", "normal_patch"),
 		},
 		{
-			resource:  "rtest",
 			name:      "namespaced_patch",
 			namespace: "nstest",
 			path:      "/api/gtest/vtest/namespaces/nstest/rtest/namespaced_patch",
 			patch:     getJSON("vTest", "rTest", "namespaced_patch"),
 			want:      getObject("vTest", "rTest", "namespaced_patch"),
 		},
-		{
-			resource: "rtest/srtest",
-			name:     "normal_subresource_patch",
-			path:     "/api/gtest/vtest/rtest/normal_subresource_patch/srtest",
-			patch:    getJSON("vTest", "srTest", "normal_subresource_patch"),
-			want:     getObject("vTest", "srTest", "normal_subresource_patch"),
-		},
-		{
-			resource:  "rtest/srtest",
-			name:      "namespaced_subresource_patch",
-			namespace: "nstest",
-			path:      "/api/gtest/vtest/namespaces/nstest/rtest/namespaced_subresource_patch/srtest",
-			patch:     getJSON("vTest", "srTest", "namespaced_subresource_patch"),
-			want:      getObject("vTest", "srTest", "namespaced_subresource_patch"),
-		},
 	}
 	for _, tc := range tcs {
 		gv := &schema.GroupVersion{Group: "gtest", Version: "vtest"}
-		resource := &metav1.APIResource{Name: tc.resource, Namespaced: len(tc.namespace) != 0}
+		resource := &metav1.APIResource{Name: "rtest", Namespaced: len(tc.namespace) != 0}
 		cl, srv, err := getClientServer(gv, func(w http.ResponseWriter, r *http.Request) {
 			if r.Method != "PATCH" {
 				t.Errorf("Patch(%q) got HTTP method %s. wanted PATCH", tc.name, r.Method)
--- a/dynamic/fake/client.go
+++ b/dynamic/fake/client.go
@@ -46,7 +46,7 @@ func (c *FakeClient) GetRateLimiter() flowcontrol.RateLimiter {

 // Resource returns an API interface to the specified resource for this client's
 // group and version.  If resource is not a namespaced resource, then namespace
-// is ignored.  The ResourceClient inherits the parameter codec of this client
+// is ignored.  The ResourceClient inherits the paramater codec of this client
 func (c *FakeClient) Resource(resource *metav1.APIResource, namespace string) dynamic.ResourceInterface {
 	return &FakeResourceClient{
 		Resource:  c.GroupVersion.WithResource(resource.Name),
--- a/examples/create-update-delete-deployment/README.md
+++ b/examples/create-update-delete-deployment/README.md
@@ -48,7 +48,7 @@ Running this command will execute the following operations on your cluster:
   dependent ReplicaSet resource. Verify with `kubectl get deployments`.

 Each step is separated by an interactive prompt. You must hit the
-<kbd>Return</kbd> key to proceed to the next step. You can use these prompts as
+<kbd>Return</kbd> key to proceeed to the next step. You can use these prompts as
 a break to take time to  run `kubectl` and inspect the result of the operations
 executed.

--- a/examples/out-of-cluster-client-configuration/main.go
+++ b/examples/out-of-cluster-client-configuration/main.go
@@ -62,18 +62,15 @@ func main() {
 		// Examples for error handling:
 		// - Use helper functions like e.g. errors.IsNotFound()
 		// - And/or cast to StatusError and use its properties like e.g. ErrStatus.Message
-		namespace := "default"
-		pod := "example-xxxxx"
-		_, err = clientset.CoreV1().Pods(namespace).Get(pod, metav1.GetOptions{})
+		_, err = clientset.CoreV1().Pods("default").Get("example-xxxxx", metav1.GetOptions{})
 		if errors.IsNotFound(err) {
-			fmt.Printf("Pod %s in namespace %s not found\n", pod, namespace)
+			fmt.Printf("Pod not found\n")
 		} else if statusError, isStatus := err.(*errors.StatusError); isStatus {
-			fmt.Printf("Error getting pod %s in namespace %s: %v\n",
-				pod, namespace, statusError.ErrStatus.Message)
+			fmt.Printf("Error getting pod %v\n", statusError.ErrStatus.Message)
 		} else if err != nil {
 			panic(err.Error())
 		} else {
-			fmt.Printf("Found pod %s in namespace %s\n", pod, namespace)
+			fmt.Printf("Found pod\n")
 		}

 		time.Sleep(10 * time.Second)
--- a/informers/admissionregistration/interface.go
+++ b/informers/admissionregistration/interface.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-// Code generated by informer-gen. DO NOT EDIT.
+// This file was automatically generated by informer-gen

 package admissionregistration

--- a/informers/admissionregistration/v1alpha1/initializerconfiguration.go
+++ b/informers/admissionregistration/v1alpha1/initializerconfiguration.go
@@ -14,13 +14,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-// Code generated by informer-gen. DO NOT EDIT.
+// This file was automatically generated by informer-gen

 package v1alpha1

 import (
-	time "time"
-
 	admissionregistration_v1alpha1 "k8s.io/api/admissionregistration/v1alpha1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
@@ -29,6 +27,7 @@ import (
 	kubernetes "k8s.io/client-go/kubernetes"
 	v1alpha1 "k8s.io/client-go/listers/admissionregistration/v1alpha1"
 	cache "k8s.io/client-go/tools/cache"
+	time "time"
 )

 // InitializerConfigurationInformer provides access to a shared informer and lister for
--- a/informers/admissionregistration/v1alpha1/interface.go
+++ b/informers/admissionregistration/v1alpha1/interface.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-// Code generated by informer-gen. DO NOT EDIT.
+// This file was automatically generated by informer-gen

 package v1alpha1

--- a/informers/admissionregistration/v1beta1/interface.go
+++ b/informers/admissionregistration/v1beta1/interface.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-// Code generated by informer-gen. DO NOT EDIT.
+// This file was automatically generated by informer-gen

 package v1beta1

--- a/informers/admissionregistration/v1beta1/mutatingwebhookconfiguration.go
+++ b/informers/admissionregistration/v1beta1/mutatingwebhookconfiguration.go
@@ -14,13 +14,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-// Code generated by informer-gen. DO NOT EDIT.
+// This file was automatically generated by informer-gen

 package v1beta1

 import (
-	time "time"
-
 	admissionregistration_v1beta1 "k8s.io/api/admissionregistration/v1beta1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
@@ -29,6 +27,7 @@ import (
 	kubernetes "k8s.io/client-go/kubernetes"
 	v1beta1 "k8s.io/client-go/listers/admissionregistration/v1beta1"
 	cache "k8s.io/client-go/tools/cache"
+	time "time"
 )

 // MutatingWebhookConfigurationInformer provides access to a shared informer and lister for
--- a/informers/admissionregistration/v1beta1/validatingwebhookconfiguration.go
+++ b/informers/admissionregistration/v1beta1/validatingwebhookconfiguration.go
@@ -14,13 +14,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-// Code generated by informer-gen. DO NOT EDIT.
+// This file was automatically generated by informer-gen

 package v1beta1

 import (
-	time "time"
-
 	admissionregistration_v1beta1 "k8s.io/api/admissionregistration/v1beta1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
@@ -29,6 +27,7 @@ import (
 	kubernetes "k8s.io/client-go/kubernetes"
 	v1beta1 "k8s.io/client-go/listers/admissionregistration/v1beta1"
 	cache "k8s.io/client-go/tools/cache"
+	time "time"
 )

 // ValidatingWebhookConfigurationInformer provides access to a shared informer and lister for
--- a/informers/apps/interface.go
+++ b/informers/apps/interface.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-// Code generated by informer-gen. DO NOT EDIT.
+// This file was automatically generated by informer-gen

 package apps

--- a/informers/apps/v1/controllerrevision.go
+++ b/informers/apps/v1/controllerrevision.go
@@ -14,13 +14,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-// Code generated by informer-gen. DO NOT EDIT.
+// This file was automatically generated by informer-gen

 package v1

 import (
-	time "time"
-
 	apps_v1 "k8s.io/api/apps/v1"
 	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
@@ -29,6 +27,7 @@ import (
 	kubernetes "k8s.io/client-go/kubernetes"
 	v1 "k8s.io/client-go/listers/apps/v1"
 	cache "k8s.io/client-go/tools/cache"
+	time "time"
 )

 // ControllerRevisionInformer provides access to a shared informer and lister for
--- a/informers/apps/v1/daemonset.go
+++ b/informers/apps/v1/daemonset.go
@@ -14,13 +14,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-// Code generated by informer-gen. DO NOT EDIT.
+// This file was automatically generated by informer-gen

 package v1

 import (
-	time "time"
-
 	apps_v1 "k8s.io/api/apps/v1"
 	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
@@ -29,6 +27,7 @@ import (
 	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
--- a/informers/apps/v1/deployment.go
+++ b/informers/apps/v1/deployment.go
@@ -14,13 +14,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-// Code generated by informer-gen. DO NOT EDIT.
+// This file was automatically generated by informer-gen

 package v1

 import (
-	time "time"
-
 	apps_v1 "k8s.io/api/apps/v1"
 	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
@@ -29,6 +27,7 @@ import (
 	kubernetes "k8s.io/client-go/kubernetes"
 	v1 "k8s.io/client-go/listers/apps/v1"
 	cache "k8s.io/client-go/tools/cache"
+	time "time"
 )

 // DeploymentInformer provides access to a shared informer and lister for
--- a/informers/apps/v1/interface.go
+++ b/informers/apps/v1/interface.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-// Code generated by informer-gen. DO NOT EDIT.
+// This file was automatically generated by informer-gen

 package v1

--- a/informers/apps/v1/replicaset.go
+++ b/informers/apps/v1/replicaset.go
@@ -14,13 +14,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-// Code generated by informer-gen. DO NOT EDIT.
+// This file was automatically generated by informer-gen

 package v1

 import (
-	time "time"
-
 	apps_v1 "k8s.io/api/apps/v1"
 	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
@@ -29,6 +27,7 @@ import (
 	kubernetes "k8s.io/client-go/kubernetes"
 	v1 "k8s.io/client-go/listers/apps/v1"
 	cache "k8s.io/client-go/tools/cache"
+	time "time"
 )

 // ReplicaSetInformer provides access to a shared informer and lister for
--- a/informers/apps/v1/statefulset.go
+++ b/informers/apps/v1/statefulset.go
@@ -14,13 +14,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-// Code generated by informer-gen. DO NOT EDIT.
+// This file was automatically generated by informer-gen

 package v1

 import (
-	time "time"
-
 	apps_v1 "k8s.io/api/apps/v1"
 	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
@@ -29,6 +27,7 @@ import (
 	kubernetes "k8s.io/client-go/kubernetes"
 	v1 "k8s.io/client-go/listers/apps/v1"
 	cache "k8s.io/client-go/tools/cache"
+	time "time"
 )

 // StatefulSetInformer provides access to a shared informer and lister for
--- a/informers/apps/v1beta1/controllerrevision.go
+++ b/informers/apps/v1beta1/controllerrevision.go
@@ -14,13 +14,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-// Code generated by informer-gen. DO NOT EDIT.
+// This file was automatically generated by informer-gen

 package v1beta1

 import (
-	time "time"
-
 	apps_v1beta1 "k8s.io/api/apps/v1beta1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
@@ -29,6 +27,7 @@ import (
 	kubernetes "k8s.io/client-go/kubernetes"
 	v1beta1 "k8s.io/client-go/listers/apps/v1beta1"
 	cache "k8s.io/client-go/tools/cache"
+	time "time"
 )

 // ControllerRevisionInformer provides access to a shared informer and lister for
--- a/informers/apps/v1beta1/deployment.go
+++ b/informers/apps/v1beta1/deployment.go
@@ -14,13 +14,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-// Code generated by informer-gen. DO NOT EDIT.
+// This file was automatically generated by informer-gen

 package v1beta1

 import (
-	time "time"
-
 	apps_v1beta1 "k8s.io/api/apps/v1beta1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
@@ -29,6 +27,7 @@ import (
 	kubernetes "k8s.io/client-go/kubernetes"
 	v1beta1 "k8s.io/client-go/listers/apps/v1beta1"
 	cache "k8s.io/client-go/tools/cache"
+	time "time"
 )

 // DeploymentInformer provides access to a shared informer and lister for
--- a/informers/apps/v1beta1/interface.go
+++ b/informers/apps/v1beta1/interface.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-// Code generated by informer-gen. DO NOT EDIT.
+// This file was automatically generated by informer-gen

 package v1beta1

--- a/informers/apps/v1beta1/statefulset.go
+++ b/informers/apps/v1beta1/statefulset.go
@@ -14,13 +14,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-// Code generated by informer-gen. DO NOT EDIT.
+// This file was automatically generated by informer-gen

 package v1beta1

 import (
-	time "time"
-
 	apps_v1beta1 "k8s.io/api/apps/v1beta1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
@@ -29,6 +27,7 @@ import (
 	kubernetes "k8s.io/client-go/kubernetes"
 	v1beta1 "k8s.io/client-go/listers/apps/v1beta1"
 	cache "k8s.io/client-go/tools/cache"
+	time "time"
 )

 // StatefulSetInformer provides access to a shared informer and lister for
--- a/informers/apps/v1beta2/controllerrevision.go
+++ b/informers/apps/v1beta2/controllerrevision.go
@@ -14,13 +14,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-// Code generated by informer-gen. DO NOT EDIT.
+// This file was automatically generated by informer-gen

 package v1beta2

 import (
-	time "time"
-
 	apps_v1beta2 "k8s.io/api/apps/v1beta2"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
@@ -29,6 +27,7 @@ import (
 	kubernetes "k8s.io/client-go/kubernetes"
 	v1beta2 "k8s.io/client-go/listers/apps/v1beta2"
 	cache "k8s.io/client-go/tools/cache"
+	time "time"
 )

 // ControllerRevisionInformer provides access to a shared informer and lister for
--- a/informers/apps/v1beta2/daemonset.go
+++ b/informers/apps/v1beta2/daemonset.go
@@ -14,13 +14,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-// Code generated by informer-gen. DO NOT EDIT.
+// This file was automatically generated by informer-gen

 package v1beta2

 import (
-	time "time"
-
 	apps_v1beta2 "k8s.io/api/apps/v1beta2"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
@@ -29,6 +27,7 @@ import (
 	kubernetes "k8s.io/client-go/kubernetes"
 	v1beta2 "k8s.io/client-go/listers/apps/v1beta2"
 	cache "k8s.io/client-go/tools/cache"
+	time "time"
 )

 // DaemonSetInformer provides access to a shared informer and lister for
--- a/informers/apps/v1beta2/deployment.go
+++ b/informers/apps/v1beta2/deployment.go
@@ -14,13 +14,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-// Code generated by informer-gen. DO NOT EDIT.
+// This file was automatically generated by informer-gen

 package v1beta2

 import (
-	time "time"
-
 	apps_v1beta2 "k8s.io/api/apps/v1beta2"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
@@ -29,6 +27,7 @@ import (
 	kubernetes "k8s.io/client-go/kubernetes"
 	v1beta2 "k8s.io/client-go/listers/apps/v1beta2"
 	cache "k8s.io/client-go/tools/cache"
+	time "time"
 )

 // DeploymentInformer provides access to a shared informer and lister for
--- a/informers/apps/v1beta2/interface.go
+++ b/informers/apps/v1beta2/interface.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-// Code generated by informer-gen. DO NOT EDIT.
+// This file was automatically generated by informer-gen

 package v1beta2

--- a/informers/apps/v1beta2/replicaset.go
+++ b/informers/apps/v1beta2/replicaset.go
@@ -14,13 +14,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-// Code generated by informer-gen. DO NOT EDIT.
+// This file was automatically generated by informer-gen

 package v1beta2

 import (
-	time "time"
-
 	apps_v1beta2 "k8s.io/api/apps/v1beta2"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
@@ -29,6 +27,7 @@ import (
 	kubernetes "k8s.io/client-go/kubernetes"
 	v1beta2 "k8s.io/client-go/listers/apps/v1beta2"
 	cache "k8s.io/client-go/tools/cache"
+	time "time"
 )

 // ReplicaSetInformer provides access to a shared informer and lister for
--- a/informers/apps/v1beta2/statefulset.go
+++ b/informers/apps/v1beta2/statefulset.go
@@ -14,13 +14,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-// Code generated by informer-gen. DO NOT EDIT.
+// This file was automatically generated by informer-gen

 package v1beta2

 import (
-	time "time"
-
 	apps_v1beta2 "k8s.io/api/apps/v1beta2"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
@@ -29,6 +27,7 @@ import (
 	kubernetes "k8s.io/client-go/kubernetes"
 	v1beta2 "k8s.io/client-go/listers/apps/v1beta2"
 	cache "k8s.io/client-go/tools/cache"
+	time "time"
 )

 // StatefulSetInformer provides access to a shared informer and lister for
--- a/informers/autoscaling/interface.go
+++ b/informers/autoscaling/interface.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-// Code generated by informer-gen. DO NOT EDIT.
+// This file was automatically generated by informer-gen

 package autoscaling

--- a/informers/autoscaling/v1/horizontalpodautoscaler.go
+++ b/informers/autoscaling/v1/horizontalpodautoscaler.go
@@ -14,13 +14,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-// Code generated by informer-gen. DO NOT EDIT.
+// This file was automatically generated by informer-gen

 package v1

 import (
-	time "time"
-
 	autoscaling_v1 "k8s.io/api/autoscaling/v1"
 	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
@@ -29,6 +27,7 @@ import (
 	kubernetes "k8s.io/client-go/kubernetes"
 	v1 "k8s.io/client-go/listers/autoscaling/v1"
 	cache "k8s.io/client-go/tools/cache"
+	time "time"
 )

 // HorizontalPodAutoscalerInformer provides access to a shared informer and lister for
--- a/informers/autoscaling/v1/interface.go
+++ b/informers/autoscaling/v1/interface.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-// Code generated by informer-gen. DO NOT EDIT.
+// This file was automatically generated by informer-gen

 package v1

--- a/informers/autoscaling/v2beta1/horizontalpodautoscaler.go
+++ b/informers/autoscaling/v2beta1/horizontalpodautoscaler.go
@@ -14,13 +14,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-// Code generated by informer-gen. DO NOT EDIT.
+// This file was automatically generated by informer-gen

 package v2beta1

 import (
-	time "time"
-
 	autoscaling_v2beta1 "k8s.io/api/autoscaling/v2beta1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
@@ -29,6 +27,7 @@ import (
 	kubernetes "k8s.io/client-go/kubernetes"
 	v2beta1 "k8s.io/client-go/listers/autoscaling/v2beta1"
 	cache "k8s.io/client-go/tools/cache"
+	time "time"
 )

 // HorizontalPodAutoscalerInformer provides access to a shared informer and lister for
--- a/informers/autoscaling/v2beta1/interface.go
+++ b/informers/autoscaling/v2beta1/interface.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-// Code generated by informer-gen. DO NOT EDIT.
+// This file was automatically generated by informer-gen

 package v2beta1

--- a/informers/batch/interface.go
+++ b/informers/batch/interface.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-// Code generated by informer-gen. DO NOT EDIT.
+// This file was automatically generated by informer-gen

 package batch

--- a/informers/batch/v1/interface.go
+++ b/informers/batch/v1/interface.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-// Code generated by informer-gen. DO NOT EDIT.
+// This file was automatically generated by informer-gen

 package v1

--- a/informers/batch/v1/job.go
+++ b/informers/batch/v1/job.go
@@ -14,13 +14,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-// Code generated by informer-gen. DO NOT EDIT.
+// This file was automatically generated by informer-gen

 package v1

 import (
-	time "time"
-
 	batch_v1 "k8s.io/api/batch/v1"
 	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
@@ -29,6 +27,7 @@ import (
 	kubernetes "k8s.io/client-go/kubernetes"
 	v1 "k8s.io/client-go/listers/batch/v1"
 	cache "k8s.io/client-go/tools/cache"
+	time "time"
 )

 // JobInformer provides access to a shared informer and lister for
--- a/informers/batch/v1beta1/cronjob.go
+++ b/informers/batch/v1beta1/cronjob.go
@@ -14,13 +14,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-// Code generated by informer-gen. DO NOT EDIT.
+// This file was automatically generated by informer-gen

 package v1beta1

 import (
-	time "time"
-
 	batch_v1beta1 "k8s.io/api/batch/v1beta1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
@@ -29,6 +27,7 @@ import (
 	kubernetes "k8s.io/client-go/kubernetes"
 	v1beta1 "k8s.io/client-go/listers/batch/v1beta1"
 	cache "k8s.io/client-go/tools/cache"
+	time "time"
 )

 // CronJobInformer provides access to a shared informer and lister for
--- a/informers/batch/v1beta1/interface.go
+++ b/informers/batch/v1beta1/interface.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-// Code generated by informer-gen. DO NOT EDIT.
+// This file was automatically generated by informer-gen

 package v1beta1

--- a/informers/batch/v2alpha1/cronjob.go
+++ b/informers/batch/v2alpha1/cronjob.go
@@ -14,13 +14,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-// Code generated by informer-gen. DO NOT EDIT.
+// This file was automatically generated by informer-gen

 package v2alpha1

 import (
-	time "time"
-
 	batch_v2alpha1 "k8s.io/api/batch/v2alpha1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
@@ -29,6 +27,7 @@ import (
 	kubernetes "k8s.io/client-go/kubernetes"
 	v2alpha1 "k8s.io/client-go/listers/batch/v2alpha1"
 	cache "k8s.io/client-go/tools/cache"
+	time "time"
 )

 // CronJobInformer provides access to a shared informer and lister for
--- a/informers/batch/v2alpha1/interface.go
+++ b/informers/batch/v2alpha1/interface.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-// Code generated by informer-gen. DO NOT EDIT.
+// This file was automatically generated by informer-gen

 package v2alpha1

--- a/informers/certificates/interface.go
+++ b/informers/certificates/interface.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-// Code generated by informer-gen. DO NOT EDIT.
+// This file was automatically generated by informer-gen

 package certificates

--- a/informers/certificates/v1beta1/certificatesigningrequest.go
+++ b/informers/certificates/v1beta1/certificatesigningrequest.go
@@ -14,13 +14,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-// Code generated by informer-gen. DO NOT EDIT.
+// This file was automatically generated by informer-gen

 package v1beta1

 import (
-	time "time"
-
 	certificates_v1beta1 "k8s.io/api/certificates/v1beta1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
@@ -29,6 +27,7 @@ import (
 	kubernetes "k8s.io/client-go/kubernetes"
 	v1beta1 "k8s.io/client-go/listers/certificates/v1beta1"
 	cache "k8s.io/client-go/tools/cache"
+	time "time"
 )

 // CertificateSigningRequestInformer provides access to a shared informer and lister for
--- a/informers/certificates/v1beta1/interface.go
+++ b/informers/certificates/v1beta1/interface.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-// Code generated by informer-gen. DO NOT EDIT.
+// This file was automatically generated by informer-gen

 package v1beta1

--- a/informers/core/interface.go
+++ b/informers/core/interface.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-// Code generated by informer-gen. DO NOT EDIT.
+// This file was automatically generated by informer-gen

 package core

--- a/informers/core/v1/componentstatus.go
+++ b/informers/core/v1/componentstatus.go
@@ -14,13 +14,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-// Code generated by informer-gen. DO NOT EDIT.
+// This file was automatically generated by informer-gen

 package v1

 import (
-	time "time"
-
 	core_v1 "k8s.io/api/core/v1"
 	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
@@ -29,6 +27,7 @@ import (
 	kubernetes "k8s.io/client-go/kubernetes"
 	v1 "k8s.io/client-go/listers/core/v1"
 	cache "k8s.io/client-go/tools/cache"
+	time "time"
 )

 // ComponentStatusInformer provides access to a shared informer and lister for
--- a/informers/core/v1/configmap.go
+++ b/informers/core/v1/configmap.go
@@ -14,13 +14,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-// Code generated by informer-gen. DO NOT EDIT.
+// This file was automatically generated by informer-gen

 package v1

 import (
-	time "time"
-
 	core_v1 "k8s.io/api/core/v1"
 	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
@@ -29,6 +27,7 @@ import (
 	kubernetes "k8s.io/client-go/kubernetes"
 	v1 "k8s.io/client-go/listers/core/v1"
 	cache "k8s.io/client-go/tools/cache"
+	time "time"
 )

 // ConfigMapInformer provides access to a shared informer and lister for
--- a/informers/core/v1/endpoints.go
+++ b/informers/core/v1/endpoints.go
@@ -14,13 +14,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-// Code generated by informer-gen. DO NOT EDIT.
+// This file was automatically generated by informer-gen

 package v1

 import (
-	time "time"
-
 	core_v1 "k8s.io/api/core/v1"
 	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
@@ -29,6 +27,7 @@ import (
 	kubernetes "k8s.io/client-go/kubernetes"
 	v1 "k8s.io/client-go/listers/core/v1"
 	cache "k8s.io/client-go/tools/cache"
+	time "time"
 )

 // EndpointsInformer provides access to a shared informer and lister for
--- a/informers/core/v1/event.go
+++ b/informers/core/v1/event.go
@@ -14,13 +14,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-// Code generated by informer-gen. DO NOT EDIT.
+// This file was automatically generated by informer-gen

 package v1

 import (
-	time "time"
-
 	core_v1 "k8s.io/api/core/v1"
 	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
@@ -29,6 +27,7 @@ import (
 	kubernetes "k8s.io/client-go/kubernetes"
 	v1 "k8s.io/client-go/listers/core/v1"
 	cache "k8s.io/client-go/tools/cache"
+	time "time"
 )

 // EventInformer provides access to a shared informer and lister for
--- a/informers/core/v1/interface.go
+++ b/informers/core/v1/interface.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-// Code generated by informer-gen. DO NOT EDIT.
+// This file was automatically generated by informer-gen

 package v1

--- a/informers/core/v1/limitrange.go
+++ b/informers/core/v1/limitrange.go
@@ -14,13 +14,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-// Code generated by informer-gen. DO NOT EDIT.
+// This file was automatically generated by informer-gen

 package v1

 import (
-	time "time"
-
 	core_v1 "k8s.io/api/core/v1"
 	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
@@ -29,6 +27,7 @@ import (
 	kubernetes "k8s.io/client-go/kubernetes"
 	v1 "k8s.io/client-go/listers/core/v1"
 	cache "k8s.io/client-go/tools/cache"
+	time "time"
 )

 // LimitRangeInformer provides access to a shared informer and lister for
--- a/informers/core/v1/namespace.go
+++ b/informers/core/v1/namespace.go
@@ -14,13 +14,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-// Code generated by informer-gen. DO NOT EDIT.
+// This file was automatically generated by informer-gen

 package v1

 import (
-	time "time"
-
 	core_v1 "k8s.io/api/core/v1"
 	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
@@ -29,6 +27,7 @@ import (
 	kubernetes "k8s.io/client-go/kubernetes"
 	v1 "k8s.io/client-go/listers/core/v1"
 	cache "k8s.io/client-go/tools/cache"
+	time "time"
 )

 // NamespaceInformer provides access to a shared informer and lister for
--- a/informers/core/v1/node.go
+++ b/informers/core/v1/node.go
@@ -14,13 +14,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-// Code generated by informer-gen. DO NOT EDIT.
+// This file was automatically generated by informer-gen

 package v1

 import (
-	time "time"
-
 	core_v1 "k8s.io/api/core/v1"
 	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
@@ -29,6 +27,7 @@ import (
 	kubernetes "k8s.io/client-go/kubernetes"
 	v1 "k8s.io/client-go/listers/core/v1"
 	cache "k8s.io/client-go/tools/cache"
+	time "time"
 )

 // NodeInformer provides access to a shared informer and lister for
--- a/informers/core/v1/persistentvolume.go
+++ b/informers/core/v1/persistentvolume.go
@@ -14,13 +14,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-// Code generated by informer-gen. DO NOT EDIT.
+// This file was automatically generated by informer-gen

 package v1

 import (
-	time "time"
-
 	core_v1 "k8s.io/api/core/v1"
 	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
@@ -29,6 +27,7 @@ import (
 	kubernetes "k8s.io/client-go/kubernetes"
 	v1 "k8s.io/client-go/listers/core/v1"
 	cache "k8s.io/client-go/tools/cache"
+	time "time"
 )

 // PersistentVolumeInformer provides access to a shared informer and lister for
--- a/informers/core/v1/persistentvolumeclaim.go
+++ b/informers/core/v1/persistentvolumeclaim.go
@@ -14,13 +14,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-// Code generated by informer-gen. DO NOT EDIT.
+// This file was automatically generated by informer-gen

 package v1

 import (
-	time "time"
-
 	core_v1 "k8s.io/api/core/v1"
 	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
@@ -29,6 +27,7 @@ import (
 	kubernetes "k8s.io/client-go/kubernetes"
 	v1 "k8s.io/client-go/listers/core/v1"
 	cache "k8s.io/client-go/tools/cache"
+	time "time"
 )

 // PersistentVolumeClaimInformer provides access to a shared informer and lister for
--- a/informers/core/v1/pod.go
+++ b/informers/core/v1/pod.go
@@ -14,13 +14,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-// Code generated by informer-gen. DO NOT EDIT.
+// This file was automatically generated by informer-gen

 package v1

 import (
-	time "time"
-
 	core_v1 "k8s.io/api/core/v1"
 	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
@@ -29,6 +27,7 @@ import (
 	kubernetes "k8s.io/client-go/kubernetes"
 	v1 "k8s.io/client-go/listers/core/v1"
 	cache "k8s.io/client-go/tools/cache"
+	time "time"
 )

 // PodInformer provides access to a shared informer and lister for
--- a/informers/core/v1/podtemplate.go
+++ b/informers/core/v1/podtemplate.go
@@ -14,13 +14,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-// Code generated by informer-gen. DO NOT EDIT.
+// This file was automatically generated by informer-gen

 package v1

 import (
-	time "time"
-
 	core_v1 "k8s.io/api/core/v1"
 	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
@@ -29,6 +27,7 @@ import (
 	kubernetes "k8s.io/client-go/kubernetes"
 	v1 "k8s.io/client-go/listers/core/v1"
 	cache "k8s.io/client-go/tools/cache"
+	time "time"
 )

 // PodTemplateInformer provides access to a shared informer and lister for
--- a/informers/core/v1/replicationcontroller.go
+++ b/informers/core/v1/replicationcontroller.go
@@ -14,13 +14,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-// Code generated by informer-gen. DO NOT EDIT.
+// This file was automatically generated by informer-gen

 package v1

 import (
-	time "time"
-
 	core_v1 "k8s.io/api/core/v1"
 	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
@@ -29,6 +27,7 @@ import (
 	kubernetes "k8s.io/client-go/kubernetes"
 	v1 "k8s.io/client-go/listers/core/v1"
 	cache "k8s.io/client-go/tools/cache"
+	time "time"
 )

 // ReplicationControllerInformer provides access to a shared informer and lister for
--- a/informers/core/v1/resourcequota.go
+++ b/informers/core/v1/resourcequota.go
@@ -14,13 +14,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-// Code generated by informer-gen. DO NOT EDIT.
+// This file was automatically generated by informer-gen

 package v1

 import (
-	time "time"
-
 	core_v1 "k8s.io/api/core/v1"
 	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
@@ -29,6 +27,7 @@ import (
 	kubernetes "k8s.io/client-go/kubernetes"
 	v1 "k8s.io/client-go/listers/core/v1"
 	cache "k8s.io/client-go/tools/cache"
+	time "time"
 )

 // ResourceQuotaInformer provides access to a shared informer and lister for
--- a/informers/core/v1/secret.go
+++ b/informers/core/v1/secret.go
@@ -14,13 +14,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-// Code generated by informer-gen. DO NOT EDIT.
+// This file was automatically generated by informer-gen

 package v1

 import (
-	time "time"
-
 	core_v1 "k8s.io/api/core/v1"
 	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
@@ -29,6 +27,7 @@ import (
 	kubernetes "k8s.io/client-go/kubernetes"
 	v1 "k8s.io/client-go/listers/core/v1"
 	cache "k8s.io/client-go/tools/cache"
+	time "time"
 )

 // SecretInformer provides access to a shared informer and lister for
--- a/informers/core/v1/service.go
+++ b/informers/core/v1/service.go
@@ -14,13 +14,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-// Code generated by informer-gen. DO NOT EDIT.
+// This file was automatically generated by informer-gen

 package v1

 import (
-	time "time"
-
 	core_v1 "k8s.io/api/core/v1"
 	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
@@ -29,6 +27,7 @@ import (
 	kubernetes "k8s.io/client-go/kubernetes"
 	v1 "k8s.io/client-go/listers/core/v1"
 	cache "k8s.io/client-go/tools/cache"
+	time "time"
 )

 // ServiceInformer provides access to a shared informer and lister for
--- a/informers/core/v1/serviceaccount.go
+++ b/informers/core/v1/serviceaccount.go
@@ -14,13 +14,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-// Code generated by informer-gen. DO NOT EDIT.
+// This file was automatically generated by informer-gen

 package v1

 import (
-	time "time"
-
 	core_v1 "k8s.io/api/core/v1"
 	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
@@ -29,6 +27,7 @@ import (
 	kubernetes "k8s.io/client-go/kubernetes"
 	v1 "k8s.io/client-go/listers/core/v1"
 	cache "k8s.io/client-go/tools/cache"
+	time "time"
 )

 // ServiceAccountInformer provides access to a shared informer and lister for
--- a/informers/events/interface.go
+++ b/informers/events/interface.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-// Code generated by informer-gen. DO NOT EDIT.
+// This file was automatically generated by informer-gen

 package events

--- a/informers/events/v1beta1/event.go
+++ b/informers/events/v1beta1/event.go
@@ -14,13 +14,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-// Code generated by informer-gen. DO NOT EDIT.
+// This file was automatically generated by informer-gen

 package v1beta1

 import (
-	time "time"
-
 	events_v1beta1 "k8s.io/api/events/v1beta1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
@@ -29,6 +27,7 @@ import (
 	kubernetes "k8s.io/client-go/kubernetes"
 	v1beta1 "k8s.io/client-go/listers/events/v1beta1"
 	cache "k8s.io/client-go/tools/cache"
+	time "time"
 )

 // EventInformer provides access to a shared informer and lister for
--- a/informers/events/v1beta1/interface.go
+++ b/informers/events/v1beta1/interface.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-// Code generated by informer-gen. DO NOT EDIT.
+// This file was automatically generated by informer-gen

 package v1beta1

--- a/informers/extensions/interface.go
+++ b/informers/extensions/interface.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-// Code generated by informer-gen. DO NOT EDIT.
+// This file was automatically generated by informer-gen

 package extensions

--- a/informers/extensions/v1beta1/daemonset.go
+++ b/informers/extensions/v1beta1/daemonset.go
@@ -14,13 +14,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-// Code generated by informer-gen. DO NOT EDIT.
+// This file was automatically generated by informer-gen

 package v1beta1

 import (
-	time "time"
-
 	extensions_v1beta1 "k8s.io/api/extensions/v1beta1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
@@ -29,6 +27,7 @@ import (
 	kubernetes "k8s.io/client-go/kubernetes"
 	v1beta1 "k8s.io/client-go/listers/extensions/v1beta1"
 	cache "k8s.io/client-go/tools/cache"
+	time "time"
 )

 // DaemonSetInformer provides access to a shared informer and lister for
--- a/informers/extensions/v1beta1/deployment.go
+++ b/informers/extensions/v1beta1/deployment.go
@@ -14,13 +14,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-// Code generated by informer-gen. DO NOT EDIT.
+// This file was automatically generated by informer-gen

 package v1beta1

 import (
-	time "time"
-
 	extensions_v1beta1 "k8s.io/api/extensions/v1beta1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
@@ -29,6 +27,7 @@ import (
 	kubernetes "k8s.io/client-go/kubernetes"
 	v1beta1 "k8s.io/client-go/listers/extensions/v1beta1"
 	cache "k8s.io/client-go/tools/cache"
+	time "time"
 )

 // DeploymentInformer provides access to a shared informer and lister for
--- a/informers/extensions/v1beta1/ingress.go
+++ b/informers/extensions/v1beta1/ingress.go
@@ -14,13 +14,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-// Code generated by informer-gen. DO NOT EDIT.
+// This file was automatically generated by informer-gen

 package v1beta1

 import (
-	time "time"
-
 	extensions_v1beta1 "k8s.io/api/extensions/v1beta1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
@@ -29,6 +27,7 @@ import (
 	kubernetes "k8s.io/client-go/kubernetes"
 	v1beta1 "k8s.io/client-go/listers/extensions/v1beta1"
 	cache "k8s.io/client-go/tools/cache"
+	time "time"
 )

 // IngressInformer provides access to a shared informer and lister for
--- a/informers/extensions/v1beta1/interface.go
+++ b/informers/extensions/v1beta1/interface.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-// Code generated by informer-gen. DO NOT EDIT.
+// This file was automatically generated by informer-gen

 package v1beta1

--- a/informers/extensions/v1beta1/podsecuritypolicy.go
+++ b/informers/extensions/v1beta1/podsecuritypolicy.go
@@ -14,13 +14,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-// Code generated by informer-gen. DO NOT EDIT.
+// This file was automatically generated by informer-gen

 package v1beta1

 import (
-	time "time"
-
 	extensions_v1beta1 "k8s.io/api/extensions/v1beta1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
@@ -29,6 +27,7 @@ import (
 	kubernetes "k8s.io/client-go/kubernetes"
 	v1beta1 "k8s.io/client-go/listers/extensions/v1beta1"
 	cache "k8s.io/client-go/tools/cache"
+	time "time"
 )

 // PodSecurityPolicyInformer provides access to a shared informer and lister for
--- a/informers/extensions/v1beta1/replicaset.go
+++ b/informers/extensions/v1beta1/replicaset.go
@@ -14,13 +14,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-// Code generated by informer-gen. DO NOT EDIT.
+// This file was automatically generated by informer-gen

 package v1beta1

 import (
-	time "time"
-
 	extensions_v1beta1 "k8s.io/api/extensions/v1beta1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
@@ -29,6 +27,7 @@ import (
 	kubernetes "k8s.io/client-go/kubernetes"
 	v1beta1 "k8s.io/client-go/listers/extensions/v1beta1"
 	cache "k8s.io/client-go/tools/cache"
+	time "time"
 )

 // ReplicaSetInformer provides access to a shared informer and lister for
--- a/informers/factory.go
+++ b/informers/factory.go
@@ -14,15 +14,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-// Code generated by informer-gen. DO NOT EDIT.
+// This file was automatically generated by informer-gen

 package informers

 import (
-	reflect "reflect"
-	sync "sync"
-	time "time"
-
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	schema "k8s.io/apimachinery/pkg/runtime/schema"
@@ -43,6 +39,9 @@ import (
 	storage "k8s.io/client-go/informers/storage"
 	kubernetes "k8s.io/client-go/kubernetes"
 	cache "k8s.io/client-go/tools/cache"
+	reflect "reflect"
+	sync "sync"
+	time "time"
 )

 type sharedInformerFactory struct {
--- a/informers/generic.go
+++ b/informers/generic.go
@@ -14,13 +14,12 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-// Code generated by informer-gen. DO NOT EDIT.
+// This file was automatically generated by informer-gen

 package informers

 import (
 	"fmt"
-
 	v1alpha1 "k8s.io/api/admissionregistration/v1alpha1"
 	v1beta1 "k8s.io/api/admissionregistration/v1beta1"
 	v1 "k8s.io/api/apps/v1"
@@ -198,8 +197,6 @@ func (f *sharedInformerFactory) ForResource(resource schema.GroupVersionResource
 		// Group=policy, Version=v1beta1
 	case policy_v1beta1.SchemeGroupVersion.WithResource("poddisruptionbudgets"):
 		return &genericInformer{resource: resource.GroupResource(), informer: f.Policy().V1beta1().PodDisruptionBudgets().Informer()}, nil
-	case policy_v1beta1.SchemeGroupVersion.WithResource("podsecuritypolicies"):
-		return &genericInformer{resource: resource.GroupResource(), informer: f.Policy().V1beta1().PodSecurityPolicies().Informer()}, nil

 		// Group=rbac.authorization.k8s.io, Version=v1
 	case rbac_v1.SchemeGroupVersion.WithResource("clusterroles"):
@@ -250,8 +247,6 @@ func (f *sharedInformerFactory) ForResource(resource schema.GroupVersionResource
 		// Group=storage.k8s.io, Version=v1beta1
 	case storage_v1beta1.SchemeGroupVersion.WithResource("storageclasses"):
 		return &genericInformer{resource: resource.GroupResource(), informer: f.Storage().V1beta1().StorageClasses().Informer()}, nil
-	case storage_v1beta1.SchemeGroupVersion.WithResource("volumeattachments"):
-		return &genericInformer{resource: resource.GroupResource(), informer: f.Storage().V1beta1().VolumeAttachments().Informer()}, nil

 	}

--- a/informers/internalinterfaces/factory_interfaces.go
+++ b/informers/internalinterfaces/factory_interfaces.go
@@ -14,17 +14,16 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-// Code generated by informer-gen. DO NOT EDIT.
+// This file was automatically generated by informer-gen

 package internalinterfaces

 import (
-	time "time"
-
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
 	kubernetes "k8s.io/client-go/kubernetes"
 	cache "k8s.io/client-go/tools/cache"
+	time "time"
 )

 type NewInformerFunc func(kubernetes.Interface, time.Duration) cache.SharedIndexInformer
--- a/informers/networking/interface.go
+++ b/informers/networking/interface.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-// Code generated by informer-gen. DO NOT EDIT.
+// This file was automatically generated by informer-gen

 package networking

--- a/informers/networking/v1/interface.go
+++ b/informers/networking/v1/interface.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-// Code generated by informer-gen. DO NOT EDIT.
+// This file was automatically generated by informer-gen

 package v1

--- a/informers/networking/v1/networkpolicy.go
+++ b/informers/networking/v1/networkpolicy.go
@@ -14,13 +14,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-// Code generated by informer-gen. DO NOT EDIT.
+// This file was automatically generated by informer-gen

 package v1

 import (
-	time "time"
-
 	networking_v1 "k8s.io/api/networking/v1"
 	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
@@ -29,6 +27,7 @@ import (
 	kubernetes "k8s.io/client-go/kubernetes"
 	v1 "k8s.io/client-go/listers/networking/v1"
 	cache "k8s.io/client-go/tools/cache"
+	time "time"
 )

 // NetworkPolicyInformer provides access to a shared informer and lister for
--- a/informers/policy/interface.go
+++ b/informers/policy/interface.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-// Code generated by informer-gen. DO NOT EDIT.
+// This file was automatically generated by informer-gen

 package policy

--- a/informers/policy/v1beta1/interface.go
+++ b/informers/policy/v1beta1/interface.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-// Code generated by informer-gen. DO NOT EDIT.
+// This file was automatically generated by informer-gen

 package v1beta1

@@ -26,8 +26,6 @@ import (
 type Interface interface {
 	// PodDisruptionBudgets returns a PodDisruptionBudgetInformer.
 	PodDisruptionBudgets() PodDisruptionBudgetInformer
-	// PodSecurityPolicies returns a PodSecurityPolicyInformer.
-	PodSecurityPolicies() PodSecurityPolicyInformer
 }

 type version struct {
@@ -45,8 +43,3 @@ func New(f internalinterfaces.SharedInformerFactory, namespace string, tweakList
 func (v *version) PodDisruptionBudgets() PodDisruptionBudgetInformer {
 	return &podDisruptionBudgetInformer{factory: v.factory, namespace: v.namespace, tweakListOptions: v.tweakListOptions}
 }
-
-// PodSecurityPolicies returns a PodSecurityPolicyInformer.
-func (v *version) PodSecurityPolicies() PodSecurityPolicyInformer {
-	return &podSecurityPolicyInformer{factory: v.factory, tweakListOptions: v.tweakListOptions}
-}
--- a/informers/policy/v1beta1/poddisruptionbudget.go
+++ b/informers/policy/v1beta1/poddisruptionbudget.go
@@ -14,13 +14,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-// Code generated by informer-gen. DO NOT EDIT.
+// This file was automatically generated by informer-gen

 package v1beta1

 import (
-	time "time"
-
 	policy_v1beta1 "k8s.io/api/policy/v1beta1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
@@ -29,6 +27,7 @@ import (
 	kubernetes "k8s.io/client-go/kubernetes"
 	v1beta1 "k8s.io/client-go/listers/policy/v1beta1"
 	cache "k8s.io/client-go/tools/cache"
+	time "time"
 )

 // PodDisruptionBudgetInformer provides access to a shared informer and lister for
--- a/informers/policy/v1beta1/podsecuritypolicy.go
+++ b/informers/policy/v1beta1/podsecuritypolicy.go
@@ -1,88 +0,0 @@
-/*
-Copyright 2018 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.
-*/
-
-// Code generated by informer-gen. DO NOT EDIT.
-
-package v1beta1
-
-import (
-	time "time"
-
-	policy_v1beta1 "k8s.io/api/policy/v1beta1"
-	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"
-	v1beta1 "k8s.io/client-go/listers/policy/v1beta1"
-	cache "k8s.io/client-go/tools/cache"
-)
-
-// PodSecurityPolicyInformer provides access to a shared informer and lister for
-// PodSecurityPolicies.
-type PodSecurityPolicyInformer interface {
-	Informer() cache.SharedIndexInformer
-	Lister() v1beta1.PodSecurityPolicyLister
-}
-
-type podSecurityPolicyInformer struct {
-	factory          internalinterfaces.SharedInformerFactory
-	tweakListOptions internalinterfaces.TweakListOptionsFunc
-}
-
-// NewPodSecurityPolicyInformer constructs a new informer for PodSecurityPolicy 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 NewPodSecurityPolicyInformer(client kubernetes.Interface, resyncPeriod time.Duration, indexers cache.Indexers) cache.SharedIndexInformer {
-	return NewFilteredPodSecurityPolicyInformer(client, resyncPeriod, indexers, nil)
-}
-
-// NewFilteredPodSecurityPolicyInformer constructs a new informer for PodSecurityPolicy 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 NewFilteredPodSecurityPolicyInformer(client kubernetes.Interface, resyncPeriod time.Duration, indexers cache.Indexers, tweakListOptions internalinterfaces.TweakListOptionsFunc) cache.SharedIndexInformer {
-	return cache.NewSharedIndexInformer(
-		&cache.ListWatch{
-			ListFunc: func(options v1.ListOptions) (runtime.Object, error) {
-				if tweakListOptions != nil {
-					tweakListOptions(&options)
-				}
-				return client.PolicyV1beta1().PodSecurityPolicies().List(options)
-			},
-			WatchFunc: func(options v1.ListOptions) (watch.Interface, error) {
-				if tweakListOptions != nil {
-					tweakListOptions(&options)
-				}
-				return client.PolicyV1beta1().PodSecurityPolicies().Watch(options)
-			},
-		},
-		&policy_v1beta1.PodSecurityPolicy{},
-		resyncPeriod,
-		indexers,
-	)
-}
-
-func (f *podSecurityPolicyInformer) defaultInformer(client kubernetes.Interface, resyncPeriod time.Duration) cache.SharedIndexInformer {
-	return NewFilteredPodSecurityPolicyInformer(client, resyncPeriod, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc}, f.tweakListOptions)
-}
-
-func (f *podSecurityPolicyInformer) Informer() cache.SharedIndexInformer {
-	return f.factory.InformerFor(&policy_v1beta1.PodSecurityPolicy{}, f.defaultInformer)
-}
-
-func (f *podSecurityPolicyInformer) Lister() v1beta1.PodSecurityPolicyLister {
-	return v1beta1.NewPodSecurityPolicyLister(f.Informer().GetIndexer())
-}
--- a/informers/rbac/interface.go
+++ b/informers/rbac/interface.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-// Code generated by informer-gen. DO NOT EDIT.
+// This file was automatically generated by informer-gen

 package rbac

--- a/informers/rbac/v1/clusterrole.go
+++ b/informers/rbac/v1/clusterrole.go
@@ -14,13 +14,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-// Code generated by informer-gen. DO NOT EDIT.
+// This file was automatically generated by informer-gen

 package v1

 import (
-	time "time"
-
 	rbac_v1 "k8s.io/api/rbac/v1"
 	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
@@ -29,6 +27,7 @@ import (
 	kubernetes "k8s.io/client-go/kubernetes"
 	v1 "k8s.io/client-go/listers/rbac/v1"
 	cache "k8s.io/client-go/tools/cache"
+	time "time"
 )

 // ClusterRoleInformer provides access to a shared informer and lister for
--- a/informers/rbac/v1/clusterrolebinding.go
+++ b/informers/rbac/v1/clusterrolebinding.go
@@ -14,13 +14,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-// Code generated by informer-gen. DO NOT EDIT.
+// This file was automatically generated by informer-gen

 package v1

 import (
-	time "time"
-
 	rbac_v1 "k8s.io/api/rbac/v1"
 	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
@@ -29,6 +27,7 @@ import (
 	kubernetes "k8s.io/client-go/kubernetes"
 	v1 "k8s.io/client-go/listers/rbac/v1"
 	cache "k8s.io/client-go/tools/cache"
+	time "time"
 )

 // ClusterRoleBindingInformer provides access to a shared informer and lister for
--- a/informers/rbac/v1/interface.go
+++ b/informers/rbac/v1/interface.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-// Code generated by informer-gen. DO NOT EDIT.
+// This file was automatically generated by informer-gen

 package v1

--- a/informers/rbac/v1/role.go
+++ b/informers/rbac/v1/role.go
@@ -14,13 +14,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-// Code generated by informer-gen. DO NOT EDIT.
+// This file was automatically generated by informer-gen

 package v1

 import (
-	time "time"
-
 	rbac_v1 "k8s.io/api/rbac/v1"
 	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
@@ -29,6 +27,7 @@ import (
 	kubernetes "k8s.io/client-go/kubernetes"
 	v1 "k8s.io/client-go/listers/rbac/v1"
 	cache "k8s.io/client-go/tools/cache"
+	time "time"
 )

 // RoleInformer provides access to a shared informer and lister for
--- a/informers/rbac/v1/rolebinding.go
+++ b/informers/rbac/v1/rolebinding.go
@@ -14,13 +14,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-// Code generated by informer-gen. DO NOT EDIT.
+// This file was automatically generated by informer-gen

 package v1

 import (
-	time "time"
-
 	rbac_v1 "k8s.io/api/rbac/v1"
 	meta_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
@@ -29,6 +27,7 @@ import (
 	kubernetes "k8s.io/client-go/kubernetes"
 	v1 "k8s.io/client-go/listers/rbac/v1"
 	cache "k8s.io/client-go/tools/cache"
+	time "time"
 )

 // RoleBindingInformer provides access to a shared informer and lister for
--- a/informers/rbac/v1alpha1/clusterrole.go
+++ b/informers/rbac/v1alpha1/clusterrole.go
@@ -14,13 +14,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-// Code generated by informer-gen. DO NOT EDIT.
+// This file was automatically generated by informer-gen

 package v1alpha1

 import (
-	time "time"
-
 	rbac_v1alpha1 "k8s.io/api/rbac/v1alpha1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
@@ -29,6 +27,7 @@ import (
 	kubernetes "k8s.io/client-go/kubernetes"
 	v1alpha1 "k8s.io/client-go/listers/rbac/v1alpha1"
 	cache "k8s.io/client-go/tools/cache"
+	time "time"
 )

 // ClusterRoleInformer provides access to a shared informer and lister for
--- a/informers/rbac/v1alpha1/clusterrolebinding.go
+++ b/informers/rbac/v1alpha1/clusterrolebinding.go
@@ -14,13 +14,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

-// Code generated by informer-gen. DO NOT EDIT.
+// This file was automatically generated by informer-gen

 package v1alpha1

 import (
-	time "time"
-
 	rbac_v1alpha1 "k8s.io/api/rbac/v1alpha1"
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtime "k8s.io/apimachinery/pkg/runtime"
@@ -29,6 +27,7 @@ import (
 	kubernetes "k8s.io/client-go/kubernetes"
 	v1alpha1 "k8s.io/client-go/listers/rbac/v1alpha1"
 	cache "k8s.io/client-go/tools/cache"
+	time "time"
 )

 // ClusterRoleBindingInformer provides access to a shared informer and lister for
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Kubernetes Publisher	90539b4e75	Merge pull request #61751 from maisem/automated-cherry-pick-of-#59828-upstream-release-1.9 Automatic merge from submit-queue. Automated cherry pick of #59828 upstream release 1.9 Cherry pick of #59828 on release-1.9. #59828 : Fix a race condition in SharedInformer Kubernetes-commit: c996d0406ac15a14937a837ad51b241a7ab6e526	2018-03-27 23:10:50 +00:00
Kubernetes Publisher	cade0e592a	sync: initially remove files BUILD /BUILD BUILD.bazel /BUILD.bazel	2018-03-15 09:30:20 +00:00
Kris	5f3aeb1d83	Add started state to the processor to protect against double starts This prevents a race condition where the sharedIndexInformer was causeing the processorListener's run and pop method to be started twice. That violated the SharedInformer's interface guarantee of sequential delivery and also caused panics on shutdown. Kubernetes-commit: f3731c02a24299797b0734b1c1a26a11f26817bc	2018-02-13 11:33:21 -08:00
Kris	c777fab147	Add a test case for the race in #59822 Kubernetes-commit: f3cd6d0e0b1e9750d85d229ccac70667caabe275	2018-02-13 11:32:36 -08:00
Kubernetes Publisher	9389c055a8	Merge pull request #57767 from mbohlool/automated-cherry-pick-of-#57735-upstream-release-1.9 Automated cherry pick of #57735: Update boilerplate for 2018 Kubernetes-commit: 3968dfcc5de611f872995476b524bca12aec13eb	2018-01-03 01:58:15 +00:00
Christoph Blecker	dd8d2af23e	Regenerate all generated code Kubernetes-commit: 1526308622b9e9c27c71151edf59b2f15e9e02f7	2018-01-02 00:21:07 -08:00
Kubernetes Publisher	78700dec63	Merge remote-tracking branch 'origin/master' into release-1.9 Kubernetes-commit: 55ca09c3ecd84ed64060580f74acbc1a5e4bd7eb	2017-12-07 04:26:02 +00:00
Kubernetes Publisher	069098300e	Merge remote-tracking branch 'origin/master' into release-1.9 Kubernetes-commit: b854cd9fab66f77b5ad132d7559fa09f846a7407	2017-12-07 04:25:44 +00:00
Kubernetes Publisher	651d7a8818	Merge remote-tracking branch 'origin/master' into release-1.9 Kubernetes-commit: 7c9967f6de296b968505885781e9ed9fc65156c3	2017-12-07 04:25:43 +00:00
Kubernetes Publisher	d97bb3ec4c	Merge remote-tracking branch 'origin/master' into release-1.9 Kubernetes-commit: 1e8eb335b3a59daa26c25333c28d50def634961d	2017-12-07 04:25:42 +00:00
Kubernetes Publisher	c71215b4b3	Merge remote-tracking branch 'origin/master' into release-1.9 Kubernetes-commit: fb2de097796aafb38cdb6dc4d3184ebd43d525b4	2017-12-07 04:25:40 +00:00