diff --git a/staging/src/k8s.io/client-go/_vendor/k8s.io/apimachinery/pkg/apis/meta/v1/doc.go b/staging/src/k8s.io/client-go/_vendor/k8s.io/apimachinery/pkg/apis/meta/v1/doc.go
index 52273240f0e..b3bb5280125 100644
--- a/staging/src/k8s.io/client-go/_vendor/k8s.io/apimachinery/pkg/apis/meta/v1/doc.go
+++ b/staging/src/k8s.io/client-go/_vendor/k8s.io/apimachinery/pkg/apis/meta/v1/doc.go
@@ -14,9 +14,5 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// +k8s:deepcopy-gen=package
-// +k8s:openapi-gen=true
-// +k8s:defaulter-gen=TypeMeta
-
 // +groupName=meta.k8s.io
 package v1
diff --git a/staging/src/k8s.io/client-go/_vendor/k8s.io/apimachinery/pkg/apis/meta/v1/generated.pb.go b/staging/src/k8s.io/client-go/_vendor/k8s.io/apimachinery/pkg/apis/meta/v1/generated.pb.go
index c7c8bf27de5..7e2f0abc80a 100644
--- a/staging/src/k8s.io/client-go/_vendor/k8s.io/apimachinery/pkg/apis/meta/v1/generated.pb.go
+++ b/staging/src/k8s.io/client-go/_vendor/k8s.io/apimachinery/pkg/apis/meta/v1/generated.pb.go
@@ -15,14 +15,14 @@ limitations under the License.
 */
 
 // Code generated by protoc-gen-gogo.
-// source: k8s.io/apimachinery/pkg/apis/meta/v1/generated.proto
+// source: k8s.io/kubernetes/vendor/k8s.io/apimachinery/pkg/apis/meta/v1/generated.proto
 // DO NOT EDIT!
 
 /*
 	Package v1 is a generated protocol buffer package.
 
 	It is generated from these files:
-		k8s.io/apimachinery/pkg/apis/meta/v1/generated.proto
+		k8s.io/kubernetes/vendor/k8s.io/apimachinery/pkg/apis/meta/v1/generated.proto
 
 	It has these top-level messages:
 		APIGroup
@@ -61,7 +61,7 @@ import fmt "fmt"
 import math "math"
 
 import time "time"
-import k8s_io_kubernetes_pkg_types "k8s.io/apimachinery/pkg/types"
+import k8s_io_apimachinery_pkg_types "k8s.io/apimachinery/pkg/types"
 
 import strings "strings"
 import reflect "reflect"
@@ -197,34 +197,34 @@ func (*WatchEvent) ProtoMessage()               {}
 func (*WatchEvent) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{27} }
 
 func init() {
-	proto.RegisterType((*APIGroup)(nil), "k8s.io.client-go.pkg.apis.meta.v1.APIGroup")
-	proto.RegisterType((*APIGroupList)(nil), "k8s.io.client-go.pkg.apis.meta.v1.APIGroupList")
-	proto.RegisterType((*APIResource)(nil), "k8s.io.client-go.pkg.apis.meta.v1.APIResource")
-	proto.RegisterType((*APIResourceList)(nil), "k8s.io.client-go.pkg.apis.meta.v1.APIResourceList")
-	proto.RegisterType((*APIVersions)(nil), "k8s.io.client-go.pkg.apis.meta.v1.APIVersions")
-	proto.RegisterType((*Duration)(nil), "k8s.io.client-go.pkg.apis.meta.v1.Duration")
-	proto.RegisterType((*ExportOptions)(nil), "k8s.io.client-go.pkg.apis.meta.v1.ExportOptions")
-	proto.RegisterType((*GetOptions)(nil), "k8s.io.client-go.pkg.apis.meta.v1.GetOptions")
-	proto.RegisterType((*GroupKind)(nil), "k8s.io.client-go.pkg.apis.meta.v1.GroupKind")
-	proto.RegisterType((*GroupResource)(nil), "k8s.io.client-go.pkg.apis.meta.v1.GroupResource")
-	proto.RegisterType((*GroupVersion)(nil), "k8s.io.client-go.pkg.apis.meta.v1.GroupVersion")
-	proto.RegisterType((*GroupVersionForDiscovery)(nil), "k8s.io.client-go.pkg.apis.meta.v1.GroupVersionForDiscovery")
-	proto.RegisterType((*GroupVersionKind)(nil), "k8s.io.client-go.pkg.apis.meta.v1.GroupVersionKind")
-	proto.RegisterType((*GroupVersionResource)(nil), "k8s.io.client-go.pkg.apis.meta.v1.GroupVersionResource")
-	proto.RegisterType((*LabelSelector)(nil), "k8s.io.client-go.pkg.apis.meta.v1.LabelSelector")
-	proto.RegisterType((*LabelSelectorRequirement)(nil), "k8s.io.client-go.pkg.apis.meta.v1.LabelSelectorRequirement")
-	proto.RegisterType((*ListMeta)(nil), "k8s.io.client-go.pkg.apis.meta.v1.ListMeta")
-	proto.RegisterType((*OwnerReference)(nil), "k8s.io.client-go.pkg.apis.meta.v1.OwnerReference")
-	proto.RegisterType((*RootPaths)(nil), "k8s.io.client-go.pkg.apis.meta.v1.RootPaths")
-	proto.RegisterType((*ServerAddressByClientCIDR)(nil), "k8s.io.client-go.pkg.apis.meta.v1.ServerAddressByClientCIDR")
-	proto.RegisterType((*Status)(nil), "k8s.io.client-go.pkg.apis.meta.v1.Status")
-	proto.RegisterType((*StatusCause)(nil), "k8s.io.client-go.pkg.apis.meta.v1.StatusCause")
-	proto.RegisterType((*StatusDetails)(nil), "k8s.io.client-go.pkg.apis.meta.v1.StatusDetails")
-	proto.RegisterType((*Time)(nil), "k8s.io.client-go.pkg.apis.meta.v1.Time")
-	proto.RegisterType((*Timestamp)(nil), "k8s.io.client-go.pkg.apis.meta.v1.Timestamp")
-	proto.RegisterType((*TypeMeta)(nil), "k8s.io.client-go.pkg.apis.meta.v1.TypeMeta")
-	proto.RegisterType((*Verbs)(nil), "k8s.io.client-go.pkg.apis.meta.v1.Verbs")
-	proto.RegisterType((*WatchEvent)(nil), "k8s.io.client-go.pkg.apis.meta.v1.WatchEvent")
+	proto.RegisterType((*APIGroup)(nil), "k8s.io.apimachinery.pkg.apis.meta.v1.APIGroup")
+	proto.RegisterType((*APIGroupList)(nil), "k8s.io.apimachinery.pkg.apis.meta.v1.APIGroupList")
+	proto.RegisterType((*APIResource)(nil), "k8s.io.apimachinery.pkg.apis.meta.v1.APIResource")
+	proto.RegisterType((*APIResourceList)(nil), "k8s.io.apimachinery.pkg.apis.meta.v1.APIResourceList")
+	proto.RegisterType((*APIVersions)(nil), "k8s.io.apimachinery.pkg.apis.meta.v1.APIVersions")
+	proto.RegisterType((*Duration)(nil), "k8s.io.apimachinery.pkg.apis.meta.v1.Duration")
+	proto.RegisterType((*ExportOptions)(nil), "k8s.io.apimachinery.pkg.apis.meta.v1.ExportOptions")
+	proto.RegisterType((*GetOptions)(nil), "k8s.io.apimachinery.pkg.apis.meta.v1.GetOptions")
+	proto.RegisterType((*GroupKind)(nil), "k8s.io.apimachinery.pkg.apis.meta.v1.GroupKind")
+	proto.RegisterType((*GroupResource)(nil), "k8s.io.apimachinery.pkg.apis.meta.v1.GroupResource")
+	proto.RegisterType((*GroupVersion)(nil), "k8s.io.apimachinery.pkg.apis.meta.v1.GroupVersion")
+	proto.RegisterType((*GroupVersionForDiscovery)(nil), "k8s.io.apimachinery.pkg.apis.meta.v1.GroupVersionForDiscovery")
+	proto.RegisterType((*GroupVersionKind)(nil), "k8s.io.apimachinery.pkg.apis.meta.v1.GroupVersionKind")
+	proto.RegisterType((*GroupVersionResource)(nil), "k8s.io.apimachinery.pkg.apis.meta.v1.GroupVersionResource")
+	proto.RegisterType((*LabelSelector)(nil), "k8s.io.apimachinery.pkg.apis.meta.v1.LabelSelector")
+	proto.RegisterType((*LabelSelectorRequirement)(nil), "k8s.io.apimachinery.pkg.apis.meta.v1.LabelSelectorRequirement")
+	proto.RegisterType((*ListMeta)(nil), "k8s.io.apimachinery.pkg.apis.meta.v1.ListMeta")
+	proto.RegisterType((*OwnerReference)(nil), "k8s.io.apimachinery.pkg.apis.meta.v1.OwnerReference")
+	proto.RegisterType((*RootPaths)(nil), "k8s.io.apimachinery.pkg.apis.meta.v1.RootPaths")
+	proto.RegisterType((*ServerAddressByClientCIDR)(nil), "k8s.io.apimachinery.pkg.apis.meta.v1.ServerAddressByClientCIDR")
+	proto.RegisterType((*Status)(nil), "k8s.io.apimachinery.pkg.apis.meta.v1.Status")
+	proto.RegisterType((*StatusCause)(nil), "k8s.io.apimachinery.pkg.apis.meta.v1.StatusCause")
+	proto.RegisterType((*StatusDetails)(nil), "k8s.io.apimachinery.pkg.apis.meta.v1.StatusDetails")
+	proto.RegisterType((*Time)(nil), "k8s.io.apimachinery.pkg.apis.meta.v1.Time")
+	proto.RegisterType((*Timestamp)(nil), "k8s.io.apimachinery.pkg.apis.meta.v1.Timestamp")
+	proto.RegisterType((*TypeMeta)(nil), "k8s.io.apimachinery.pkg.apis.meta.v1.TypeMeta")
+	proto.RegisterType((*Verbs)(nil), "k8s.io.apimachinery.pkg.apis.meta.v1.Verbs")
+	proto.RegisterType((*WatchEvent)(nil), "k8s.io.apimachinery.pkg.apis.meta.v1.WatchEvent")
 }
 func (m *APIGroup) Marshal() (data []byte, err error) {
 	size := m.Size()
@@ -1750,7 +1750,7 @@ func (this *WatchEvent) String() string {
 	}
 	s := strings.Join([]string{`&WatchEvent{`,
 		`Type:` + fmt.Sprintf("%v", this.Type) + `,`,
-		`Object:` + strings.Replace(strings.Replace(this.Object.String(), "RawExtension", "k8s_io_kubernetes_pkg_runtime.RawExtension", 1), `&`, ``, 1) + `,`,
+		`Object:` + strings.Replace(strings.Replace(this.Object.String(), "RawExtension", "k8s_io_apimachinery_pkg_runtime.RawExtension", 1), `&`, ``, 1) + `,`,
 		`}`,
 	}, "")
 	return s
@@ -3891,7 +3891,7 @@ func (m *OwnerReference) Unmarshal(data []byte) error {
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
-			m.UID = k8s_io_kubernetes_pkg_types.UID(data[iNdEx:postIndex])
+			m.UID = k8s_io_apimachinery_pkg_types.UID(data[iNdEx:postIndex])
 			iNdEx = postIndex
 		case 5:
 			if wireType != 2 {
@@ -5184,105 +5184,107 @@ var (
 )
 
 var fileDescriptorGenerated = []byte{
-	// 1598 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xcc, 0x58, 0x4f, 0x6f, 0x1b, 0x45,
-	0x14, 0xf7, 0xda, 0xb1, 0x6b, 0x3f, 0xc7, 0x4d, 0xba, 0xa4, 0xc2, 0x8d, 0x84, 0x1d, 0xb6, 0x08,
-	0xa5, 0xa2, 0x5d, 0x2b, 0x11, 0x42, 0x55, 0xa1, 0x88, 0x6c, 0x92, 0x56, 0xa1, 0x4d, 0x13, 0x4d,
-	0xfa, 0x07, 0x95, 0x1e, 0xd8, 0x78, 0x27, 0xce, 0x36, 0xf6, 0xee, 0x32, 0x33, 0x76, 0x63, 0x71,
-	0xa0, 0x82, 0x0b, 0x07, 0x84, 0x7a, 0x44, 0x1c, 0x50, 0x23, 0xf1, 0x01, 0xf8, 0x0a, 0xdc, 0x7a,
-	0xa3, 0xdc, 0x38, 0x20, 0x8b, 0x06, 0x71, 0xe2, 0x1b, 0xe4, 0x84, 0x66, 0x76, 0x66, 0xbd, 0x76,
-	0xe2, 0x66, 0xa3, 0x72, 0xe0, 0x14, 0xcf, 0xfb, 0xf3, 0x7b, 0x6f, 0xde, 0xfc, 0xe6, 0xcd, 0xdb,
-	0xc0, 0xfc, 0xce, 0x65, 0x6a, 0xba, 0x7e, 0x6d, 0xa7, 0xbd, 0x89, 0x89, 0x87, 0x19, 0xa6, 0xb5,
-	0x60, 0xa7, 0x51, 0xb3, 0x03, 0x97, 0xd6, 0x5a, 0x98, 0xd9, 0xb5, 0xce, 0x5c, 0xad, 0x81, 0x3d,
-	0x4c, 0x6c, 0x86, 0x1d, 0x33, 0x20, 0x3e, 0xf3, 0x75, 0x23, 0xf4, 0x31, 0xfb, 0x3e, 0x66, 0xb0,
-	0xd3, 0x30, 0xb9, 0x8f, 0xc9, 0x7d, 0xcc, 0xce, 0xdc, 0xf4, 0xa5, 0x86, 0xcb, 0xb6, 0xdb, 0x9b,
-	0x66, 0xdd, 0x6f, 0xd5, 0x1a, 0x7e, 0xc3, 0xaf, 0x09, 0xd7, 0xcd, 0xf6, 0x96, 0x58, 0x89, 0x85,
-	0xf8, 0x15, 0x42, 0x4e, 0x5f, 0x3a, 0x3a, 0x0d, 0xd2, 0xf6, 0x98, 0xdb, 0xc2, 0xc3, 0x19, 0x4c,
-	0xbf, 0xfb, 0x72, 0x73, 0x5a, 0xdf, 0xc6, 0x2d, 0xfb, 0x90, 0xd7, 0xdc, 0xd1, 0x5e, 0x6d, 0xe6,
-	0x36, 0x6b, 0xae, 0xc7, 0x28, 0x23, 0xc3, 0x2e, 0xc6, 0x2f, 0x19, 0xc8, 0x2f, 0xac, 0xaf, 0x5c,
-	0x27, 0x7e, 0x3b, 0xd0, 0x67, 0x60, 0xcc, 0xb3, 0x5b, 0xb8, 0xac, 0xcd, 0x68, 0xb3, 0x05, 0x6b,
-	0xfc, 0x59, 0xaf, 0x9a, 0xda, 0xef, 0x55, 0xc7, 0x6e, 0xd9, 0x2d, 0x8c, 0x84, 0x46, 0x7f, 0x08,
-	0xf9, 0x0e, 0x26, 0xd4, 0xf5, 0x3d, 0x5a, 0x4e, 0xcf, 0x64, 0x66, 0x8b, 0xf3, 0x1f, 0x98, 0xc7,
-	0x17, 0xcb, 0x14, 0xf0, 0x77, 0x43, 0xc7, 0x6b, 0x3e, 0x59, 0x72, 0x69, 0xdd, 0xef, 0x60, 0xd2,
-	0xb5, 0x26, 0x65, 0x8c, 0xbc, 0x54, 0x52, 0x14, 0xe1, 0xeb, 0x5f, 0x69, 0x30, 0x19, 0x10, 0xbc,
-	0x85, 0x09, 0xc1, 0x8e, 0xd4, 0x97, 0x33, 0x33, 0xda, 0x2b, 0x07, 0x2d, 0xcb, 0xa0, 0x93, 0xeb,
-	0x43, 0xe8, 0xe8, 0x50, 0x3c, 0x7d, 0x4f, 0x83, 0x69, 0x8a, 0x49, 0x07, 0x93, 0x05, 0xc7, 0x21,
-	0x98, 0x52, 0xab, 0xbb, 0xd8, 0x74, 0xb1, 0xc7, 0x16, 0x57, 0x96, 0x10, 0x2d, 0x8f, 0x89, 0x1a,
-	0x5c, 0x4d, 0x92, 0xce, 0xc6, 0x28, 0x14, 0xcb, 0x90, 0xf9, 0x4c, 0x8f, 0x34, 0xa1, 0xe8, 0x25,
-	0x49, 0x18, 0x0e, 0x8c, 0xab, 0x23, 0xbc, 0xe9, 0x52, 0xa6, 0xdf, 0x86, 0x5c, 0x83, 0x2f, 0x68,
-	0x59, 0x13, 0xe9, 0x5d, 0x4c, 0x92, 0x9e, 0x42, 0xb0, 0x4e, 0xcb, 0x6c, 0x72, 0x62, 0x49, 0x91,
-	0xc4, 0x32, 0x7e, 0xd3, 0xa0, 0xb8, 0xb0, 0xbe, 0x82, 0x30, 0xf5, 0xdb, 0xa4, 0x8e, 0x13, 0x90,
-	0x65, 0x1e, 0x80, 0xff, 0xa5, 0x81, 0x5d, 0xc7, 0x4e, 0x39, 0x3d, 0xa3, 0xcd, 0xe6, 0x2d, 0x5d,
-	0xda, 0xc1, 0xad, 0x48, 0x83, 0x62, 0x56, 0x1c, 0x75, 0xc7, 0xf5, 0x1c, 0x71, 0xce, 0x31, 0xd4,
-	0x1b, 0xae, 0xe7, 0x20, 0xa1, 0xd1, 0x3f, 0x86, 0x6c, 0x07, 0x93, 0x4d, 0x5e, 0x7b, 0x4e, 0x85,
-	0x0b, 0x49, 0x36, 0x77, 0x97, 0x3b, 0x58, 0x85, 0xfd, 0x5e, 0x35, 0x2b, 0x7e, 0xa2, 0x10, 0xc2,
-	0xf8, 0x59, 0x83, 0x89, 0xd8, 0x9e, 0x44, 0xf5, 0x2e, 0xc3, 0x78, 0x23, 0xc6, 0x1c, 0xb9, 0xbf,
-	0x29, 0x99, 0xc9, 0x78, 0x9c, 0x55, 0x68, 0xc0, 0x52, 0xaf, 0x43, 0x81, 0x48, 0x24, 0x75, 0x3b,
-	0x6a, 0x09, 0x4b, 0xaf, 0x32, 0xe8, 0xc7, 0x89, 0x09, 0x29, 0xea, 0xe3, 0x1a, 0x7f, 0x87, 0xc7,
-	0xa0, 0xee, 0x8b, 0x3e, 0x1b, 0xbb, 0x91, 0xfc, 0xb8, 0x0b, 0xd6, 0xf8, 0x88, 0xfb, 0x74, 0x0c,
-	0x95, 0xd3, 0xff, 0x03, 0x2a, 0x5f, 0xc9, 0x7f, 0xff, 0xb4, 0x9a, 0x7a, 0xfc, 0xc7, 0x4c, 0xca,
-	0x58, 0x81, 0xfc, 0x52, 0x9b, 0xd8, 0x8c, 0x17, 0xf6, 0x2a, 0xe4, 0x1d, 0xf9, 0x5b, 0x1c, 0x47,
-	0xc6, 0x7a, 0x53, 0xf5, 0x0d, 0x65, 0x73, 0xd0, 0xab, 0x96, 0x78, 0x6b, 0x34, 0x95, 0x00, 0x45,
-	0x2e, 0xc6, 0x03, 0x28, 0x2d, 0xef, 0x06, 0x3e, 0x61, 0x6b, 0x01, 0x13, 0x95, 0x78, 0x1b, 0x72,
-	0x58, 0x08, 0x04, 0x5a, 0xbe, 0x4f, 0xf9, 0xd0, 0x0c, 0x49, 0xad, 0x7e, 0x1e, 0xb2, 0x78, 0xd7,
-	0xae, 0x33, 0xc9, 0xdd, 0x92, 0x34, 0xcb, 0x2e, 0x73, 0x21, 0x0a, 0x75, 0xc6, 0x1a, 0xc0, 0x75,
-	0x1c, 0x41, 0x2f, 0xc0, 0x84, 0x3a, 0xab, 0x41, 0x02, 0xbd, 0x2e, 0x9d, 0x27, 0xd0, 0xa0, 0x1a,
-	0x0d, 0xdb, 0x1b, 0x0f, 0xa0, 0x20, 0x48, 0xc6, 0x39, 0xcf, 0x53, 0x10, 0x1c, 0x93, 0x28, 0x51,
-	0x0a, 0xc2, 0x02, 0x85, 0xba, 0xe8, 0xd2, 0xa4, 0x47, 0x5d, 0x9a, 0x58, 0x5d, 0x9b, 0x50, 0x0a,
-	0x7d, 0xd5, 0x3d, 0x4e, 0x14, 0xe1, 0x22, 0xe4, 0x55, 0x9a, 0x32, 0x4a, 0xd4, 0xb9, 0x15, 0x10,
-	0x8a, 0x2c, 0x62, 0xd1, 0xb6, 0x61, 0xe0, 0xc2, 0x24, 0x0b, 0x76, 0x01, 0x4e, 0x49, 0xd2, 0xca,
-	0x58, 0x13, 0xd2, 0xec, 0x94, 0xaa, 0x99, 0xd2, 0xc7, 0x22, 0x7d, 0x09, 0xe5, 0x51, 0x0d, 0xff,
-	0x15, 0xae, 0x74, 0xf2, 0x54, 0x8c, 0xef, 0x34, 0x98, 0x8c, 0x23, 0x25, 0x3f, 0xbe, 0xe4, 0x41,
-	0x8e, 0x6f, 0x8f, 0xb1, 0x8a, 0xfc, 0xa8, 0xc1, 0xd4, 0xc0, 0xd6, 0x4e, 0x74, 0xe2, 0x27, 0x48,
-	0x2a, 0x4e, 0x8e, 0xcc, 0x09, 0xc8, 0xf1, 0x6b, 0x1a, 0x4a, 0x37, 0xed, 0x4d, 0xdc, 0xdc, 0xc0,
-	0x4d, 0x5c, 0x67, 0x3e, 0xd1, 0xbb, 0x50, 0x6c, 0xd9, 0xac, 0xbe, 0x2d, 0xa4, 0xea, 0xf9, 0xb2,
-	0x92, 0xb4, 0xa4, 0x01, 0x1c, 0x73, 0xb5, 0x0f, 0xb2, 0xec, 0x31, 0xd2, 0xb5, 0x5e, 0x93, 0x09,
-	0x15, 0x63, 0x1a, 0x14, 0x8f, 0x25, 0xa6, 0x0d, 0xb1, 0x5e, 0xde, 0x0d, 0x78, 0x5f, 0x3a, 0xe9,
-	0x88, 0x33, 0x90, 0x00, 0xc2, 0x9f, 0xb7, 0x5d, 0x82, 0x5b, 0xd8, 0x63, 0xfd, 0x69, 0x63, 0x75,
-	0x08, 0x1d, 0x1d, 0x8a, 0x37, 0xfd, 0x21, 0x4c, 0x0e, 0xa7, 0xae, 0x4f, 0x42, 0x66, 0x07, 0x77,
-	0xc3, 0xb3, 0x42, 0xfc, 0xa7, 0x3e, 0x05, 0xd9, 0x8e, 0xdd, 0x6c, 0xcb, 0x9b, 0x88, 0xc2, 0xc5,
-	0x95, 0xf4, 0x65, 0xcd, 0xf8, 0x49, 0x83, 0xf2, 0xa8, 0x44, 0xf4, 0x37, 0x62, 0x40, 0x56, 0x51,
-	0x66, 0x95, 0xb9, 0x81, 0xbb, 0x21, 0xea, 0x32, 0xe4, 0xfd, 0x80, 0xcf, 0x86, 0x3e, 0x91, 0x27,
-	0x7e, 0x41, 0x9d, 0xe2, 0x9a, 0x94, 0x1f, 0xf4, 0xaa, 0x67, 0x07, 0xe0, 0x95, 0x02, 0x45, 0xae,
-	0xba, 0x01, 0x39, 0x91, 0x0f, 0x2d, 0x67, 0xc4, 0x6b, 0x04, 0xbc, 0xaf, 0xde, 0x15, 0x12, 0x24,
-	0x35, 0xc6, 0x17, 0x90, 0xe7, 0x4f, 0xed, 0x2a, 0x66, 0x36, 0x27, 0x0f, 0xc5, 0xcd, 0xad, 0x9b,
-	0xae, 0xb7, 0x23, 0x53, 0x8b, 0xc8, 0xb3, 0x21, 0xe5, 0x28, 0xb2, 0x38, 0xaa, 0xbd, 0xa6, 0x4f,
-	0xd8, 0x5e, 0x0f, 0x34, 0x38, 0xbd, 0xf6, 0xc8, 0xc3, 0x04, 0xf1, 0x51, 0x0f, 0x7b, 0xe1, 0x28,
-	0x23, 0x6e, 0x95, 0x36, 0x72, 0xe8, 0x50, 0xc3, 0x4e, 0x66, 0xe4, 0xb0, 0xf3, 0x11, 0x64, 0xda,
-	0xae, 0x23, 0x86, 0x92, 0x82, 0x65, 0xaa, 0xea, 0xde, 0x59, 0x59, 0x3a, 0xe8, 0x55, 0xab, 0x47,
-	0xcf, 0xe5, 0xac, 0x1b, 0x60, 0x6a, 0xde, 0x59, 0x59, 0x42, 0xdc, 0x95, 0x8f, 0x4b, 0x76, 0xe0,
-	0xaa, 0x6d, 0x65, 0x05, 0x50, 0x34, 0x2e, 0xf5, 0x9f, 0x7c, 0x14, 0xb3, 0xd2, 0x4d, 0x80, 0xba,
-	0xef, 0x31, 0xe2, 0x37, 0x9b, 0x98, 0x94, 0x73, 0xe1, 0x6b, 0xc6, 0xed, 0x17, 0x23, 0x29, 0x8a,
-	0x59, 0x18, 0x17, 0xa1, 0x80, 0x7c, 0x9f, 0xad, 0xdb, 0x6c, 0x9b, 0xea, 0x55, 0xc8, 0x06, 0xfc,
-	0x87, 0x9c, 0x1b, 0xc4, 0x78, 0x24, 0x34, 0x28, 0x94, 0x1b, 0xdf, 0x6a, 0x70, 0x6e, 0xe4, 0x43,
-	0xce, 0xf3, 0xad, 0x47, 0x2b, 0x59, 0xbb, 0x28, 0xdf, 0xbe, 0x1d, 0x8a, 0x59, 0xe9, 0xef, 0x43,
-	0x69, 0xe0, 0xf5, 0x97, 0xa7, 0x77, 0x56, 0xba, 0x95, 0x06, 0xa2, 0xa1, 0x41, 0x5b, 0xe3, 0x9f,
-	0x34, 0xe4, 0x36, 0x98, 0xcd, 0xda, 0x54, 0xbf, 0x0f, 0x79, 0x7e, 0xf1, 0x1c, 0x9b, 0xd9, 0x22,
-	0x72, 0xc2, 0x21, 0x57, 0xb1, 0xae, 0xcf, 0x31, 0x25, 0x41, 0x11, 0x1e, 0x9f, 0x0e, 0xa8, 0x88,
-	0x22, 0x93, 0x8b, 0xa6, 0x83, 0x30, 0x36, 0x92, 0x5a, 0xde, 0x21, 0x5b, 0x98, 0x52, 0xbb, 0xa1,
-	0x68, 0x11, 0x75, 0xc8, 0xd5, 0x50, 0x8c, 0x94, 0x5e, 0x7f, 0x0f, 0x72, 0x04, 0xdb, 0xd4, 0xf7,
-	0x24, 0x3f, 0x2a, 0x0a, 0x12, 0x09, 0xe9, 0x41, 0xaf, 0x3a, 0x2e, 0xc1, 0xc5, 0x1a, 0x49, 0x6b,
-	0xfd, 0x13, 0x38, 0xe5, 0x60, 0x66, 0xbb, 0x4d, 0x2a, 0xf8, 0x50, 0x9c, 0x9f, 0x4b, 0x34, 0x9e,
-	0x09, 0xa8, 0xa5, 0xd0, 0xd1, 0x2a, 0xf2, 0x8c, 0xe4, 0x02, 0x29, 0x38, 0x4e, 0xe8, 0xba, 0xef,
-	0x60, 0x41, 0x99, 0x6c, 0x9f, 0xd0, 0x8b, 0xbe, 0x83, 0x91, 0xd0, 0x18, 0x4f, 0x34, 0x28, 0x86,
-	0x48, 0x8b, 0x76, 0x9b, 0x62, 0x7d, 0x2e, 0xda, 0x43, 0x78, 0xd4, 0xe7, 0x94, 0xcf, 0xed, 0x6e,
-	0x80, 0x0f, 0x7a, 0xd5, 0x82, 0x30, 0xe3, 0x8b, 0x28, 0xfd, 0x58, 0x85, 0xd2, 0xc7, 0x54, 0xe8,
-	0x3c, 0x64, 0xb7, 0x5c, 0xdc, 0x54, 0x2f, 0x5b, 0xf4, 0x26, 0x5d, 0xe3, 0x42, 0x14, 0xea, 0x8c,
-	0x1f, 0xd2, 0x50, 0x1a, 0xd8, 0x5c, 0x82, 0x8f, 0x90, 0xe8, 0xb1, 0x4b, 0x27, 0x18, 0xa0, 0x46,
-	0x7f, 0x75, 0xdc, 0x83, 0x5c, 0x9d, 0xef, 0x4f, 0x7d, 0xf2, 0xd5, 0x92, 0x1f, 0x84, 0xa8, 0x4b,
-	0x9f, 0x45, 0x62, 0x49, 0x91, 0x84, 0xd3, 0xaf, 0xc3, 0x19, 0x82, 0x19, 0xe9, 0x2e, 0x6c, 0x31,
-	0x4c, 0x36, 0x70, 0xdd, 0xf7, 0x9c, 0xf0, 0xb0, 0xb3, 0x51, 0x85, 0xcf, 0xa0, 0x61, 0x03, 0x74,
-	0xd8, 0xc7, 0x68, 0xc2, 0xd8, 0x6d, 0xb7, 0x85, 0x79, 0xd1, 0xa9, 0x84, 0x09, 0x67, 0xe5, 0xa8,
-	0xe8, 0xca, 0x59, 0xe9, 0x79, 0x6d, 0x3c, 0xdb, 0xf3, 0x43, 0xa2, 0x67, 0xfb, 0xb5, 0xb9, 0xc5,
-	0x85, 0x28, 0xd4, 0x5d, 0x99, 0xe2, 0xef, 0xf5, 0x37, 0x7b, 0xd5, 0xd4, 0x93, 0xbd, 0x6a, 0xea,
-	0xe9, 0x9e, 0x7c, 0xbb, 0x3f, 0x85, 0x02, 0x8f, 0x46, 0x99, 0xdd, 0x0a, 0xfe, 0xeb, 0x90, 0xc6,
-	0x67, 0x90, 0xe7, 0x3c, 0x12, 0xef, 0xc3, 0xf1, 0xbd, 0x79, 0xb0, 0x6f, 0xa6, 0x93, 0xf4, 0x4d,
-	0x63, 0x1e, 0xc2, 0x0f, 0x41, 0xde, 0x03, 0x5d, 0x86, 0x5b, 0x03, 0x3d, 0x70, 0x85, 0x0b, 0x50,
-	0x28, 0x8f, 0x8d, 0x2b, 0x5f, 0x6b, 0x00, 0xf7, 0xc4, 0x8b, 0xdd, 0xe1, 0xcf, 0xe9, 0x0c, 0x8c,
-	0xf1, 0x06, 0x3e, 0x9c, 0x98, 0xb8, 0x00, 0x42, 0xa3, 0x6f, 0x40, 0xce, 0xdf, 0x7c, 0x88, 0xe5,
-	0xf7, 0x43, 0x71, 0xfe, 0x9d, 0x11, 0x9c, 0x91, 0xff, 0xd5, 0x31, 0x91, 0xfd, 0x68, 0x79, 0x97,
-	0x61, 0x8f, 0x67, 0xd8, 0xe7, 0xcb, 0x9a, 0x80, 0x40, 0x12, 0xca, 0x7a, 0xeb, 0xd9, 0x8b, 0x4a,
-	0xea, 0xf9, 0x8b, 0x4a, 0xea, 0xf7, 0x17, 0x95, 0xd4, 0xe3, 0xfd, 0x8a, 0xf6, 0x6c, 0xbf, 0xa2,
-	0x3d, 0xdf, 0xaf, 0x68, 0x7f, 0xee, 0x57, 0xb4, 0x27, 0x7f, 0x55, 0x52, 0xf7, 0xd3, 0x9d, 0xb9,
-	0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0x94, 0x53, 0x56, 0x06, 0xf6, 0x12, 0x00, 0x00,
+	// 1628 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xcc, 0x58, 0xcf, 0x6f, 0x1b, 0xc5,
+	0x17, 0xf7, 0xda, 0xb1, 0x6b, 0x3f, 0xc7, 0x4d, 0xba, 0xdf, 0x54, 0x5f, 0x37, 0xd2, 0xd7, 0x4e,
+	0xb7, 0xd5, 0x57, 0xa9, 0x68, 0xd7, 0x24, 0x48, 0x55, 0x55, 0x44, 0x51, 0x36, 0x49, 0xab, 0xa8,
+	0x49, 0x13, 0x4d, 0xda, 0x20, 0x4a, 0x0f, 0x6c, 0xbc, 0x13, 0x67, 0x89, 0xbd, 0xbb, 0xcc, 0x8c,
+	0xdd, 0x58, 0x3d, 0xd0, 0x03, 0x48, 0x1c, 0x10, 0xea, 0x91, 0x03, 0x42, 0xad, 0xe0, 0x2f, 0xe0,
+	0x9f, 0xa0, 0xc7, 0x4a, 0xbd, 0x70, 0x40, 0x16, 0x0d, 0x07, 0x8e, 0xdc, 0x23, 0x0e, 0x68, 0x66,
+	0x67, 0xd6, 0x6b, 0xa7, 0x26, 0x1b, 0xd1, 0x03, 0xa7, 0x78, 0xde, 0x8f, 0xcf, 0x7b, 0xf3, 0xe6,
+	0x33, 0x6f, 0xde, 0x06, 0xd6, 0xf6, 0xae, 0x51, 0xd3, 0xf5, 0x6b, 0x7b, 0xed, 0x6d, 0x4c, 0x3c,
+	0xcc, 0x30, 0xad, 0x75, 0xb0, 0xe7, 0xf8, 0xa4, 0x26, 0x15, 0x76, 0xe0, 0xb6, 0xec, 0xfa, 0xae,
+	0xeb, 0x61, 0xd2, 0xad, 0x05, 0x7b, 0x0d, 0x2e, 0xa0, 0xb5, 0x16, 0x66, 0x76, 0xad, 0x33, 0x57,
+	0x6b, 0x60, 0x0f, 0x13, 0x9b, 0x61, 0xc7, 0x0c, 0x88, 0xcf, 0x7c, 0xfd, 0x62, 0xe8, 0x65, 0xc6,
+	0xbd, 0xcc, 0x60, 0xaf, 0xc1, 0x05, 0xd4, 0xe4, 0x5e, 0x66, 0x67, 0x6e, 0xfa, 0x4a, 0xc3, 0x65,
+	0xbb, 0xed, 0x6d, 0xb3, 0xee, 0xb7, 0x6a, 0x0d, 0xbf, 0xe1, 0xd7, 0x84, 0xf3, 0x76, 0x7b, 0x47,
+	0xac, 0xc4, 0x42, 0xfc, 0x0a, 0x41, 0xa7, 0x47, 0xa6, 0x42, 0xda, 0x1e, 0x73, 0x5b, 0x78, 0x38,
+	0x8b, 0xe9, 0xab, 0xc7, 0x39, 0xd0, 0xfa, 0x2e, 0x6e, 0xd9, 0x47, 0xfc, 0xe6, 0x8f, 0x16, 0x43,
+	0xee, 0xb8, 0x46, 0x30, 0xf5, 0xdb, 0xa4, 0x7e, 0x34, 0xd6, 0xdc, 0xeb, 0x7d, 0xda, 0xcc, 0x6d,
+	0xd6, 0x5c, 0x8f, 0x51, 0x46, 0x86, 0x5d, 0x8c, 0x9f, 0x32, 0x90, 0x5f, 0xd8, 0x58, 0xb9, 0x45,
+	0xfc, 0x76, 0xa0, 0xcf, 0xc0, 0x98, 0x67, 0xb7, 0x70, 0x59, 0x9b, 0xd1, 0x66, 0x0b, 0xd6, 0xf8,
+	0xf3, 0x5e, 0x35, 0x75, 0xd0, 0xab, 0x8e, 0xdd, 0xb1, 0x5b, 0x18, 0x09, 0x8d, 0xde, 0x84, 0x7c,
+	0x07, 0x13, 0xea, 0xfa, 0x1e, 0x2d, 0xa7, 0x67, 0x32, 0xb3, 0xc5, 0xf9, 0x1b, 0x66, 0x92, 0x32,
+	0x9b, 0x22, 0xc0, 0x56, 0xe8, 0x7a, 0xd3, 0x27, 0x4b, 0x2e, 0xad, 0xfb, 0x1d, 0x4c, 0xba, 0xd6,
+	0xa4, 0x8c, 0x92, 0x97, 0x4a, 0x8a, 0xa2, 0x08, 0xfa, 0xe7, 0x1a, 0x4c, 0x06, 0x04, 0xef, 0x60,
+	0x42, 0xb0, 0x23, 0xf5, 0xe5, 0xcc, 0x8c, 0xf6, 0x06, 0xc2, 0x96, 0x65, 0xd8, 0xc9, 0x8d, 0x21,
+	0x7c, 0x74, 0x24, 0xa2, 0xfe, 0xbd, 0x06, 0xd3, 0x14, 0x93, 0x0e, 0x26, 0x0b, 0x8e, 0x43, 0x30,
+	0xa5, 0x56, 0x77, 0xb1, 0xe9, 0x62, 0x8f, 0x2d, 0xae, 0x2c, 0x21, 0x5a, 0x1e, 0x13, 0x75, 0x78,
+	0x3f, 0x59, 0x42, 0x9b, 0xa3, 0x70, 0x2c, 0x43, 0x66, 0x34, 0x3d, 0xd2, 0x84, 0xa2, 0xbf, 0x49,
+	0xc3, 0xd8, 0x81, 0x71, 0x75, 0x90, 0xab, 0x2e, 0x65, 0xfa, 0x16, 0xe4, 0x1a, 0x7c, 0x41, 0xcb,
+	0x9a, 0x48, 0xd0, 0x4c, 0x96, 0xa0, 0xc2, 0xb0, 0x4e, 0xcb, 0x7c, 0x72, 0x62, 0x49, 0x91, 0x44,
+	0x33, 0x5e, 0x6a, 0x50, 0x5c, 0xd8, 0x58, 0x41, 0x92, 0x84, 0x09, 0x48, 0x33, 0x0f, 0xc0, 0xff,
+	0xd2, 0xc0, 0xae, 0x63, 0xa7, 0x9c, 0x9e, 0xd1, 0x66, 0xf3, 0x96, 0x2e, 0xed, 0xe0, 0x4e, 0xa4,
+	0x41, 0x31, 0x2b, 0x8e, 0xba, 0xe7, 0x7a, 0x8e, 0x38, 0xed, 0x18, 0xea, 0x6d, 0xd7, 0x73, 0x90,
+	0xd0, 0xe8, 0xab, 0x90, 0xed, 0x60, 0xb2, 0xcd, 0xeb, 0xcf, 0x09, 0xf1, 0x56, 0xb2, 0xed, 0x6d,
+	0x71, 0x17, 0xab, 0x70, 0xd0, 0xab, 0x66, 0xc5, 0x4f, 0x14, 0x82, 0x18, 0x3f, 0x6a, 0x30, 0x11,
+	0xdb, 0x95, 0xa8, 0xe0, 0x35, 0x18, 0x6f, 0xc4, 0xf8, 0x23, 0x77, 0x38, 0x25, 0x73, 0x19, 0x8f,
+	0x73, 0x0b, 0x0d, 0x58, 0xea, 0x18, 0x0a, 0xea, 0x92, 0xaa, 0x7b, 0x32, 0x97, 0xb8, 0xfc, 0x2a,
+	0x87, 0x7e, 0xa4, 0x98, 0x90, 0xa2, 0x3e, 0xb2, 0xf1, 0x7b, 0x78, 0x14, 0xea, 0xe6, 0xe8, 0xb3,
+	0xb1, 0xdb, 0xc9, 0x0f, 0xbd, 0x60, 0x8d, 0x8f, 0xb8, 0x59, 0xc7, 0x50, 0x3a, 0xfd, 0xaf, 0xa0,
+	0xf4, 0xf5, 0xfc, 0x37, 0x4f, 0xab, 0xa9, 0xc7, 0xbf, 0xcc, 0xa4, 0x8c, 0x15, 0xc8, 0x2f, 0xb5,
+	0x89, 0xcd, 0x78, 0x71, 0xdf, 0x83, 0xbc, 0x23, 0x7f, 0x8b, 0x23, 0xc9, 0x58, 0xe7, 0x55, 0x0f,
+	0x51, 0x36, 0x87, 0xbd, 0x6a, 0x89, 0x37, 0x57, 0x53, 0x09, 0x50, 0xe4, 0x62, 0x3c, 0x80, 0xd2,
+	0xf2, 0x7e, 0xe0, 0x13, 0xb6, 0x1e, 0x30, 0x51, 0x8b, 0xff, 0x43, 0x0e, 0x0b, 0x81, 0x40, 0xcb,
+	0xf7, 0x89, 0x1f, 0x9a, 0x21, 0xa9, 0xd5, 0x2f, 0x40, 0x16, 0xef, 0xdb, 0x75, 0x26, 0x19, 0x5c,
+	0x92, 0x66, 0xd9, 0x65, 0x2e, 0x44, 0xa1, 0xce, 0x58, 0x07, 0xb8, 0x85, 0x23, 0xe8, 0x05, 0x98,
+	0x50, 0xa7, 0x35, 0x48, 0xa2, 0xff, 0x4a, 0xe7, 0x09, 0x34, 0xa8, 0x46, 0xc3, 0xf6, 0xc6, 0x03,
+	0x28, 0x08, 0xa2, 0x71, 0xe6, 0xf3, 0x14, 0x04, 0xcf, 0x24, 0x4a, 0x94, 0x82, 0xb0, 0x40, 0xa1,
+	0x2e, 0xba, 0x3a, 0xe9, 0x51, 0x57, 0x27, 0x56, 0xd7, 0x26, 0x94, 0x42, 0x5f, 0x75, 0x9b, 0x13,
+	0x45, 0xb8, 0x0c, 0x79, 0x95, 0xa6, 0x8c, 0x12, 0x75, 0x71, 0x05, 0x84, 0x22, 0x8b, 0x58, 0xb4,
+	0x5d, 0x18, 0xb8, 0x34, 0xc9, 0x82, 0x5d, 0x82, 0x53, 0x92, 0xb6, 0x32, 0xd6, 0x84, 0x34, 0x3b,
+	0xa5, 0x6a, 0xa6, 0xf4, 0xb1, 0x48, 0x9f, 0x41, 0x79, 0x54, 0xeb, 0xff, 0x07, 0xd7, 0x3a, 0x79,
+	0x2a, 0xc6, 0xd7, 0x1a, 0x4c, 0xc6, 0x91, 0x92, 0x1f, 0x5f, 0xf2, 0x20, 0xc7, 0x37, 0xc9, 0x58,
+	0x45, 0xbe, 0xd3, 0x60, 0x6a, 0x60, 0x6b, 0x27, 0x3a, 0xf1, 0x13, 0x24, 0x15, 0x27, 0x47, 0xe6,
+	0x04, 0xe4, 0x78, 0x99, 0x86, 0xd2, 0xaa, 0xbd, 0x8d, 0x9b, 0x9b, 0xb8, 0x89, 0xeb, 0xcc, 0x27,
+	0xfa, 0x23, 0x28, 0xb6, 0x6c, 0x56, 0xdf, 0x15, 0x52, 0xf5, 0x8c, 0x2d, 0x25, 0x6b, 0x4a, 0x03,
+	0x48, 0xe6, 0x5a, 0x1f, 0x66, 0xd9, 0x63, 0xa4, 0x6b, 0xfd, 0x47, 0xa6, 0x54, 0x8c, 0x69, 0x50,
+	0x3c, 0x9a, 0x98, 0x3d, 0xc4, 0x7a, 0x79, 0x3f, 0xe0, 0x9d, 0xe9, 0xe4, 0x23, 0xcf, 0x40, 0x0a,
+	0x08, 0x7f, 0xda, 0x76, 0x09, 0x6e, 0x61, 0x8f, 0xf5, 0x67, 0x8f, 0xb5, 0x21, 0x7c, 0x74, 0x24,
+	0xe2, 0xf4, 0x0d, 0x98, 0x1c, 0x4e, 0x5e, 0x9f, 0x84, 0xcc, 0x1e, 0xee, 0x86, 0xe7, 0x85, 0xf8,
+	0x4f, 0x7d, 0x0a, 0xb2, 0x1d, 0xbb, 0xd9, 0x96, 0xb7, 0x11, 0x85, 0x8b, 0xeb, 0xe9, 0x6b, 0x9a,
+	0xf1, 0x83, 0x06, 0xe5, 0x51, 0x89, 0xe8, 0xff, 0x8b, 0x01, 0x59, 0x45, 0x99, 0x55, 0xe6, 0x36,
+	0xee, 0x86, 0xa8, 0xcb, 0x90, 0xf7, 0x03, 0x3e, 0x2d, 0xfa, 0x44, 0x9e, 0xfa, 0x25, 0x75, 0x92,
+	0xeb, 0x52, 0x7e, 0xd8, 0xab, 0x9e, 0x1d, 0x80, 0x57, 0x0a, 0x14, 0xb9, 0xea, 0x06, 0xe4, 0x44,
+	0x3e, 0xb4, 0x9c, 0x11, 0x6f, 0x12, 0xf0, 0xde, 0xba, 0x25, 0x24, 0x48, 0x6a, 0x8c, 0x47, 0x90,
+	0xe7, 0x4f, 0xee, 0x1a, 0x66, 0x36, 0x27, 0x10, 0xc5, 0xcd, 0x9d, 0x55, 0xd7, 0xdb, 0x93, 0xa9,
+	0x45, 0x04, 0xda, 0x94, 0x72, 0x14, 0x59, 0xbc, 0xae, 0xc5, 0xa6, 0x4f, 0xd8, 0x62, 0xff, 0xd4,
+	0xe0, 0xf4, 0xfa, 0x43, 0x0f, 0x13, 0xc4, 0x07, 0x3f, 0xec, 0x85, 0x43, 0x8d, 0xb8, 0x59, 0xda,
+	0xc8, 0xf1, 0x43, 0x8d, 0x3d, 0x99, 0x91, 0x63, 0x8f, 0x05, 0x99, 0xb6, 0xeb, 0x88, 0xf1, 0xa4,
+	0x60, 0xbd, 0xad, 0xaa, 0x7b, 0x6f, 0x65, 0xe9, 0xb0, 0x57, 0x3d, 0x3f, 0xea, 0xab, 0x80, 0x75,
+	0x03, 0x4c, 0xcd, 0x7b, 0x2b, 0x4b, 0x88, 0x3b, 0xf3, 0xd1, 0xc9, 0x0e, 0x5c, 0xb5, 0xb1, 0xac,
+	0x80, 0x8a, 0x46, 0xa7, 0xfe, 0xd3, 0x8f, 0x62, 0x56, 0xba, 0x09, 0x50, 0xf7, 0x3d, 0x46, 0xfc,
+	0x66, 0x13, 0x93, 0x72, 0x2e, 0x7c, 0xd3, 0xb8, 0xfd, 0x62, 0x24, 0x45, 0x31, 0x0b, 0xe3, 0x32,
+	0x14, 0x90, 0xef, 0xb3, 0x0d, 0x9b, 0xed, 0x52, 0xbd, 0x0a, 0xd9, 0x80, 0xff, 0x90, 0xf3, 0x83,
+	0x18, 0x94, 0x84, 0x06, 0x85, 0x72, 0xe3, 0x2b, 0x0d, 0xce, 0x8d, 0x7c, 0xce, 0x79, 0xbe, 0xf5,
+	0x68, 0x25, 0xab, 0x17, 0xe5, 0xdb, 0xb7, 0x43, 0x31, 0x2b, 0xfd, 0x5d, 0x28, 0x0d, 0xcc, 0x00,
+	0xf2, 0xfc, 0xce, 0x4a, 0xb7, 0xd2, 0x40, 0x34, 0x34, 0x68, 0x6b, 0xfc, 0x91, 0x86, 0xdc, 0x26,
+	0xb3, 0x59, 0x9b, 0xea, 0x0f, 0x20, 0xcf, 0xaf, 0x9e, 0x63, 0x33, 0x5b, 0x44, 0x4e, 0x3c, 0xf2,
+	0x2a, 0xe6, 0xf5, 0x79, 0xa6, 0x24, 0x28, 0x42, 0xe4, 0x53, 0x02, 0x15, 0x71, 0x64, 0x7a, 0xd1,
+	0x94, 0x10, 0x46, 0x47, 0x52, 0xcb, 0x3b, 0x65, 0x0b, 0x53, 0x6a, 0x37, 0x14, 0x35, 0xa2, 0x4e,
+	0xb9, 0x16, 0x8a, 0x91, 0xd2, 0xeb, 0x57, 0x21, 0x47, 0xb0, 0x4d, 0x7d, 0x4f, 0x72, 0xa4, 0xa2,
+	0x20, 0x91, 0x90, 0x1e, 0xf6, 0xaa, 0xe3, 0x12, 0x5c, 0xac, 0x91, 0xb4, 0xd6, 0xef, 0xc3, 0x29,
+	0x07, 0x33, 0xdb, 0x6d, 0x52, 0xc1, 0x88, 0xe2, 0xfc, 0x3b, 0x09, 0x07, 0x35, 0x01, 0xb6, 0x14,
+	0xba, 0x5a, 0x45, 0x9e, 0x93, 0x5c, 0x20, 0x05, 0xc8, 0x69, 0x5d, 0xf7, 0x1d, 0x2c, 0x68, 0x93,
+	0xed, 0xd3, 0x7a, 0xd1, 0x77, 0x30, 0x12, 0x1a, 0xe3, 0x89, 0x06, 0xc5, 0x10, 0x69, 0xd1, 0x6e,
+	0x53, 0xac, 0xcf, 0x45, 0xbb, 0x08, 0x8f, 0xfb, 0x9c, 0xf2, 0xb9, 0xdb, 0x0d, 0xf0, 0x61, 0xaf,
+	0x5a, 0x10, 0x66, 0x7c, 0x11, 0x6d, 0x20, 0x56, 0xa3, 0xf4, 0x31, 0x35, 0xba, 0x00, 0xd9, 0x1d,
+	0x17, 0x37, 0xd5, 0x1b, 0x17, 0xbd, 0x4e, 0x37, 0xb9, 0x10, 0x85, 0x3a, 0xe3, 0xdb, 0x34, 0x94,
+	0x06, 0x36, 0x97, 0xe0, 0xa3, 0x24, 0x7a, 0xf6, 0xd2, 0x09, 0x46, 0xa9, 0xd1, 0x5f, 0x21, 0x1f,
+	0x42, 0xae, 0xce, 0xf7, 0xa7, 0x3e, 0x03, 0xe7, 0x4e, 0x72, 0x14, 0xa2, 0x32, 0x7d, 0x26, 0x89,
+	0x25, 0x45, 0x12, 0x50, 0xbf, 0x05, 0x67, 0x08, 0x66, 0xa4, 0xbb, 0xb0, 0xc3, 0x30, 0xd9, 0xc4,
+	0x75, 0xdf, 0x73, 0xc2, 0x03, 0xcf, 0x46, 0x35, 0x3e, 0x83, 0x86, 0x0d, 0xd0, 0x51, 0x1f, 0xa3,
+	0x09, 0x63, 0x77, 0xdd, 0x16, 0xe6, 0x65, 0xa7, 0x12, 0x26, 0x9c, 0x9b, 0xa3, 0xb2, 0x2b, 0x67,
+	0xa5, 0xe7, 0xd5, 0xf1, 0x6c, 0xcf, 0x0f, 0xc9, 0x9e, 0xed, 0x57, 0xe7, 0x0e, 0x17, 0xa2, 0x50,
+	0x77, 0x7d, 0x8a, 0xbf, 0xdd, 0x5f, 0x3e, 0xab, 0xa6, 0x9e, 0x3c, 0xab, 0xa6, 0x9e, 0x3e, 0x93,
+	0xef, 0xf8, 0x47, 0x50, 0xe0, 0xd1, 0x28, 0xb3, 0x5b, 0xc1, 0x9b, 0x0e, 0x69, 0x7c, 0x0c, 0x79,
+	0xce, 0x24, 0xf1, 0x4e, 0x1c, 0xdf, 0xa3, 0x07, 0xbb, 0x67, 0x3a, 0x49, 0xf7, 0x34, 0xe6, 0x21,
+	0xfc, 0x30, 0xe4, 0x9d, 0xd0, 0x65, 0xb8, 0x35, 0xd0, 0x09, 0x57, 0xb8, 0x00, 0x85, 0xf2, 0xd8,
+	0xe8, 0xf2, 0x85, 0x06, 0xf0, 0x81, 0x78, 0xb9, 0x3b, 0xfc, 0x59, 0x9d, 0x81, 0x31, 0xde, 0xc6,
+	0x87, 0x13, 0x13, 0x57, 0x40, 0x68, 0xf4, 0x7b, 0x90, 0xf3, 0xb7, 0x3f, 0xc1, 0xf2, 0x5b, 0xa2,
+	0x38, 0x7f, 0x65, 0x24, 0x6b, 0xe4, 0x7f, 0x89, 0x4c, 0x64, 0x3f, 0x5c, 0xde, 0x67, 0xd8, 0xe3,
+	0x39, 0xf6, 0x19, 0xb3, 0x2e, 0x40, 0x90, 0x04, 0xb3, 0x2e, 0x3e, 0x7f, 0x55, 0x49, 0xbd, 0x78,
+	0x55, 0x49, 0xfd, 0xfc, 0xaa, 0x92, 0x7a, 0x7c, 0x50, 0xd1, 0x9e, 0x1f, 0x54, 0xb4, 0x17, 0x07,
+	0x15, 0xed, 0xd7, 0x83, 0x8a, 0xf6, 0xe4, 0xb7, 0x4a, 0xea, 0x7e, 0xba, 0x33, 0xf7, 0x57, 0x00,
+	0x00, 0x00, 0xff, 0xff, 0x1f, 0xa7, 0xfc, 0x28, 0x67, 0x13, 0x00, 0x00,
 }
diff --git a/staging/src/k8s.io/client-go/_vendor/k8s.io/apimachinery/pkg/apis/meta/v1/generated.proto b/staging/src/k8s.io/client-go/_vendor/k8s.io/apimachinery/pkg/apis/meta/v1/generated.proto
index cad0bf7e9e1..5dd45c38486 100644
--- a/staging/src/k8s.io/client-go/_vendor/k8s.io/apimachinery/pkg/apis/meta/v1/generated.proto
+++ b/staging/src/k8s.io/client-go/_vendor/k8s.io/apimachinery/pkg/apis/meta/v1/generated.proto
@@ -19,10 +19,11 @@ limitations under the License.
 
 syntax = 'proto2';
 
-package k8s.io.kubernetes.pkg.apis.meta.v1;
+package k8s.io.apimachinery.pkg.apis.meta.v1;
 
-import "k8s.io/kubernetes/pkg/runtime/generated.proto";
-import "k8s.io/kubernetes/pkg/runtime/schema/generated.proto";
+import "k8s.io/apimachinery/pkg/runtime/generated.proto";
+import "k8s.io/apimachinery/pkg/runtime/schema/generated.proto";
+import "k8s.io/kubernetes/pkg/api/resource/generated.proto";
 import "k8s.io/kubernetes/pkg/util/intstr/generated.proto";
 
 // Package-wide variables from generator "generated".
@@ -457,6 +458,6 @@ message WatchEvent {
   //  * If Type is Deleted: the state of the object immediately before deletion.
   //  * If Type is Error: *Status is recommended; other types may make sense
   //    depending on context.
-  optional k8s.io.kubernetes.pkg.runtime.RawExtension object = 2;
+  optional k8s.io.apimachinery.pkg.runtime.RawExtension object = 2;
 }
 
diff --git a/staging/src/k8s.io/client-go/_vendor/k8s.io/apimachinery/pkg/runtime/generated.pb.go b/staging/src/k8s.io/client-go/_vendor/k8s.io/apimachinery/pkg/runtime/generated.pb.go
index d59921c5cd8..426c3995598 100644
--- a/staging/src/k8s.io/client-go/_vendor/k8s.io/apimachinery/pkg/runtime/generated.pb.go
+++ b/staging/src/k8s.io/client-go/_vendor/k8s.io/apimachinery/pkg/runtime/generated.pb.go
@@ -15,14 +15,14 @@ limitations under the License.
 */
 
 // Code generated by protoc-gen-gogo.
-// source: k8s.io/apimachinery/pkg/runtime/generated.proto
+// source: k8s.io/kubernetes/vendor/k8s.io/apimachinery/pkg/runtime/generated.proto
 // DO NOT EDIT!
 
 /*
 	Package runtime is a generated protocol buffer package.
 
 	It is generated from these files:
-		k8s.io/apimachinery/pkg/runtime/generated.proto
+		k8s.io/kubernetes/vendor/k8s.io/apimachinery/pkg/runtime/generated.proto
 
 	It has these top-level messages:
 		RawExtension
@@ -62,9 +62,9 @@ func (*Unknown) ProtoMessage()               {}
 func (*Unknown) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{2} }
 
 func init() {
-	proto.RegisterType((*RawExtension)(nil), "k8s.io.client-go.pkg.runtime.RawExtension")
-	proto.RegisterType((*TypeMeta)(nil), "k8s.io.client-go.pkg.runtime.TypeMeta")
-	proto.RegisterType((*Unknown)(nil), "k8s.io.client-go.pkg.runtime.Unknown")
+	proto.RegisterType((*RawExtension)(nil), "k8s.io.apimachinery.pkg.runtime.RawExtension")
+	proto.RegisterType((*TypeMeta)(nil), "k8s.io.apimachinery.pkg.runtime.TypeMeta")
+	proto.RegisterType((*Unknown)(nil), "k8s.io.apimachinery.pkg.runtime.Unknown")
 }
 func (m *RawExtension) Marshal() (data []byte, err error) {
 	size := m.Size()
@@ -738,30 +738,31 @@ var (
 )
 
 var fileDescriptorGenerated = []byte{
-	// 388 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x7c, 0x90, 0x3f, 0x8f, 0xda, 0x30,
-	0x18, 0xc6, 0x13, 0x40, 0x82, 0x1a, 0x24, 0x2a, 0x77, 0x68, 0x8a, 0x54, 0x83, 0x58, 0x5a, 0x06,
-	0x6c, 0x15, 0xa9, 0x52, 0x57, 0x82, 0x18, 0xaa, 0xaa, 0x52, 0x65, 0x95, 0x0e, 0x9d, 0x1a, 0x12,
-	0x37, 0xb5, 0x52, 0xec, 0xc8, 0x71, 0x94, 0x76, 0xeb, 0x47, 0xe8, 0xc7, 0x62, 0x64, 0xbc, 0x09,
-	0x1d, 0xb9, 0xcf, 0x70, 0xfb, 0x09, 0x63, 0xfe, 0x1c, 0xa0, 0xdb, 0xe2, 0xf7, 0xf9, 0x3d, 0xcf,
-	0xfb, 0xbc, 0x01, 0xc3, 0xe4, 0x43, 0x86, 0xb9, 0x24, 0x49, 0x3e, 0x67, 0x4a, 0x30, 0xcd, 0x32,
-	0x92, 0x26, 0x31, 0x51, 0xb9, 0xd0, 0x7c, 0xc1, 0x48, 0xcc, 0x04, 0x53, 0x81, 0x66, 0x11, 0x4e,
-	0x95, 0xd4, 0x12, 0xbe, 0xde, 0xe1, 0xf8, 0x88, 0xe3, 0x34, 0x89, 0xb1, 0xc5, 0x3b, 0xc3, 0x98,
-	0xeb, 0x5f, 0xf9, 0x1c, 0x87, 0x72, 0x41, 0x62, 0x19, 0x4b, 0x62, 0x5c, 0xf3, 0xfc, 0xa7, 0x79,
-	0x99, 0x87, 0xf9, 0xda, 0xa5, 0x75, 0x46, 0xd7, 0x97, 0x07, 0x29, 0x27, 0x8a, 0x65, 0x32, 0x57,
-	0xe1, 0x45, 0x83, 0xce, 0xbb, 0xeb, 0x9e, 0x5c, 0xf3, 0xdf, 0x84, 0x0b, 0x9d, 0x69, 0x75, 0x6e,
-	0xe9, 0x0f, 0x40, 0x8b, 0x06, 0xc5, 0xf4, 0x8f, 0x66, 0x22, 0xe3, 0x52, 0xc0, 0x57, 0xa0, 0xaa,
-	0x82, 0xc2, 0x73, 0x7b, 0xee, 0xdb, 0x96, 0x5f, 0x2f, 0xd7, 0xdd, 0x2a, 0x0d, 0x0a, 0xba, 0x9d,
-	0xf5, 0x7f, 0x80, 0xc6, 0xd7, 0xbf, 0x29, 0xfb, 0xcc, 0x74, 0x00, 0x47, 0x00, 0x04, 0x29, 0xff,
-	0xc6, 0xd4, 0xd6, 0x64, 0xe8, 0x67, 0x3e, 0x5c, 0xae, 0xbb, 0x4e, 0xb9, 0xee, 0x82, 0xf1, 0x97,
-	0x8f, 0x56, 0xa1, 0x27, 0x14, 0xec, 0x81, 0x5a, 0xc2, 0x45, 0xe4, 0x55, 0x0c, 0xdd, 0xb2, 0x74,
-	0xed, 0x13, 0x17, 0x11, 0x35, 0x4a, 0xff, 0xde, 0x05, 0xf5, 0x99, 0x48, 0x84, 0x2c, 0x04, 0x9c,
-	0x81, 0x86, 0xb6, 0xdb, 0x4c, 0x7e, 0x73, 0xf4, 0x06, 0x3f, 0xf9, 0x83, 0xf1, 0xbe, 0x9c, 0xff,
-	0xdc, 0x46, 0x1f, 0xea, 0xd2, 0x43, 0xd4, 0xfe, 0xbe, 0xca, 0xe5, 0x7d, 0x70, 0x0c, 0xda, 0xa1,
-	0x14, 0x9a, 0x09, 0x3d, 0x15, 0xa1, 0x8c, 0xb8, 0x88, 0xbd, 0xaa, 0xa9, 0xfa, 0xd2, 0xe6, 0xb5,
-	0x27, 0x8f, 0x65, 0x7a, 0xce, 0xc3, 0xf7, 0xa0, 0x69, 0x47, 0xdb, 0xd5, 0x5e, 0xcd, 0xd8, 0x5f,
-	0x58, 0x7b, 0x73, 0x72, 0x94, 0xe8, 0x29, 0xe7, 0x0f, 0x96, 0x1b, 0xe4, 0xac, 0x36, 0xc8, 0xb9,
-	0xd9, 0x20, 0xe7, 0x5f, 0x89, 0xdc, 0x65, 0x89, 0xdc, 0x55, 0x89, 0xdc, 0xdb, 0x12, 0xb9, 0xff,
-	0xef, 0x90, 0xf3, 0xbd, 0x6e, 0x8f, 0x7c, 0x08, 0x00, 0x00, 0xff, 0xff, 0x32, 0xc1, 0x73, 0x2d,
-	0x94, 0x02, 0x00, 0x00,
+	// 406 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x84, 0x90, 0x4f, 0x8b, 0xd3, 0x40,
+	0x18, 0xc6, 0x93, 0x6d, 0xa1, 0xeb, 0xb4, 0xb0, 0x32, 0x1e, 0x8c, 0x3d, 0x4c, 0x96, 0x9e, 0xec,
+	0xc1, 0x19, 0x2c, 0x08, 0x5e, 0x37, 0xcb, 0x82, 0x22, 0x82, 0x0c, 0xfe, 0x01, 0x4f, 0x4e, 0x93,
+	0x31, 0x3b, 0xc4, 0xbe, 0x13, 0x26, 0x13, 0xe3, 0xde, 0xfc, 0x08, 0x7e, 0xac, 0x1e, 0xf7, 0xe8,
+	0xa9, 0xd8, 0xf8, 0x21, 0xbc, 0x4a, 0xa6, 0xd3, 0x5a, 0x5b, 0xc1, 0x5b, 0xe6, 0x7d, 0x9e, 0xdf,
+	0xf3, 0x3e, 0x6f, 0xd0, 0xb3, 0xe2, 0x69, 0x45, 0x95, 0x66, 0x45, 0x3d, 0x97, 0x06, 0xa4, 0x95,
+	0x15, 0xfb, 0x2c, 0x21, 0xd3, 0x86, 0x79, 0x41, 0x94, 0x6a, 0x21, 0xd2, 0x6b, 0x05, 0xd2, 0xdc,
+	0xb0, 0xb2, 0xc8, 0x99, 0xa9, 0xc1, 0xaa, 0x85, 0x64, 0xb9, 0x04, 0x69, 0x84, 0x95, 0x19, 0x2d,
+	0x8d, 0xb6, 0x1a, 0xc7, 0x1b, 0x80, 0xee, 0x03, 0xb4, 0x2c, 0x72, 0xea, 0x81, 0xf1, 0xa3, 0x5c,
+	0xd9, 0xeb, 0x7a, 0x4e, 0x53, 0xbd, 0x60, 0xb9, 0xce, 0x35, 0x73, 0xdc, 0xbc, 0xfe, 0xe8, 0x5e,
+	0xee, 0xe1, 0xbe, 0x36, 0x79, 0xe3, 0xd9, 0x71, 0xb3, 0x6e, 0xbd, 0x28, 0x15, 0x33, 0xb2, 0xd2,
+	0xb5, 0x49, 0x8f, 0x3a, 0x8c, 0x1f, 0xff, 0x9b, 0xa9, 0xad, 0xfa, 0xc4, 0x14, 0xd8, 0xca, 0x9a,
+	0x43, 0x64, 0x32, 0x45, 0x23, 0x2e, 0x9a, 0xab, 0x2f, 0x56, 0x42, 0xa5, 0x34, 0xe0, 0x07, 0xa8,
+	0x67, 0x44, 0x13, 0x85, 0xe7, 0xe1, 0xc3, 0x51, 0x32, 0x68, 0x57, 0x71, 0x8f, 0x8b, 0x86, 0x77,
+	0xb3, 0xc9, 0x07, 0x74, 0xfa, 0xfa, 0xa6, 0x94, 0x2f, 0xa5, 0x15, 0x78, 0x86, 0x90, 0x28, 0xd5,
+	0x5b, 0x69, 0x3a, 0xc8, 0xb9, 0xef, 0x24, 0x78, 0xb9, 0x8a, 0x83, 0x76, 0x15, 0xa3, 0x8b, 0x57,
+	0xcf, 0xbd, 0xc2, 0xf7, 0x5c, 0xf8, 0x1c, 0xf5, 0x0b, 0x05, 0x59, 0x74, 0xe2, 0xdc, 0x23, 0xef,
+	0xee, 0xbf, 0x50, 0x90, 0x71, 0xa7, 0x4c, 0x7e, 0x85, 0x68, 0xf0, 0x06, 0x0a, 0xd0, 0x0d, 0xe0,
+	0x77, 0xe8, 0xd4, 0xfa, 0x6d, 0x2e, 0x7f, 0x38, 0x9b, 0xd2, 0xff, 0xfc, 0x62, 0xba, 0xad, 0x97,
+	0xdc, 0xf5, 0xe1, 0xbb, 0xc2, 0x7c, 0x17, 0xb6, 0xbd, 0xf0, 0xe4, 0xf8, 0x42, 0x7c, 0x81, 0xce,
+	0x52, 0x0d, 0x56, 0x82, 0xbd, 0x82, 0x54, 0x67, 0x0a, 0xf2, 0xa8, 0xe7, 0xca, 0xde, 0xf7, 0x79,
+	0x67, 0x97, 0x7f, 0xcb, 0xfc, 0xd0, 0x8f, 0x9f, 0xa0, 0xa1, 0x1f, 0x75, 0xab, 0xa3, 0xbe, 0xc3,
+	0xef, 0x79, 0x7c, 0x78, 0xf9, 0x47, 0xe2, 0xfb, 0xbe, 0x64, 0xba, 0x5c, 0x93, 0xe0, 0x76, 0x4d,
+	0x82, 0xef, 0x6b, 0x12, 0x7c, 0x6d, 0x49, 0xb8, 0x6c, 0x49, 0x78, 0xdb, 0x92, 0xf0, 0x47, 0x4b,
+	0xc2, 0x6f, 0x3f, 0x49, 0xf0, 0x7e, 0xe0, 0x8f, 0xfc, 0x1d, 0x00, 0x00, 0xff, 0xff, 0xa5, 0x26,
+	0x55, 0x0f, 0xb3, 0x02, 0x00, 0x00,
 }
diff --git a/staging/src/k8s.io/client-go/_vendor/k8s.io/apimachinery/pkg/runtime/generated.proto b/staging/src/k8s.io/client-go/_vendor/k8s.io/apimachinery/pkg/runtime/generated.proto
index a2b0800b023..bf04aca1cea 100644
--- a/staging/src/k8s.io/client-go/_vendor/k8s.io/apimachinery/pkg/runtime/generated.proto
+++ b/staging/src/k8s.io/client-go/_vendor/k8s.io/apimachinery/pkg/runtime/generated.proto
@@ -19,7 +19,7 @@ limitations under the License.
 
 syntax = 'proto2';
 
-package k8s.io.kubernetes.pkg.runtime;
+package k8s.io.apimachinery.pkg.runtime;
 
 import "k8s.io/kubernetes/pkg/api/resource/generated.proto";
 import "k8s.io/kubernetes/pkg/util/intstr/generated.proto";
diff --git a/staging/src/k8s.io/client-go/_vendor/k8s.io/apimachinery/pkg/runtime/schema/generated.pb.go b/staging/src/k8s.io/client-go/_vendor/k8s.io/apimachinery/pkg/runtime/schema/generated.pb.go
index f882660842c..5525e13044c 100644
--- a/staging/src/k8s.io/client-go/_vendor/k8s.io/apimachinery/pkg/runtime/schema/generated.pb.go
+++ b/staging/src/k8s.io/client-go/_vendor/k8s.io/apimachinery/pkg/runtime/schema/generated.pb.go
@@ -15,14 +15,14 @@ limitations under the License.
 */
 
 // Code generated by protoc-gen-gogo.
-// source: k8s.io/apimachinery/pkg/runtime/schema/generated.proto
+// source: k8s.io/kubernetes/vendor/k8s.io/apimachinery/pkg/runtime/schema/generated.proto
 // DO NOT EDIT!
 
 /*
 	Package schema is a generated protocol buffer package.
 
 	It is generated from these files:
-		k8s.io/apimachinery/pkg/runtime/schema/generated.proto
+		k8s.io/kubernetes/vendor/k8s.io/apimachinery/pkg/runtime/schema/generated.proto
 
 	It has these top-level messages:
 */
@@ -42,17 +42,19 @@ var _ = math.Inf
 const _ = proto.GoGoProtoPackageIsVersion1
 
 var fileDescriptorGenerated = []byte{
-	// 183 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xe2, 0x32, 0xc9, 0xb6, 0x28, 0xd6,
-	0xcb, 0xcc, 0xd7, 0xcf, 0x2e, 0x4d, 0x4a, 0x2d, 0xca, 0x4b, 0x2d, 0x49, 0x2d, 0xd6, 0x2f, 0xc8,
-	0x4e, 0xd7, 0x2f, 0x2a, 0xcd, 0x2b, 0xc9, 0xcc, 0x4d, 0xd5, 0x2f, 0x4e, 0xce, 0x48, 0xcd, 0x4d,
-	0xd4, 0x4f, 0x4f, 0xcd, 0x4b, 0x2d, 0x4a, 0x2c, 0x49, 0x4d, 0xd1, 0x2b, 0x28, 0xca, 0x2f, 0xc9,
-	0x17, 0x52, 0x81, 0xe8, 0xd2, 0x43, 0xe8, 0xd2, 0x2b, 0xc8, 0x4e, 0xd7, 0x83, 0xea, 0xd2, 0x83,
-	0xe8, 0x92, 0xd2, 0x4d, 0xcf, 0x2c, 0xc9, 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xcf,
-	0x4f, 0xcf, 0xd7, 0x07, 0x6b, 0x4e, 0x2a, 0x4d, 0x03, 0xf3, 0xc0, 0x1c, 0x30, 0x0b, 0x62, 0xa8,
-	0x94, 0x21, 0x76, 0xa7, 0x94, 0x96, 0x64, 0xe6, 0xe8, 0x67, 0xe6, 0x95, 0x14, 0x97, 0x14, 0xa1,
-	0xbb, 0xc3, 0x49, 0xe3, 0xc4, 0x43, 0x39, 0x86, 0x0b, 0x0f, 0xe5, 0x18, 0x6e, 0x3c, 0x94, 0x63,
-	0x68, 0x78, 0x24, 0xc7, 0x78, 0xe2, 0x91, 0x1c, 0xe3, 0x85, 0x47, 0x72, 0x8c, 0x0f, 0x1e, 0xc9,
-	0x31, 0x4e, 0x78, 0x2c, 0xc7, 0x10, 0xc5, 0x06, 0x71, 0x0b, 0x20, 0x00, 0x00, 0xff, 0xff, 0x8d,
-	0x74, 0x75, 0xa7, 0xe8, 0x00, 0x00, 0x00,
+	// 215 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x6c, 0xce, 0xb1, 0x4e, 0xc4, 0x30,
+	0x0c, 0xc6, 0xf1, 0x76, 0x61, 0x60, 0x64, 0xec, 0xe0, 0x11, 0xb1, 0x10, 0x0b, 0x26, 0x66, 0x5e,
+	0x80, 0x9d, 0x2d, 0xed, 0x99, 0xd4, 0x2a, 0x8d, 0x23, 0xc7, 0x41, 0x62, 0xe3, 0x11, 0x78, 0xac,
+	0x1b, 0x6f, 0x64, 0xa4, 0xe5, 0x45, 0x10, 0xcd, 0x0d, 0xe8, 0x60, 0xcb, 0xa7, 0xe8, 0x67, 0xfd,
+	0xcf, 0x1f, 0xa6, 0xbb, 0xec, 0x58, 0x70, 0x2a, 0x3d, 0x69, 0x24, 0xa3, 0x8c, 0x2f, 0x14, 0x77,
+	0xa2, 0x78, 0xfc, 0xf0, 0x89, 0x67, 0x3f, 0x8c, 0x1c, 0x49, 0x5f, 0x31, 0x4d, 0x01, 0xb5, 0x44,
+	0xe3, 0x99, 0x30, 0x0f, 0x23, 0xcd, 0x1e, 0x03, 0x45, 0x52, 0x6f, 0xb4, 0x73, 0x49, 0xc5, 0xe4,
+	0xe2, 0xb2, 0x3a, 0xf7, 0xdb, 0xb9, 0x34, 0x05, 0x77, 0x74, 0xae, 0xba, 0xee, 0x3a, 0xb0, 0x8d,
+	0xa5, 0x77, 0x83, 0xcc, 0x18, 0x24, 0x08, 0x6e, 0xbc, 0x2f, 0x4f, 0xdb, 0xda, 0xc6, 0xf6, 0xaa,
+	0x67, 0xbb, 0xdb, 0xbf, 0x9d, 0x3f, 0x31, 0x3e, 0x31, 0x2a, 0x65, 0x29, 0x3a, 0xd0, 0x69, 0x4a,
+	0x77, 0xf3, 0xbf, 0x29, 0xc6, 0xcf, 0xc8, 0xd1, 0xb2, 0xe9, 0x29, 0xb9, 0xbf, 0xda, 0x2f, 0xd0,
+	0x1c, 0x16, 0x68, 0x3e, 0x16, 0x68, 0xde, 0x56, 0x68, 0xf7, 0x2b, 0xb4, 0x87, 0x15, 0xda, 0xcf,
+	0x15, 0xda, 0xf7, 0x2f, 0x68, 0x1e, 0xcf, 0x6a, 0xff, 0x77, 0x00, 0x00, 0x00, 0xff, 0xff, 0x86,
+	0xae, 0x35, 0x6c, 0x39, 0x01, 0x00, 0x00,
 }
diff --git a/staging/src/k8s.io/client-go/_vendor/k8s.io/apimachinery/pkg/runtime/schema/generated.proto b/staging/src/k8s.io/client-go/_vendor/k8s.io/apimachinery/pkg/runtime/schema/generated.proto
index 1563b39bea5..09e47011daf 100644
--- a/staging/src/k8s.io/client-go/_vendor/k8s.io/apimachinery/pkg/runtime/schema/generated.proto
+++ b/staging/src/k8s.io/client-go/_vendor/k8s.io/apimachinery/pkg/runtime/schema/generated.proto
@@ -19,8 +19,9 @@ limitations under the License.
 
 syntax = 'proto2';
 
-package k8s.io.kubernetes.pkg.runtime.schema;
+package k8s.io.apimachinery.pkg.runtime.schema;
 
+import "k8s.io/kubernetes/pkg/api/resource/generated.proto";
 import "k8s.io/kubernetes/pkg/util/intstr/generated.proto";
 
 // Package-wide variables from generator "generated".
diff --git a/staging/src/k8s.io/client-go/_vendor/k8s.io/apimachinery/pkg/runtime/types.go b/staging/src/k8s.io/client-go/_vendor/k8s.io/apimachinery/pkg/runtime/types.go
index f972c5e697a..19579afe99f 100644
--- a/staging/src/k8s.io/client-go/_vendor/k8s.io/apimachinery/pkg/runtime/types.go
+++ b/staging/src/k8s.io/client-go/_vendor/k8s.io/apimachinery/pkg/runtime/types.go
@@ -30,9 +30,7 @@ package runtime
 // TypeMeta is provided here for convenience. You may use it directly from this package or define
 // your own with the same fields.
 //
-// +k8s:deepcopy-gen=true
 // +protobuf=true
-// +k8s:openapi-gen=true
 type TypeMeta struct {
 	// +optional
 	APIVersion string `json:"apiVersion,omitempty" yaml:"apiVersion,omitempty" protobuf:"bytes,1,opt,name=apiVersion"`
@@ -86,9 +84,7 @@ const (
 // in the Object. (TODO: In the case where the object is of an unknown type, a
 // runtime.Unknown object will be created and stored.)
 //
-// +k8s:deepcopy-gen=true
 // +protobuf=true
-// +k8s:openapi-gen=true
 type RawExtension struct {
 	// Raw is the underlying serialization of this object.
 	//
@@ -105,9 +101,7 @@ type RawExtension struct {
 // TODO: Make this object have easy access to field based accessors and settors for
 // metadata and field mutatation.
 //
-// +k8s:deepcopy-gen=true
 // +protobuf=true
-// +k8s:openapi-gen=true
 type Unknown struct {
 	TypeMeta `json:",inline" protobuf:"bytes,1,opt,name=typeMeta"`
 	// Raw will hold the complete serialized object which couldn't be matched
diff --git a/staging/src/k8s.io/client-go/_vendor/k8s.io/apimachinery/pkg/util/validation/validation.go b/staging/src/k8s.io/client-go/_vendor/k8s.io/apimachinery/pkg/util/validation/validation.go
index f49ac15783e..a0afc26e73c 100644
--- a/staging/src/k8s.io/client-go/_vendor/k8s.io/apimachinery/pkg/util/validation/validation.go
+++ b/staging/src/k8s.io/client-go/_vendor/k8s.io/apimachinery/pkg/util/validation/validation.go
@@ -88,7 +88,7 @@ func IsValidLabelValue(value string) []string {
 }
 
 const dns1123LabelFmt string = "[a-z0-9]([-a-z0-9]*[a-z0-9])?"
-const dns1123LabelErrMsg string = "a valid DNS (RFC 1123) label must consist of lower case alphanumeric characters or '-', and must start and end with an alphanumeric character"
+const dns1123LabelErrMsg string = "a DNS-1123 label must consist of lower case alphanumeric characters or '-', and must start and end with an alphanumeric character"
 const DNS1123LabelMaxLength int = 63
 
 var dns1123LabelRegexp = regexp.MustCompile("^" + dns1123LabelFmt + "$")
@@ -107,7 +107,7 @@ func IsDNS1123Label(value string) []string {
 }
 
 const dns1123SubdomainFmt string = dns1123LabelFmt + "(\\." + dns1123LabelFmt + ")*"
-const dns1123SubdomainErrorMsg string = "a valid DNS (RFC 1123) subdomain must consist of lower case alphanumeric characters, '-' or '.', and must start and end with an alphanumeric character"
+const dns1123SubdomainErrorMsg string = "a DNS-1123 subdomain must consist of lower case alphanumeric characters, '-' or '.', and must start and end with an alphanumeric character"
 const DNS1123SubdomainMaxLength int = 253
 
 var dns1123SubdomainRegexp = regexp.MustCompile("^" + dns1123SubdomainFmt + "$")
@@ -126,7 +126,7 @@ func IsDNS1123Subdomain(value string) []string {
 }
 
 const dns1035LabelFmt string = "[a-z]([-a-z0-9]*[a-z0-9])?"
-const dns1035LabelErrMsg string = "a valid DNS (RFC 1035) label must consist of lower case alphanumeric characters or '-', and must start and end with an alphanumeric character"
+const dns1035LabelErrMsg string = "a DNS-1035 label must consist of lower case alphanumeric characters or '-', and must start and end with an alphanumeric character"
 const DNS1035LabelMaxLength int = 63
 
 var dns1035LabelRegexp = regexp.MustCompile("^" + dns1035LabelFmt + "$")
@@ -149,7 +149,7 @@ func IsDNS1035Label(value string) []string {
 // - valid: *.bar.com, *.foo.bar.com
 // - invalid: *.*.bar.com, *.foo.*.com, *bar.com, f*.bar.com, *
 const wildcardDNS1123SubdomainFmt = "\\*\\." + dns1123SubdomainFmt
-const wildcardDNS1123SubdomainErrMsg = "a valid wildcard DNS (RFC 1123) subdomain must start with '*.', followed by a valid DNS subdomain, which must consist of lower case alphanumeric characters, '-' or '.' and end with an alphanumeric character"
+const wildcardDNS1123SubdomainErrMsg = "a wildcard DNS-1123 subdomain must start with '*.', followed by a valid DNS subdomain, which must consist of lower case alphanumeric characters, '-' or '.' and end with an alphanumeric character"
 
 // IsWildcardDNS1123Subdomain tests for a string that conforms to the definition of a
 // wildcard subdomain in DNS (RFC 1034 section 4.3.3).
diff --git a/staging/src/k8s.io/client-go/pkg/api/doc.go b/staging/src/k8s.io/client-go/pkg/api/doc.go
index 1507a8823b4..a4262ab3613 100644
--- a/staging/src/k8s.io/client-go/pkg/api/doc.go
+++ b/staging/src/k8s.io/client-go/pkg/api/doc.go
@@ -14,8 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// +k8s:deepcopy-gen=package,register
-
 // Package api contains the latest (or "internal") version of the
 // Kubernetes API objects. This is the API objects as represented in memory.
 // The contract presented to clients is located in the versioned packages,
diff --git a/staging/src/k8s.io/client-go/pkg/api/resource/amount.go b/staging/src/k8s.io/client-go/pkg/api/resource/amount.go
index a8866a43e10..2d3012c875e 100644
--- a/staging/src/k8s.io/client-go/pkg/api/resource/amount.go
+++ b/staging/src/k8s.io/client-go/pkg/api/resource/amount.go
@@ -54,7 +54,6 @@ var (
 
 // int64Amount represents a fixed precision numerator and arbitrary scale exponent. It is faster
 // than operations on inf.Dec for values that can be represented as int64.
-// +k8s:openapi-gen=true
 type int64Amount struct {
 	value int64
 	scale Scale
diff --git a/staging/src/k8s.io/client-go/pkg/api/resource/quantity.go b/staging/src/k8s.io/client-go/pkg/api/resource/quantity.go
index 3a956088212..faf3372d52c 100644
--- a/staging/src/k8s.io/client-go/pkg/api/resource/quantity.go
+++ b/staging/src/k8s.io/client-go/pkg/api/resource/quantity.go
@@ -93,7 +93,6 @@ import (
 // +protobuf.embed=string
 // +protobuf.options.marshal=false
 // +protobuf.options.(gogoproto.goproto_stringer)=false
-// +k8s:openapi-gen=true
 type Quantity struct {
 	// i is the quantity in int64 scaled form, if d.Dec == nil
 	i int64Amount
diff --git a/staging/src/k8s.io/client-go/pkg/api/v1/doc.go b/staging/src/k8s.io/client-go/pkg/api/v1/doc.go
index 7c4d4932413..0fdd87f7500 100644
--- a/staging/src/k8s.io/client-go/pkg/api/v1/doc.go
+++ b/staging/src/k8s.io/client-go/pkg/api/v1/doc.go
@@ -14,10 +14,5 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// +k8s:deepcopy-gen=package,register
-// +k8s:conversion-gen=k8s.io/kubernetes/pkg/api
-// +k8s:openapi-gen=true
-// +k8s:defaulter-gen=TypeMeta
-
 // Package v1 is the v1 version of the API.
 package v1
diff --git a/staging/src/k8s.io/client-go/pkg/apis/apps/doc.go b/staging/src/k8s.io/client-go/pkg/apis/apps/doc.go
index bca1ff4ef01..d27cee51c21 100644
--- a/staging/src/k8s.io/client-go/pkg/apis/apps/doc.go
+++ b/staging/src/k8s.io/client-go/pkg/apis/apps/doc.go
@@ -14,6 +14,4 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// +k8s:deepcopy-gen=package,register
-
 package apps
diff --git a/staging/src/k8s.io/client-go/pkg/apis/apps/v1beta1/doc.go b/staging/src/k8s.io/client-go/pkg/apis/apps/v1beta1/doc.go
index b60cd06caec..a397b30e92d 100644
--- a/staging/src/k8s.io/client-go/pkg/apis/apps/v1beta1/doc.go
+++ b/staging/src/k8s.io/client-go/pkg/apis/apps/v1beta1/doc.go
@@ -14,9 +14,4 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// +k8s:deepcopy-gen=package,register
-// +k8s:conversion-gen=k8s.io/kubernetes/pkg/apis/apps
-// +k8s:openapi-gen=true
-// +k8s:defaulter-gen=TypeMeta
-
 package v1beta1
diff --git a/staging/src/k8s.io/client-go/pkg/apis/authentication/doc.go b/staging/src/k8s.io/client-go/pkg/apis/authentication/doc.go
index 7a8a65b77ff..194de434d8f 100644
--- a/staging/src/k8s.io/client-go/pkg/apis/authentication/doc.go
+++ b/staging/src/k8s.io/client-go/pkg/apis/authentication/doc.go
@@ -14,6 +14,5 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// +k8s:deepcopy-gen=package,register
 // +groupName=authentication.k8s.io
 package authentication
diff --git a/staging/src/k8s.io/client-go/pkg/apis/authentication/v1beta1/doc.go b/staging/src/k8s.io/client-go/pkg/apis/authentication/v1beta1/doc.go
index 528723cfb53..342f2012681 100644
--- a/staging/src/k8s.io/client-go/pkg/apis/authentication/v1beta1/doc.go
+++ b/staging/src/k8s.io/client-go/pkg/apis/authentication/v1beta1/doc.go
@@ -14,9 +14,5 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// +k8s:deepcopy-gen=package,register
-// +k8s:conversion-gen=k8s.io/kubernetes/pkg/apis/authentication
 // +groupName=authentication.k8s.io
-// +k8s:openapi-gen=true
-// +k8s:defaulter-gen=TypeMeta
 package v1beta1
diff --git a/staging/src/k8s.io/client-go/pkg/apis/authorization/doc.go b/staging/src/k8s.io/client-go/pkg/apis/authorization/doc.go
index df9046f03cb..91344f67468 100644
--- a/staging/src/k8s.io/client-go/pkg/apis/authorization/doc.go
+++ b/staging/src/k8s.io/client-go/pkg/apis/authorization/doc.go
@@ -14,6 +14,5 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// +k8s:deepcopy-gen=package,register
 // +groupName=authorization.k8s.io
 package authorization
diff --git a/staging/src/k8s.io/client-go/pkg/apis/authorization/v1beta1/doc.go b/staging/src/k8s.io/client-go/pkg/apis/authorization/v1beta1/doc.go
index e11cea1c4a0..738b0b6d290 100644
--- a/staging/src/k8s.io/client-go/pkg/apis/authorization/v1beta1/doc.go
+++ b/staging/src/k8s.io/client-go/pkg/apis/authorization/v1beta1/doc.go
@@ -14,10 +14,5 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// +k8s:deepcopy-gen=package,register
-// +k8s:conversion-gen=k8s.io/kubernetes/pkg/apis/authorization
-// +k8s:openapi-gen=true
-// +k8s:defaulter-gen=TypeMeta
-
 // +groupName=authorization.k8s.io
 package v1beta1
diff --git a/staging/src/k8s.io/client-go/pkg/apis/autoscaling/doc.go b/staging/src/k8s.io/client-go/pkg/apis/autoscaling/doc.go
index 2c770186ba7..83ac8276744 100644
--- a/staging/src/k8s.io/client-go/pkg/apis/autoscaling/doc.go
+++ b/staging/src/k8s.io/client-go/pkg/apis/autoscaling/doc.go
@@ -14,6 +14,4 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// +k8s:deepcopy-gen=package,register
-
 package autoscaling
diff --git a/staging/src/k8s.io/client-go/pkg/apis/autoscaling/v1/doc.go b/staging/src/k8s.io/client-go/pkg/apis/autoscaling/v1/doc.go
index 105a57aceb4..c7be42d5a19 100644
--- a/staging/src/k8s.io/client-go/pkg/apis/autoscaling/v1/doc.go
+++ b/staging/src/k8s.io/client-go/pkg/apis/autoscaling/v1/doc.go
@@ -14,9 +14,4 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// +k8s:deepcopy-gen=package,register
-// +k8s:conversion-gen=k8s.io/kubernetes/pkg/apis/autoscaling
-// +k8s:openapi-gen=true
-// +k8s:defaulter-gen=TypeMeta
-
 package v1
diff --git a/staging/src/k8s.io/client-go/pkg/apis/batch/doc.go b/staging/src/k8s.io/client-go/pkg/apis/batch/doc.go
index c6b203cd8eb..6fe95222606 100644
--- a/staging/src/k8s.io/client-go/pkg/apis/batch/doc.go
+++ b/staging/src/k8s.io/client-go/pkg/apis/batch/doc.go
@@ -14,6 +14,4 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// +k8s:deepcopy-gen=package,register
-
 package batch
diff --git a/staging/src/k8s.io/client-go/pkg/apis/batch/v1/doc.go b/staging/src/k8s.io/client-go/pkg/apis/batch/v1/doc.go
index 7ae7265b067..c7be42d5a19 100644
--- a/staging/src/k8s.io/client-go/pkg/apis/batch/v1/doc.go
+++ b/staging/src/k8s.io/client-go/pkg/apis/batch/v1/doc.go
@@ -14,9 +14,4 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// +k8s:deepcopy-gen=package,register
-// +k8s:conversion-gen=k8s.io/kubernetes/pkg/apis/batch
-// +k8s:openapi-gen=true
-// +k8s:defaulter-gen=TypeMeta
-
 package v1
diff --git a/staging/src/k8s.io/client-go/pkg/apis/batch/v2alpha1/doc.go b/staging/src/k8s.io/client-go/pkg/apis/batch/v2alpha1/doc.go
index 8fb2e2e62dc..a9fe60b1c76 100644
--- a/staging/src/k8s.io/client-go/pkg/apis/batch/v2alpha1/doc.go
+++ b/staging/src/k8s.io/client-go/pkg/apis/batch/v2alpha1/doc.go
@@ -14,9 +14,4 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// +k8s:deepcopy-gen=package,register
-// +k8s:conversion-gen=k8s.io/kubernetes/pkg/apis/batch
-// +k8s:openapi-gen=true
-// +k8s:defaulter-gen=TypeMeta
-
 package v2alpha1
diff --git a/staging/src/k8s.io/client-go/pkg/apis/certificates/doc.go b/staging/src/k8s.io/client-go/pkg/apis/certificates/doc.go
index 5bd58b490fb..a101774691c 100644
--- a/staging/src/k8s.io/client-go/pkg/apis/certificates/doc.go
+++ b/staging/src/k8s.io/client-go/pkg/apis/certificates/doc.go
@@ -14,6 +14,5 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// +k8s:deepcopy-gen=package,register
 // +groupName=certificates.k8s.io
 package certificates
diff --git a/staging/src/k8s.io/client-go/pkg/apis/certificates/v1alpha1/doc.go b/staging/src/k8s.io/client-go/pkg/apis/certificates/v1alpha1/doc.go
index 0e0b1ceabc7..260dc11bdc0 100644
--- a/staging/src/k8s.io/client-go/pkg/apis/certificates/v1alpha1/doc.go
+++ b/staging/src/k8s.io/client-go/pkg/apis/certificates/v1alpha1/doc.go
@@ -14,10 +14,5 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// +k8s:deepcopy-gen=package,register
-// +k8s:conversion-gen=k8s.io/kubernetes/pkg/apis/certificates
-// +k8s:openapi-gen=true
-// +k8s:defaulter-gen=TypeMeta
-
 // +groupName=certificates.k8s.io
 package v1alpha1
diff --git a/staging/src/k8s.io/client-go/pkg/apis/componentconfig/doc.go b/staging/src/k8s.io/client-go/pkg/apis/componentconfig/doc.go
index d044b16db39..c7a5b2de5c9 100644
--- a/staging/src/k8s.io/client-go/pkg/apis/componentconfig/doc.go
+++ b/staging/src/k8s.io/client-go/pkg/apis/componentconfig/doc.go
@@ -14,6 +14,4 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// +k8s:deepcopy-gen=package,register
-
 package componentconfig
diff --git a/staging/src/k8s.io/client-go/pkg/apis/componentconfig/v1alpha1/doc.go b/staging/src/k8s.io/client-go/pkg/apis/componentconfig/v1alpha1/doc.go
index 0ae15b67c86..66e772d65cb 100644
--- a/staging/src/k8s.io/client-go/pkg/apis/componentconfig/v1alpha1/doc.go
+++ b/staging/src/k8s.io/client-go/pkg/apis/componentconfig/v1alpha1/doc.go
@@ -14,9 +14,4 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// +k8s:deepcopy-gen=package,register
-// +k8s:conversion-gen=k8s.io/kubernetes/pkg/apis/componentconfig
-// +k8s:openapi-gen=true
-// +k8s:defaulter-gen=TypeMeta
-
 package v1alpha1
diff --git a/staging/src/k8s.io/client-go/pkg/apis/extensions/doc.go b/staging/src/k8s.io/client-go/pkg/apis/extensions/doc.go
index 2bbb71d0571..87edee41cb5 100644
--- a/staging/src/k8s.io/client-go/pkg/apis/extensions/doc.go
+++ b/staging/src/k8s.io/client-go/pkg/apis/extensions/doc.go
@@ -14,6 +14,4 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// +k8s:deepcopy-gen=package,register
-
 package extensions
diff --git a/staging/src/k8s.io/client-go/pkg/apis/extensions/v1beta1/doc.go b/staging/src/k8s.io/client-go/pkg/apis/extensions/v1beta1/doc.go
index 2a7ce913446..a397b30e92d 100644
--- a/staging/src/k8s.io/client-go/pkg/apis/extensions/v1beta1/doc.go
+++ b/staging/src/k8s.io/client-go/pkg/apis/extensions/v1beta1/doc.go
@@ -14,11 +14,4 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// +k8s:deepcopy-gen=package,register
-// +k8s:conversion-gen=k8s.io/kubernetes/pkg/apis/extensions
-// +k8s:conversion-gen=k8s.io/kubernetes/pkg/apis/autoscaling
-// +k8s:conversion-gen=k8s.io/kubernetes/pkg/apis/batch
-// +k8s:openapi-gen=true
-// +k8s:defaulter-gen=TypeMeta
-
 package v1beta1
diff --git a/staging/src/k8s.io/client-go/pkg/apis/imagepolicy/doc.go b/staging/src/k8s.io/client-go/pkg/apis/imagepolicy/doc.go
index 306f51b005b..b2b9caa5e45 100644
--- a/staging/src/k8s.io/client-go/pkg/apis/imagepolicy/doc.go
+++ b/staging/src/k8s.io/client-go/pkg/apis/imagepolicy/doc.go
@@ -14,6 +14,5 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// +k8s:deepcopy-gen=package,register
 // +groupName=imagepolicy.k8s.io
 package imagepolicy
diff --git a/staging/src/k8s.io/client-go/pkg/apis/imagepolicy/v1alpha1/doc.go b/staging/src/k8s.io/client-go/pkg/apis/imagepolicy/v1alpha1/doc.go
index cc8a147b4a6..597cce974cd 100644
--- a/staging/src/k8s.io/client-go/pkg/apis/imagepolicy/v1alpha1/doc.go
+++ b/staging/src/k8s.io/client-go/pkg/apis/imagepolicy/v1alpha1/doc.go
@@ -14,10 +14,5 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// +k8s:deepcopy-gen=package,register
-// +k8s:conversion-gen=k8s.io/kubernetes/pkg/apis/imagepolicy
-// +k8s:openapi-gen=true
-// +k8s:defaulter-gen=TypeMeta
-
 // +groupName=imagepolicy.k8s.io
 package v1alpha1
diff --git a/staging/src/k8s.io/client-go/pkg/apis/kubeadm/v1alpha1/doc.go b/staging/src/k8s.io/client-go/pkg/apis/kubeadm/v1alpha1/doc.go
index 7ca9c7c2e12..7963bca2563 100644
--- a/staging/src/k8s.io/client-go/pkg/apis/kubeadm/v1alpha1/doc.go
+++ b/staging/src/k8s.io/client-go/pkg/apis/kubeadm/v1alpha1/doc.go
@@ -14,6 +14,5 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// +k8s:defaulter-gen=TypeMeta
 // +groupName=kubeadm.k8s.io
 package v1alpha1
diff --git a/staging/src/k8s.io/client-go/pkg/apis/policy/doc.go b/staging/src/k8s.io/client-go/pkg/apis/policy/doc.go
index 876858cd9a7..8feeef8e416 100644
--- a/staging/src/k8s.io/client-go/pkg/apis/policy/doc.go
+++ b/staging/src/k8s.io/client-go/pkg/apis/policy/doc.go
@@ -14,6 +14,4 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// +k8s:deepcopy-gen=package,register
-
 package policy
diff --git a/staging/src/k8s.io/client-go/pkg/apis/policy/v1beta1/doc.go b/staging/src/k8s.io/client-go/pkg/apis/policy/v1beta1/doc.go
index 5a338994768..aadbe141642 100644
--- a/staging/src/k8s.io/client-go/pkg/apis/policy/v1beta1/doc.go
+++ b/staging/src/k8s.io/client-go/pkg/apis/policy/v1beta1/doc.go
@@ -14,11 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// +k8s:deepcopy-gen=package,register
-// +k8s:conversion-gen=k8s.io/kubernetes/pkg/apis/policy
-
 // Package policy is for any kind of policy object.  Suitable examples, even if
 // they aren't all here, are PodDisruptionBudget, PodSecurityPolicy,
 // NetworkPolicy, etc.
-// +k8s:openapi-gen=true
 package v1beta1
diff --git a/staging/src/k8s.io/client-go/pkg/apis/rbac/doc.go b/staging/src/k8s.io/client-go/pkg/apis/rbac/doc.go
index af9ffe20679..c5f057484c4 100644
--- a/staging/src/k8s.io/client-go/pkg/apis/rbac/doc.go
+++ b/staging/src/k8s.io/client-go/pkg/apis/rbac/doc.go
@@ -14,6 +14,5 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// +k8s:deepcopy-gen=package,register
 // +groupName=rbac.authorization.k8s.io
 package rbac
diff --git a/staging/src/k8s.io/client-go/pkg/apis/rbac/helpers.go b/staging/src/k8s.io/client-go/pkg/apis/rbac/helpers.go
index 44d8a66c2ef..760a14a6fa3 100644
--- a/staging/src/k8s.io/client-go/pkg/apis/rbac/helpers.go
+++ b/staging/src/k8s.io/client-go/pkg/apis/rbac/helpers.go
@@ -124,7 +124,6 @@ func SubjectsStrings(subjects []Subject) ([]string, []string, []string, []string
 	return users, groups, sas, others
 }
 
-// +k8s:deepcopy-gen=false
 // PolicyRuleBuilder let's us attach methods.  A no-no for API types.
 // We use it to construct rules in code.  It's more compact than trying to write them
 // out in a literal and allows us to perform some basic checking during construction
@@ -197,7 +196,6 @@ func (r *PolicyRuleBuilder) Rule() (PolicyRule, error) {
 	return r.PolicyRule, nil
 }
 
-// +k8s:deepcopy-gen=false
 // ClusterRoleBindingBuilder let's us attach methods.  A no-no for API types.
 // We use it to construct bindings in code.  It's more compact than trying to write them
 // out in a literal.
diff --git a/staging/src/k8s.io/client-go/pkg/apis/rbac/v1alpha1/doc.go b/staging/src/k8s.io/client-go/pkg/apis/rbac/v1alpha1/doc.go
index 0540241e8f4..f43f7bc0840 100644
--- a/staging/src/k8s.io/client-go/pkg/apis/rbac/v1alpha1/doc.go
+++ b/staging/src/k8s.io/client-go/pkg/apis/rbac/v1alpha1/doc.go
@@ -14,10 +14,5 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// +k8s:deepcopy-gen=package,register
-// +k8s:conversion-gen=k8s.io/kubernetes/pkg/apis/rbac
-// +k8s:openapi-gen=true
-// +k8s:defaulter-gen=TypeMeta
-
 // +groupName=rbac.authorization.k8s.io
 package v1alpha1
diff --git a/staging/src/k8s.io/client-go/pkg/apis/rbac/v1alpha1/helpers.go b/staging/src/k8s.io/client-go/pkg/apis/rbac/v1alpha1/helpers.go
index 789859c995e..a85fc0156e4 100644
--- a/staging/src/k8s.io/client-go/pkg/apis/rbac/v1alpha1/helpers.go
+++ b/staging/src/k8s.io/client-go/pkg/apis/rbac/v1alpha1/helpers.go
@@ -22,7 +22,6 @@ import (
 	"k8s.io/client-go/pkg/api/v1"
 )
 
-// +k8s:deepcopy-gen=false
 // PolicyRuleBuilder let's us attach methods.  A no-no for API types.
 // We use it to construct rules in code.  It's more compact than trying to write them
 // out in a literal and allows us to perform some basic checking during construction
@@ -89,7 +88,6 @@ func (r *PolicyRuleBuilder) Rule() (PolicyRule, error) {
 	return r.PolicyRule, nil
 }
 
-// +k8s:deepcopy-gen=false
 // ClusterRoleBindingBuilder let's us attach methods.  A no-no for API types.
 // We use it to construct bindings in code.  It's more compact than trying to write them
 // out in a literal.
diff --git a/staging/src/k8s.io/client-go/pkg/apis/storage/doc.go b/staging/src/k8s.io/client-go/pkg/apis/storage/doc.go
index a7eb30b643b..ef6d2a9bad5 100644
--- a/staging/src/k8s.io/client-go/pkg/apis/storage/doc.go
+++ b/staging/src/k8s.io/client-go/pkg/apis/storage/doc.go
@@ -14,6 +14,5 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// +k8s:deepcopy-gen=package,register
 // +groupName=storage.k8s.io
 package storage
diff --git a/staging/src/k8s.io/client-go/pkg/apis/storage/v1beta1/doc.go b/staging/src/k8s.io/client-go/pkg/apis/storage/v1beta1/doc.go
index a25066e966e..3643217106c 100644
--- a/staging/src/k8s.io/client-go/pkg/apis/storage/v1beta1/doc.go
+++ b/staging/src/k8s.io/client-go/pkg/apis/storage/v1beta1/doc.go
@@ -14,9 +14,5 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// +k8s:deepcopy-gen=package,register
-// +k8s:conversion-gen=k8s.io/kubernetes/pkg/apis/storage
 // +groupName=storage.k8s.io
-// +k8s:openapi-gen=true
-// +k8s:defaulter-gen=TypeMeta
 package v1beta1
diff --git a/staging/src/k8s.io/client-go/pkg/federation/apis/federation/doc.go b/staging/src/k8s.io/client-go/pkg/federation/apis/federation/doc.go
index 7a45fb7bb8c..1f8e0df1713 100644
--- a/staging/src/k8s.io/client-go/pkg/federation/apis/federation/doc.go
+++ b/staging/src/k8s.io/client-go/pkg/federation/apis/federation/doc.go
@@ -14,6 +14,4 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// +k8s:deepcopy-gen=package,register
-
 package federation
diff --git a/staging/src/k8s.io/client-go/pkg/federation/apis/federation/v1beta1/doc.go b/staging/src/k8s.io/client-go/pkg/federation/apis/federation/v1beta1/doc.go
index 2110288a0c4..a397b30e92d 100644
--- a/staging/src/k8s.io/client-go/pkg/federation/apis/federation/v1beta1/doc.go
+++ b/staging/src/k8s.io/client-go/pkg/federation/apis/federation/v1beta1/doc.go
@@ -14,8 +14,4 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// +k8s:deepcopy-gen=package,register
-// +k8s:conversion-gen=k8s.io/kubernetes/federation/apis/federation
-// +k8s:openapi-gen=true
-// +k8s:defaulter-gen=TypeMeta
 package v1beta1
diff --git a/staging/src/k8s.io/client-go/pkg/util/intstr/intstr.go b/staging/src/k8s.io/client-go/pkg/util/intstr/intstr.go
index 02586b34810..b3a5c4a4c7c 100644
--- a/staging/src/k8s.io/client-go/pkg/util/intstr/intstr.go
+++ b/staging/src/k8s.io/client-go/pkg/util/intstr/intstr.go
@@ -39,7 +39,6 @@ import (
 //
 // +protobuf=true
 // +protobuf.options.(gogoproto.goproto_stringer)=false
-// +k8s:openapi-gen=true
 type IntOrString struct {
 	Type   Type   `protobuf:"varint,1,opt,name=type,casttype=Type"`
 	IntVal int32  `protobuf:"varint,2,opt,name=intVal"`
diff --git a/staging/src/k8s.io/client-go/pkg/util/workqueue/doc.go b/staging/src/k8s.io/client-go/pkg/util/workqueue/doc.go
index bb03f56a24d..2a00c74ac5f 100644
--- a/staging/src/k8s.io/client-go/pkg/util/workqueue/doc.go
+++ b/staging/src/k8s.io/client-go/pkg/util/workqueue/doc.go
@@ -23,4 +23,4 @@ limitations under the License.
 //  * Multiple consumers and producers. In particular, it is allowed for an
 //      item to be reenqueued while it is being processed.
 //  * Shutdown notifications.
-package workqueue // import "k8s.io/client-go/pkg/util/workqueue"
+package workqueue
diff --git a/staging/src/k8s.io/client-go/pkg/version/doc.go b/staging/src/k8s.io/client-go/pkg/version/doc.go
index 38039578488..ccedec76f61 100644
--- a/staging/src/k8s.io/client-go/pkg/version/doc.go
+++ b/staging/src/k8s.io/client-go/pkg/version/doc.go
@@ -16,5 +16,4 @@ limitations under the License.
 
 // Package version supplies version information collected at build time to
 // kubernetes components.
-// +k8s:openapi-gen=true
 package version