Update generated files

Godeps/LICENSES

@@ -1546,6 +1546,216 @@ Apache License
 ================================================================================
 
 
+================================================================================
+= vendor/github.com/appc/spec/schema/types/resource licensed under: =
+
+Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright {yyyy} {name of copyright owner}
+
+   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.
+
+
+= vendor/github.com/appc/spec/LICENSE d2794c0df5b907fdace235a619d80314  -
+================================================================================
+
+
 ================================================================================
 = vendor/github.com/armon/circbuf licensed under: =
 

cmd/kube-aggregator/pkg/apiserver/BUILD

@@ -22,6 +22,7 @@ go_test(
         "//pkg/api:go_default_library",
         "//pkg/api/v1:go_default_library",
         "//pkg/client/listers/core/v1:go_default_library",
+        "//vendor:k8s.io/apimachinery/pkg/api/equality",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/runtime",
         "//vendor:k8s.io/apimachinery/pkg/util/diff",

cmd/kubeadm/app/master/BUILD

@@ -26,7 +26,6 @@ go_library(
         "//cmd/kubeadm/app/images:go_default_library",
         "//cmd/kubeadm/app/phases/kubeconfig:go_default_library",
         "//cmd/kubeadm/app/util:go_default_library",
-        "//pkg/api/resource:go_default_library",
         "//pkg/api/v1:go_default_library",
         "//pkg/apis/extensions/v1beta1:go_default_library",
         "//pkg/client/clientset_generated/clientset:go_default_library",
@@ -35,6 +34,7 @@ go_library(
         "//pkg/util/intstr:go_default_library",
         "//vendor:github.com/blang/semver",
         "//vendor:k8s.io/apimachinery/pkg/api/errors",
+        "//vendor:k8s.io/apimachinery/pkg/api/resource",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/util/uuid",
         "//vendor:k8s.io/apimachinery/pkg/util/wait",

federation/apis/federation/v1beta1/generated.pb.go

@@ -1487,56 +1487,56 @@ var (
 )
 
 var fileDescriptorGenerated = []byte{
-	// 802 bytes of a gzipped FileDescriptorProto
+	// 804 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xa4, 0x54, 0x4d, 0x6b, 0x33, 0x55,
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xa4, 0x54, 0xcd, 0x6e, 0xf3, 0x44,
-	0x14, 0xce, 0xe4, 0xb3, 0xb9, 0x35, 0x5a, 0x2e, 0x0a, 0x31, 0x8b, 0x49, 0x09, 0x22, 0xad, 0xe8,
+	0x14, 0x8d, 0xf3, 0xdb, 0x4c, 0x09, 0x54, 0x23, 0x90, 0x42, 0x16, 0x4e, 0x15, 0x21, 0xd4, 0x22,
-	0x8c, 0x09, 0x22, 0x05, 0x51, 0xe8, 0xa4, 0x08, 0x85, 0x96, 0xca, 0x6d, 0x71, 0x51, 0x04, 0x9d,
+	0xb0, 0x49, 0x84, 0x50, 0x25, 0x04, 0x52, 0x9d, 0x0a, 0xa9, 0x52, 0xab, 0xa2, 0x69, 0xc5, 0xa2,
-	0x4c, 0x4e, 0xa6, 0x63, 0x32, 0x1f, 0xdc, 0x7b, 0x27, 0x90, 0xae, 0xfc, 0x01, 0x2e, 0xfc, 0x11,
+	0x42, 0x02, 0xc7, 0xb9, 0x71, 0x4d, 0xe2, 0x1f, 0xcd, 0x8c, 0x23, 0xa5, 0x2b, 0x1e, 0x80, 0x05,
-	0xfe, 0x03, 0xd7, 0xee, 0xbb, 0xb3, 0x0b, 0x17, 0x5d, 0x05, 0x1b, 0xff, 0x45, 0x57, 0x2f, 0xf7,
+	0x0f, 0xc1, 0x1b, 0xb0, 0x66, 0xdf, 0x1d, 0x5d, 0xb0, 0xe8, 0x2a, 0xa2, 0xe1, 0x2d, 0xba, 0xfa,
-	0xce, 0xcd, 0x24, 0xd3, 0x24, 0x7d, 0xfb, 0xb6, 0xbb, 0x39, 0x67, 0xce, 0x79, 0x9e, 0xe7, 0x9e,
+	0x34, 0xe3, 0x89, 0x13, 0x37, 0x49, 0xbf, 0x7e, 0xed, 0xce, 0xf7, 0xf8, 0xde, 0x73, 0xce, 0xdc,
-	0x2f, 0x74, 0x34, 0x3c, 0x60, 0x86, 0x17, 0x9a, 0xc3, 0xb8, 0x07, 0x34, 0x00, 0x0e, 0xcc, 0x1c,
+	0x3b, 0x77, 0xd0, 0xd1, 0xf0, 0x80, 0x19, 0x5e, 0x68, 0x0e, 0xe3, 0x1e, 0xd0, 0x00, 0x38, 0x30,
-	0x40, 0x1f, 0xa8, 0xcd, 0xbd, 0x30, 0x30, 0xed, 0xc8, 0xcb, 0xd8, 0xe3, 0x76, 0x0f, 0xb8, 0xdd,
+	0x73, 0x00, 0x7d, 0xa0, 0x36, 0xf7, 0xc2, 0xc0, 0xb4, 0x23, 0x2f, 0x13, 0x8f, 0xdb, 0x3d, 0xe0,
-	0x36, 0x5d, 0x08, 0x84, 0x0b, 0xfa, 0x46, 0x44, 0x43, 0x1e, 0xe2, 0xaf, 0x12, 0x14, 0x63, 0x81,
+	0x76, 0xdb, 0x74, 0x21, 0x10, 0x10, 0xf4, 0x8d, 0x88, 0x86, 0x3c, 0xc4, 0x5f, 0x25, 0x2c, 0xc6,
-	0x62, 0x2c, 0xb2, 0x0c, 0x81, 0xb2, 0x6c, 0x2b, 0x94, 0xc6, 0x17, 0xae, 0xc7, 0xaf, 0xe2, 0x9e,
+	0x82, 0xc5, 0x58, 0x54, 0x19, 0x82, 0x65, 0x39, 0x56, 0x2c, 0x8d, 0x2f, 0x5c, 0x8f, 0x5f, 0xc5,
-	0xe1, 0x84, 0xbe, 0xe9, 0x86, 0x6e, 0x68, 0x4a, 0xb0, 0x5e, 0x3c, 0x90, 0x96, 0x34, 0xe4, 0x57,
+	0x3d, 0xc3, 0x09, 0x7d, 0xd3, 0x0d, 0xdd, 0xd0, 0x94, 0x64, 0xbd, 0x78, 0x20, 0x23, 0x19, 0xc8,
-	0x42, 0xd2, 0x50, 0x24, 0x42, 0x94, 0x6f, 0x3b, 0x57, 0x5e, 0x00, 0x74, 0x62, 0x46, 0x43, 0x37,
+	0xaf, 0x44, 0xa4, 0xa1, 0x44, 0x84, 0x29, 0xdf, 0x76, 0xae, 0xbc, 0x00, 0xe8, 0xc4, 0x8c, 0x86,
-	0x51, 0xe9, 0x03, 0xb7, 0xcd, 0xf1, 0x8a, 0xb4, 0x86, 0xb9, 0x29, 0x8b, 0xc6, 0x01, 0xf7, 0x7c,
+	0xae, 0x00, 0x4c, 0x0a, 0x2c, 0x8c, 0xa9, 0x03, 0x8f, 0xad, 0x3d, 0x59, 0xc5, 0x4c, 0x1f, 0xb8,
-	0x58, 0x49, 0xf8, 0xfa, 0x6d, 0x09, 0xcc, 0xb9, 0x02, 0xdf, 0x5e, 0xc9, 0xeb, 0xac, 0x56, 0x52,
+	0x6d, 0x8e, 0x57, 0x0e, 0xd4, 0x30, 0x37, 0x55, 0xd1, 0x38, 0xe0, 0x9e, 0xbf, 0x2a, 0xf3, 0xf5,
-	0x89, 0x33, 0x29, 0xb0, 0x30, 0xa6, 0xce, 0x2a, 0xd7, 0xe7, 0x9b, 0x73, 0xd6, 0x3c, 0xa5, 0xbd,
+	0xdb, 0x0a, 0x98, 0x73, 0x05, 0xbe, 0xbd, 0x52, 0xf7, 0xf9, 0x6a, 0xff, 0xe7, 0x47, 0x5a, 0x63,
-	0x3e, 0x3a, 0xe6, 0xde, 0xc8, 0xf4, 0x02, 0xce, 0x38, 0x7d, 0x9c, 0xd2, 0xfa, 0x3b, 0x8f, 0x2a,
+	0xab, 0xbd, 0x3e, 0x3b, 0xe6, 0xde, 0xc8, 0xf4, 0x02, 0xce, 0x38, 0x7d, 0x5c, 0xd2, 0xfa, 0x3b,
-	0xdd, 0x51, 0xcc, 0x38, 0x50, 0xfc, 0x0b, 0xda, 0x12, 0x45, 0xea, 0xdb, 0xdc, 0xae, 0x6b, 0xbb,
+	0x8f, 0x2a, 0xdd, 0x51, 0xcc, 0x38, 0x50, 0xfc, 0x0b, 0xda, 0x12, 0x07, 0xee, 0xdb, 0xdc, 0xae,
-	0xda, 0xde, 0x76, 0xe7, 0x4b, 0x43, 0xf5, 0x6d, 0xf9, 0xad, 0x46, 0x34, 0x74, 0x93, 0x96, 0x89,
+	0x6b, 0xbb, 0xda, 0xde, 0x76, 0xe7, 0x4b, 0x43, 0x4d, 0x6e, 0xd9, 0xb7, 0x11, 0x0d, 0xdd, 0x64,
-	0x68, 0x63, 0xdc, 0x36, 0xce, 0x7a, 0xbf, 0x82, 0xc3, 0x4f, 0x81, 0xdb, 0x16, 0xbe, 0x99, 0x36,
+	0x68, 0x22, 0xdb, 0x18, 0xb7, 0x8d, 0xb3, 0xde, 0xaf, 0xe0, 0xf0, 0x53, 0xe0, 0xb6, 0x85, 0x6f,
-	0x73, 0xb3, 0x69, 0x13, 0x2d, 0x7c, 0x24, 0x45, 0xc5, 0x0e, 0x2a, 0xb2, 0x08, 0x9c, 0x7a, 0x5e,
+	0xa6, 0xcd, 0xdc, 0x6c, 0xda, 0x44, 0x0b, 0x8c, 0xa4, 0xac, 0xd8, 0x41, 0x45, 0x16, 0x81, 0x53,
-	0xa2, 0x1f, 0x1a, 0x2f, 0x99, 0x0a, 0x43, 0xc9, 0x3d, 0x8f, 0xc0, 0xb1, 0xde, 0x53, 0x74, 0x45,
+	0xcf, 0x4b, 0xf6, 0x43, 0xe3, 0x25, 0xf7, 0xc2, 0x50, 0x76, 0xcf, 0x23, 0x70, 0xac, 0xf7, 0x94,
-	0x61, 0x11, 0x09, 0x8e, 0x87, 0xa8, 0xcc, 0xb8, 0xcd, 0x63, 0x56, 0x2f, 0x48, 0x9a, 0xee, 0xeb,
+	0x5c, 0x51, 0x44, 0x44, 0x92, 0xe3, 0x21, 0x2a, 0x33, 0x6e, 0xf3, 0x98, 0xd5, 0x0b, 0x52, 0xa6,
-	0x68, 0x24, 0x94, 0xf5, 0xbe, 0x22, 0x2a, 0x27, 0x36, 0x51, 0x14, 0xad, 0xbb, 0x02, 0xda, 0x51,
+	0xfb, 0x3a, 0x19, 0x49, 0x65, 0xbd, 0xaf, 0x84, 0xca, 0x49, 0x4c, 0x94, 0x44, 0xeb, 0xae, 0x80,
-	0x91, 0xdd, 0x30, 0xe8, 0x7b, 0x02, 0x02, 0x1f, 0xa0, 0x22, 0x9f, 0x44, 0x20, 0x8b, 0x58, 0xb5,
+	0x76, 0x54, 0x66, 0x37, 0x0c, 0xfa, 0x9e, 0xa0, 0xc0, 0x07, 0xa8, 0xc8, 0x27, 0x11, 0xc8, 0x26,
-	0x3e, 0x99, 0x6b, 0xbc, 0x98, 0x44, 0xf0, 0x30, 0x6d, 0x7e, 0xf8, 0x38, 0x5e, 0xf8, 0x89, 0xcc,
+	0x56, 0xad, 0x4f, 0xe6, 0x1e, 0x2f, 0x26, 0x11, 0x3c, 0x4c, 0x9b, 0x1f, 0x3e, 0xce, 0x17, 0x38,
-	0xc0, 0x3f, 0xa6, 0xda, 0xf3, 0x32, 0xf7, 0xbb, 0x2c, 0xed, 0xc3, 0xb4, 0xf9, 0xe4, 0x44, 0x18,
+	0x91, 0x15, 0xf8, 0xc7, 0xd4, 0x7b, 0x5e, 0xd6, 0x7e, 0x97, 0x95, 0x7d, 0x98, 0x36, 0x9f, 0xbc,
-	0x29, 0x66, 0x56, 0x26, 0x76, 0x51, 0x6d, 0x64, 0x33, 0xfe, 0x03, 0x0d, 0x7b, 0x70, 0xe1, 0xf9,
+	0x11, 0x46, 0xca, 0x99, 0xb5, 0x89, 0x5d, 0x54, 0x1b, 0xd9, 0x8c, 0xff, 0x40, 0xc3, 0x1e, 0x5c,
-	0xa0, 0x4a, 0xf3, 0xd9, 0xf3, 0xfa, 0x2b, 0x32, 0xac, 0x8f, 0x94, 0x94, 0xda, 0xc9, 0x32, 0x10,
+	0x78, 0x3e, 0xa8, 0xd6, 0x7c, 0xf6, 0xbc, 0xf9, 0x8a, 0x0a, 0xeb, 0x23, 0x65, 0xa5, 0x76, 0xb2,
-	0xc9, 0xe2, 0xe2, 0x31, 0xc2, 0xc2, 0x71, 0x41, 0xed, 0x80, 0x25, 0x8f, 0x13, 0x6c, 0xc5, 0x77,
+	0x4c, 0x44, 0xb2, 0xbc, 0x78, 0x8c, 0xb0, 0x00, 0x2e, 0xa8, 0x1d, 0xb0, 0xe4, 0x70, 0x42, 0xad,
-	0x66, 0x6b, 0x28, 0x36, 0x7c, 0xb2, 0x82, 0x46, 0xd6, 0x30, 0xe0, 0x4f, 0x51, 0x99, 0x82, 0xcd,
+	0xf8, 0xce, 0x6a, 0x0d, 0xa5, 0x86, 0x4f, 0x56, 0xd8, 0xc8, 0x1a, 0x05, 0xfc, 0x29, 0x2a, 0x53,
-	0xc2, 0xa0, 0x5e, 0x92, 0x85, 0x4b, 0xfb, 0x45, 0xa4, 0x97, 0xa8, 0xbf, 0x78, 0x1f, 0x55, 0x7c,
+	0xb0, 0x59, 0x18, 0xd4, 0x4b, 0xb2, 0x71, 0xe9, 0xbc, 0x88, 0x44, 0x89, 0xfa, 0x8b, 0xf7, 0x51,
-	0x60, 0xcc, 0x76, 0xa1, 0x5e, 0x96, 0x81, 0x1f, 0xa8, 0xc0, 0xca, 0x69, 0xe2, 0x26, 0xf3, 0xff,
+	0xc5, 0x07, 0xc6, 0x6c, 0x17, 0xea, 0x65, 0x99, 0xf8, 0x81, 0x4a, 0xac, 0x9c, 0x26, 0x30, 0x99,
-	0xad, 0x7f, 0x34, 0xb4, 0xad, 0x5a, 0x75, 0xe2, 0x31, 0x8e, 0x7f, 0x5a, 0x59, 0x0f, 0xe3, 0x79,
+	0xff, 0x6f, 0xfd, 0xa3, 0xa1, 0x6d, 0x35, 0xaa, 0x13, 0x8f, 0x71, 0xfc, 0xd3, 0xca, 0x7a, 0x18,
-	0x0f, 0x12, 0xd9, 0x72, 0x39, 0x76, 0x14, 0xd7, 0xd6, 0xdc, 0xb3, 0xb4, 0x1a, 0x3d, 0x54, 0xf2,
+	0xcf, 0x3b, 0x90, 0xa8, 0x96, 0xcb, 0xb1, 0xa3, 0xb4, 0xb6, 0xe6, 0xc8, 0xd2, 0x6a, 0xf4, 0x50,
-	0x38, 0xf8, 0xa2, 0xf1, 0x85, 0xbd, 0xed, 0xce, 0xb7, 0xaf, 0x1a, 0x5a, 0xab, 0xa6, 0x98, 0x4a,
+	0xc9, 0xe3, 0xe0, 0x8b, 0xc1, 0x17, 0xf6, 0xb6, 0x3b, 0xdf, 0xbe, 0xea, 0xd2, 0x5a, 0x35, 0xa5,
-	0xc7, 0x02, 0x93, 0x24, 0xd0, 0xad, 0x3f, 0xf3, 0xe9, 0x8b, 0xc4, 0xbe, 0xe0, 0xbf, 0x34, 0xd4,
+	0x54, 0x3a, 0x16, 0x9c, 0x24, 0xa1, 0x6e, 0xfd, 0x99, 0x4f, 0x4f, 0x24, 0xf6, 0x05, 0xff, 0xa5,
-	0x60, 0x40, 0xc7, 0x40, 0x0f, 0xfb, 0x7d, 0x0a, 0x8c, 0x59, 0x93, 0xee, 0xc8, 0x83, 0x80, 0x77,
+	0xa1, 0x06, 0x03, 0x3a, 0x06, 0x7a, 0xd8, 0xef, 0x53, 0x60, 0xcc, 0x9a, 0x74, 0x47, 0x1e, 0x04,
-	0x8f, 0x8f, 0x08, 0xab, 0x6b, 0x52, 0xc9, 0xd9, 0xcb, 0x94, 0x9c, 0x6f, 0xc2, 0xb5, 0x5a, 0x4a,
+	0xbc, 0x7b, 0x7c, 0x44, 0x58, 0x5d, 0x93, 0x4e, 0xce, 0x5e, 0xe6, 0xe4, 0x7c, 0x13, 0xaf, 0xd5,
-	0x5b, 0x63, 0x63, 0x08, 0x23, 0x4f, 0xc8, 0xc2, 0x3f, 0xa3, 0x2a, 0x03, 0x87, 0x02, 0x27, 0x30,
+	0x52, 0xde, 0x1a, 0x1b, 0x53, 0x18, 0x79, 0xc2, 0x16, 0xfe, 0x19, 0x55, 0x19, 0x38, 0x14, 0x38,
-	0x50, 0x97, 0xa4, 0xb3, 0x46, 0xa3, 0x6a, 0x83, 0x6c, 0x40, 0xe8, 0xd8, 0xa3, 0xe4, 0x20, 0x11,
+	0x81, 0x81, 0x7a, 0x49, 0x3a, 0x6b, 0x3c, 0xaa, 0x31, 0xc8, 0x01, 0x84, 0x8e, 0x3d, 0x4a, 0x1e,
-	0x18, 0x00, 0x85, 0xc0, 0x01, 0xab, 0x36, 0x9b, 0x36, 0xab, 0xe7, 0x73, 0x20, 0xb2, 0xc0, 0x6c,
+	0x24, 0x02, 0x03, 0xa0, 0x10, 0x38, 0x60, 0xd5, 0x66, 0xd3, 0x66, 0xf5, 0x7c, 0x4e, 0x44, 0x16,
-	0xfd, 0xab, 0xa1, 0x5a, 0x66, 0xfb, 0xf1, 0x35, 0x42, 0xce, 0x7c, 0xb3, 0xe6, 0x75, 0xf9, 0xfe,
+	0x9c, 0xad, 0x7f, 0x35, 0x54, 0xcb, 0x6c, 0x3f, 0xbe, 0x46, 0xc8, 0x99, 0x6f, 0xd6, 0xbc, 0x2f,
-	0x55, 0x1d, 0x4a, 0x17, 0x75, 0x71, 0x31, 0x53, 0x17, 0x23, 0x4b, 0x6c, 0xb8, 0x89, 0x4a, 0xd7,
+	0xdf, 0xbf, 0x6a, 0x42, 0xe9, 0xa2, 0x2e, 0x5e, 0xcc, 0x14, 0x62, 0x64, 0x49, 0x0d, 0x37, 0x51,
-	0x61, 0x00, 0xac, 0x5e, 0xda, 0x2d, 0xec, 0x55, 0xad, 0xaa, 0xe8, 0xea, 0xa5, 0x70, 0x90, 0xc4,
+	0xe9, 0x3a, 0x0c, 0x80, 0xd5, 0x4b, 0xbb, 0x85, 0xbd, 0xaa, 0x55, 0x15, 0x53, 0xbd, 0x14, 0x00,
-	0x9f, 0x8c, 0xbe, 0xeb, 0x85, 0x81, 0x9a, 0xe8, 0xa5, 0xd1, 0x17, 0x5e, 0xa2, 0xfe, 0xb6, 0x7e,
+	0x49, 0xf0, 0xe4, 0xea, 0xbb, 0x5e, 0x18, 0xa8, 0x1b, 0xbd, 0x74, 0xf5, 0x05, 0x4a, 0xd4, 0xdf,
-	0xd7, 0xd0, 0xc7, 0x1b, 0x4b, 0x8e, 0x3b, 0x08, 0x39, 0xa9, 0xa5, 0x2e, 0xd7, 0x42, 0x5a, 0xfa,
+	0xd6, 0xef, 0x1a, 0xfa, 0x78, 0x63, 0xcb, 0x71, 0x07, 0x21, 0x27, 0x8d, 0xd4, 0xcb, 0xb5, 0xb0,
-	0x87, 0x2c, 0x45, 0xe1, 0x6f, 0x50, 0x2d, 0xd3, 0x27, 0x75, 0xb4, 0xd2, 0x4b, 0x91, 0x61, 0x23,
+	0x96, 0xfe, 0x21, 0x4b, 0x59, 0xf8, 0x1b, 0x54, 0xcb, 0xcc, 0x49, 0x3d, 0x5a, 0xe9, 0x4b, 0x91,
-	0xd9, 0x58, 0x6b, 0xff, 0xe6, 0x5e, 0xcf, 0xdd, 0xde, 0xeb, 0xb9, 0xbb, 0x7b, 0x3d, 0xf7, 0xdb,
+	0x51, 0x23, 0xd9, 0x5c, 0x6b, 0xff, 0xe6, 0x5e, 0xcf, 0xdd, 0xde, 0xeb, 0xb9, 0xbb, 0x7b, 0x3d,
-	0x4c, 0xd7, 0x6e, 0x66, 0xba, 0x76, 0x3b, 0xd3, 0xb5, 0xff, 0x66, 0xba, 0xf6, 0xc7, 0xff, 0x7a,
+	0xf7, 0xdb, 0x4c, 0xd7, 0x6e, 0x66, 0xba, 0x76, 0x3b, 0xd3, 0xb5, 0xff, 0x66, 0xba, 0xf6, 0xc7,
-	0xee, 0xb2, 0xa2, 0x6a, 0xf6, 0x26, 0x00, 0x00, 0xff, 0xff, 0x4c, 0x52, 0x01, 0x24, 0x84, 0x08,
+	0xff, 0x7a, 0xee, 0xb2, 0xa2, 0x7a, 0xf6, 0x26, 0x00, 0x00, 0xff, 0xff, 0x4d, 0x90, 0x9b, 0x38,
-	0x00, 0x00,
+	0x86, 0x08, 0x00, 0x00,
 }

federation/apis/federation/v1beta1/generated.proto

@@ -21,10 +21,10 @@ syntax = 'proto2';
 
 package k8s.io.kubernetes.federation.apis.federation.v1beta1;
 
+import "k8s.io/apimachinery/pkg/api/resource/generated.proto";
 import "k8s.io/apimachinery/pkg/apis/meta/v1/generated.proto";
 import "k8s.io/apimachinery/pkg/runtime/generated.proto";
 import "k8s.io/apimachinery/pkg/runtime/schema/generated.proto";
-import "k8s.io/apimachinery/pkg/api/resource/generated.proto";
 import "k8s.io/kubernetes/pkg/api/v1/generated.proto";
 import "k8s.io/kubernetes/pkg/util/intstr/generated.proto";
 

federation/pkg/kubefed/BUILD

@@ -55,6 +55,7 @@ go_test(
         "//pkg/api/v1:go_default_library",
         "//pkg/kubectl/cmd/testing:go_default_library",
         "//pkg/kubectl/cmd/util:go_default_library",
+        "//vendor:k8s.io/apimachinery/pkg/api/equality",
         "//vendor:k8s.io/apimachinery/pkg/api/errors",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/util/diff",

federation/pkg/kubefed/init/BUILD

@@ -16,7 +16,6 @@ go_library(
         "//cmd/kubeadm/app/phases/kubeconfig:go_default_library",
         "//federation/pkg/kubefed/util:go_default_library",
         "//pkg/api:go_default_library",
-        "//pkg/api/resource:go_default_library",
         "//pkg/apis/extensions:go_default_library",
         "//pkg/client/clientset_generated/internalclientset:go_default_library",
         "//pkg/kubectl/cmd/templates:go_default_library",
@@ -24,6 +23,7 @@ go_library(
         "//pkg/util/intstr:go_default_library",
         "//pkg/version:go_default_library",
         "//vendor:github.com/spf13/cobra",
+        "//vendor:k8s.io/apimachinery/pkg/api/resource",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/util/wait",
         "//vendor:k8s.io/client-go/tools/clientcmd",
@@ -42,14 +42,15 @@ go_test(
         "//federation/pkg/kubefed/testing:go_default_library",
         "//federation/pkg/kubefed/util:go_default_library",
         "//pkg/api:go_default_library",
-        "//pkg/api/resource:go_default_library",
         "//pkg/api/testapi:go_default_library",
         "//pkg/api/v1:go_default_library",
         "//pkg/apis/extensions/v1beta1:go_default_library",
         "//pkg/kubectl/cmd/testing:go_default_library",
         "//pkg/kubectl/cmd/util:go_default_library",
         "//pkg/util/intstr:go_default_library",
+        "//vendor:k8s.io/apimachinery/pkg/api/equality",
         "//vendor:k8s.io/apimachinery/pkg/api/errors",
+        "//vendor:k8s.io/apimachinery/pkg/api/resource",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/util/diff",
         "//vendor:k8s.io/client-go/dynamic",

hack/.linted_packages

@@ -264,7 +264,9 @@ plugin/pkg/admission/securitycontext/scdeny
 plugin/pkg/auth
 plugin/pkg/auth/authorizer
 plugin/pkg/auth/authorizer/rbac/bootstrappolicy
+staging/src/k8s.io/apimachinery/pkg/api/equality
 staging/src/k8s.io/apimachinery/pkg/api/errors
+staging/src/k8s.io/apimachinery/pkg/api/resource
 staging/src/k8s.io/apimachinery/pkg/apimachinery
 staging/src/k8s.io/apimachinery/pkg/conversion/queryparams
 staging/src/k8s.io/apimachinery/pkg/runtime

pkg/api/BUILD

@@ -26,11 +26,11 @@ go_library(
     ],
     tags = ["automanaged"],
     deps = [
-        "//pkg/api/resource:go_default_library",
         "//pkg/util/intstr:go_default_library",
         "//pkg/util/labels:go_default_library",
         "//vendor:github.com/davecgh/go-spew/spew",
         "//vendor:k8s.io/apimachinery/pkg/api/meta",
+        "//vendor:k8s.io/apimachinery/pkg/api/resource",
         "//vendor:k8s.io/apimachinery/pkg/apimachinery/announced",
         "//vendor:k8s.io/apimachinery/pkg/apimachinery/registered",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
@@ -56,7 +56,7 @@ go_test(
     library = ":go_default_library",
     tags = ["automanaged"],
     deps = [
-        "//pkg/api/resource:go_default_library",
+        "//vendor:k8s.io/apimachinery/pkg/api/resource",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/labels",
         "//vendor:k8s.io/apimachinery/pkg/runtime",
@@ -91,7 +91,9 @@ go_test(
         "//vendor:github.com/google/gofuzz",
         "//vendor:github.com/spf13/pflag",
         "//vendor:github.com/ugorji/go/codec",
+        "//vendor:k8s.io/apimachinery/pkg/api/equality",
         "//vendor:k8s.io/apimachinery/pkg/api/meta",
+        "//vendor:k8s.io/apimachinery/pkg/api/testing",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/conversion",
         "//vendor:k8s.io/apimachinery/pkg/runtime",

pkg/api/resource/BUILD

@@ -0,0 +1,27 @@
+package(default_visibility = ["//visibility:public"])
+
+licenses(["notice"])
+
+load(
+    "@io_bazel_rules_go//go:def.bzl",
+    "go_library",
+)
+
+go_library(
+    name = "go_default_library",
+    srcs = ["doc.go"],
+    tags = ["automanaged"],
+)
+
+filegroup(
+    name = "package-srcs",
+    srcs = glob(["**"]),
+    tags = ["automanaged"],
+    visibility = ["//visibility:private"],
+)
+
+filegroup(
+    name = "all-srcs",
+    srcs = [":package-srcs"],
+    tags = ["automanaged"],
+)

pkg/api/testing/BUILD

@@ -18,7 +18,6 @@ go_library(
     deps = [
         "//cmd/kubeadm/app/apis/kubeadm:go_default_library",
         "//pkg/api:go_default_library",
-        "//pkg/api/resource:go_default_library",
         "//pkg/api/testapi:go_default_library",
         "//pkg/api/v1:go_default_library",
         "//pkg/apis/autoscaling:go_default_library",
@@ -29,12 +28,13 @@ go_library(
         "//pkg/apis/rbac:go_default_library",
         "//pkg/util/intstr:go_default_library",
         "//vendor:github.com/google/gofuzz",
+        "//vendor:k8s.io/apimachinery/pkg/api/resource",
+        "//vendor:k8s.io/apimachinery/pkg/api/testing",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/fields",
         "//vendor:k8s.io/apimachinery/pkg/labels",
         "//vendor:k8s.io/apimachinery/pkg/runtime",
         "//vendor:k8s.io/apimachinery/pkg/runtime/schema",
-        "//vendor:k8s.io/apimachinery/pkg/types",
     ],
 )
 

pkg/api/v1/BUILD

@@ -31,7 +31,6 @@ go_library(
     tags = ["automanaged"],
     deps = [
         "//pkg/api:go_default_library",
-        "//pkg/api/resource:go_default_library",
         "//pkg/apis/extensions:go_default_library",
         "//pkg/util:go_default_library",
         "//pkg/util/intstr:go_default_library",
@@ -40,6 +39,7 @@ go_library(
         "//vendor:github.com/gogo/protobuf/sortkeys",
         "//vendor:github.com/ugorji/go/codec",
         "//vendor:k8s.io/apimachinery/pkg/api/meta",
+        "//vendor:k8s.io/apimachinery/pkg/api/resource",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/conversion",
         "//vendor:k8s.io/apimachinery/pkg/labels",
@@ -63,11 +63,12 @@ go_test(
     tags = ["automanaged"],
     deps = [
         "//pkg/api:go_default_library",
-        "//pkg/api/resource:go_default_library",
         "//pkg/api/testing/compat:go_default_library",
         "//pkg/api/v1:go_default_library",
         "//pkg/api/validation:go_default_library",
         "//pkg/util/intstr:go_default_library",
+        "//vendor:k8s.io/apimachinery/pkg/api/equality",
+        "//vendor:k8s.io/apimachinery/pkg/api/resource",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/runtime",
         "//vendor:k8s.io/apimachinery/pkg/util/diff",
@@ -84,8 +85,8 @@ go_test(
     library = ":go_default_library",
     tags = ["automanaged"],
     deps = [
-        "//pkg/api:go_default_library",
+        "//vendor:k8s.io/apimachinery/pkg/api/equality",
-        "//pkg/api/resource:go_default_library",
+        "//vendor:k8s.io/apimachinery/pkg/api/resource",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/labels",
     ],

pkg/api/v1/generated.proto

@@ -21,10 +21,10 @@ syntax = 'proto2';
 
 package k8s.io.kubernetes.pkg.api.v1;
 
+import "k8s.io/apimachinery/pkg/api/resource/generated.proto";
 import "k8s.io/apimachinery/pkg/apis/meta/v1/generated.proto";
 import "k8s.io/apimachinery/pkg/runtime/generated.proto";
 import "k8s.io/apimachinery/pkg/runtime/schema/generated.proto";
-import "k8s.io/apimachinery/pkg/api/resource/generated.proto";
 import "k8s.io/kubernetes/pkg/util/intstr/generated.proto";
 
 // Package-wide variables from generator "generated".
@@ -1241,23 +1241,23 @@ message LimitRangeItem {
 
   // Max usage constraints on this kind by resource name.
   // +optional
-  map<string, k8s.io.kubernetes.pkg.api.resource.Quantity> max = 2;
+  map<string, k8s.io.apimachinery.pkg.api.resource.Quantity> max = 2;
 
   // Min usage constraints on this kind by resource name.
   // +optional
-  map<string, k8s.io.kubernetes.pkg.api.resource.Quantity> min = 3;
+  map<string, k8s.io.apimachinery.pkg.api.resource.Quantity> min = 3;
 
   // Default resource requirement limit value by resource name if resource limit is omitted.
   // +optional
-  map<string, k8s.io.kubernetes.pkg.api.resource.Quantity> default = 4;
+  map<string, k8s.io.apimachinery.pkg.api.resource.Quantity> default = 4;
 
   // DefaultRequest is the default resource requirement request value by resource name if resource request is omitted.
   // +optional
-  map<string, k8s.io.kubernetes.pkg.api.resource.Quantity> defaultRequest = 5;
+  map<string, k8s.io.apimachinery.pkg.api.resource.Quantity> defaultRequest = 5;
 
   // MaxLimitRequestRatio if specified, the named resource must have a request and limit that are both non-zero where limit divided by request is less than or equal to the enumerated value; this represents the max burst for the named resource.
   // +optional
-  map<string, k8s.io.kubernetes.pkg.api.resource.Quantity> maxLimitRequestRatio = 6;
+  map<string, k8s.io.apimachinery.pkg.api.resource.Quantity> maxLimitRequestRatio = 6;
 }
 
 // LimitRangeList is a list of LimitRange items.
@@ -1527,7 +1527,7 @@ message NodeProxyOptions {
 // see http://releases.k8s.io/HEAD/docs/design/resources.md for more details.
 message NodeResources {
   // Capacity represents the available resources of a node
-  map<string, k8s.io.kubernetes.pkg.api.resource.Quantity> capacity = 1;
+  map<string, k8s.io.apimachinery.pkg.api.resource.Quantity> capacity = 1;
 }
 
 // A node selector represents the union of the results of one or more label queries
@@ -1589,12 +1589,12 @@ message NodeStatus {
   // Capacity represents the total resources of a node.
   // More info: http://kubernetes.io/docs/user-guide/persistent-volumes#capacity for more details.
   // +optional
-  map<string, k8s.io.kubernetes.pkg.api.resource.Quantity> capacity = 1;
+  map<string, k8s.io.apimachinery.pkg.api.resource.Quantity> capacity = 1;
 
   // Allocatable represents the resources of a node that are available for scheduling.
   // Defaults to Capacity.
   // +optional
-  map<string, k8s.io.kubernetes.pkg.api.resource.Quantity> allocatable = 2;
+  map<string, k8s.io.apimachinery.pkg.api.resource.Quantity> allocatable = 2;
 
   // NodePhase is the recently observed lifecycle phase of the node.
   // More info: http://releases.k8s.io/HEAD/docs/admin/node.md#node-phase
@@ -1964,7 +1964,7 @@ message PersistentVolumeClaimStatus {
 
   // Represents the actual resources of the underlying volume.
   // +optional
-  map<string, k8s.io.kubernetes.pkg.api.resource.Quantity> capacity = 3;
+  map<string, k8s.io.apimachinery.pkg.api.resource.Quantity> capacity = 3;
 }
 
 // PersistentVolumeClaimVolumeSource references the user's PVC in the same namespace.
@@ -2086,7 +2086,7 @@ message PersistentVolumeSpec {
   // A description of the persistent volume's resources and capacity.
   // More info: http://kubernetes.io/docs/user-guide/persistent-volumes#capacity
   // +optional
-  map<string, k8s.io.kubernetes.pkg.api.resource.Quantity> capacity = 1;
+  map<string, k8s.io.apimachinery.pkg.api.resource.Quantity> capacity = 1;
 
   // The actual volume backing the persistent volume.
   optional PersistentVolumeSource persistentVolumeSource = 2;
@@ -2992,7 +2992,7 @@ message ResourceFieldSelector {
 
   // Specifies the output format of the exposed resources, defaults to "1"
   // +optional
-  optional k8s.io.kubernetes.pkg.api.resource.Quantity divisor = 3;
+  optional k8s.io.apimachinery.pkg.api.resource.Quantity divisor = 3;
 }
 
 // ResourceQuota sets aggregate quota restrictions enforced per namespace
@@ -3030,7 +3030,7 @@ message ResourceQuotaSpec {
   // Hard is the set of desired hard limits for each named resource.
   // More info: http://releases.k8s.io/HEAD/docs/design/admission_control_resource_quota.md#admissioncontrol-plugin-resourcequota
   // +optional
-  map<string, k8s.io.kubernetes.pkg.api.resource.Quantity> hard = 1;
+  map<string, k8s.io.apimachinery.pkg.api.resource.Quantity> hard = 1;
 
   // A collection of filters that must match each object tracked by a quota.
   // If not specified, the quota matches all objects.
@@ -3043,11 +3043,11 @@ message ResourceQuotaStatus {
   // Hard is the set of enforced hard limits for each named resource.
   // More info: http://releases.k8s.io/HEAD/docs/design/admission_control_resource_quota.md#admissioncontrol-plugin-resourcequota
   // +optional
-  map<string, k8s.io.kubernetes.pkg.api.resource.Quantity> hard = 1;
+  map<string, k8s.io.apimachinery.pkg.api.resource.Quantity> hard = 1;
 
   // Used is the current observed total usage of the resource in the namespace.
   // +optional
-  map<string, k8s.io.kubernetes.pkg.api.resource.Quantity> used = 2;
+  map<string, k8s.io.apimachinery.pkg.api.resource.Quantity> used = 2;
 }
 
 // ResourceRequirements describes the compute resource requirements.
@@ -3055,14 +3055,14 @@ message ResourceRequirements {
   // Limits describes the maximum amount of compute resources allowed.
   // More info: http://kubernetes.io/docs/user-guide/compute-resources/
   // +optional
-  map<string, k8s.io.kubernetes.pkg.api.resource.Quantity> limits = 1;
+  map<string, k8s.io.apimachinery.pkg.api.resource.Quantity> limits = 1;
 
   // Requests describes the minimum amount of compute resources required.
   // If Requests is omitted for a container, it defaults to Limits if that is explicitly specified,
   // otherwise to an implementation-defined value.
   // More info: http://kubernetes.io/docs/user-guide/compute-resources/
   // +optional
-  map<string, k8s.io.kubernetes.pkg.api.resource.Quantity> requests = 2;
+  map<string, k8s.io.apimachinery.pkg.api.resource.Quantity> requests = 2;
 }
 
 // SELinuxOptions are the labels to be applied to the container

pkg/api/v1/types.generated.go

@@ -65,10 +65,10 @@ func init() {
 		panic(err)
 	}
 	if false { // reference the types, but skip this branch at build/run time
-		var v0 pkg2_v1.Time
+		var v0 pkg3_resource.Quantity
-		var v1 pkg5_runtime.RawExtension
+		var v1 pkg2_v1.Time
-		var v2 pkg1_types.UID
+		var v2 pkg5_runtime.RawExtension
-		var v3 pkg3_resource.Quantity
+		var v3 pkg1_types.UID
 		var v4 pkg4_intstr.IntOrString
 		var v5 time.Time
 		_, _, _, _, _, _ = v0, v1, v2, v3, v4, v5

pkg/api/v1/validation/BUILD

@@ -13,8 +13,8 @@ go_library(
     tags = ["automanaged"],
     deps = [
         "//pkg/api:go_default_library",
-        "//pkg/api/resource:go_default_library",
         "//pkg/api/v1:go_default_library",
+        "//vendor:k8s.io/apimachinery/pkg/api/resource",
         "//vendor:k8s.io/apimachinery/pkg/util/sets",
         "//vendor:k8s.io/apimachinery/pkg/util/validation",
         "//vendor:k8s.io/apimachinery/pkg/util/validation/field",

pkg/api/validation/BUILD

@@ -20,7 +20,6 @@ go_library(
     deps = [
         "//pkg/api:go_default_library",
         "//pkg/api/pod:go_default_library",
-        "//pkg/api/resource:go_default_library",
         "//pkg/api/service:go_default_library",
         "//pkg/api/util:go_default_library",
         "//pkg/api/v1:go_default_library",
@@ -33,7 +32,9 @@ go_library(
         "//vendor:github.com/emicklei/go-restful/swagger",
         "//vendor:github.com/exponent-io/jsonpath",
         "//vendor:github.com/golang/glog",
+        "//vendor:k8s.io/apimachinery/pkg/api/equality",
         "//vendor:k8s.io/apimachinery/pkg/api/meta",
+        "//vendor:k8s.io/apimachinery/pkg/api/resource",
         "//vendor:k8s.io/apimachinery/pkg/api/validation",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1/unstructured",
@@ -69,7 +70,6 @@ go_test(
     tags = ["automanaged"],
     deps = [
         "//pkg/api:go_default_library",
-        "//pkg/api/resource:go_default_library",
         "//pkg/api/service:go_default_library",
         "//pkg/api/testapi:go_default_library",
         "//pkg/api/testing:go_default_library",
@@ -80,6 +80,8 @@ go_test(
         "//pkg/security/apparmor:go_default_library",
         "//pkg/util/intstr:go_default_library",
         "//vendor:github.com/ghodss/yaml",
+        "//vendor:k8s.io/apimachinery/pkg/api/resource",
+        "//vendor:k8s.io/apimachinery/pkg/api/testing",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/runtime",
         "//vendor:k8s.io/apimachinery/pkg/util/sets",

pkg/api/validation/genericvalidation/BUILD

@@ -18,6 +18,7 @@ go_library(
     deps = [
         "//pkg/api:go_default_library",
         "//pkg/api/v1:go_default_library",
+        "//vendor:k8s.io/apimachinery/pkg/api/equality",
         "//vendor:k8s.io/apimachinery/pkg/api/validation",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1/validation",

pkg/apimachinery/tests/BUILD

@@ -30,6 +30,7 @@ go_test(
         "//pkg/api/validation:go_default_library",
         "//pkg/apis/extensions:go_default_library",
         "//vendor:github.com/google/gofuzz",
+        "//vendor:k8s.io/apimachinery/pkg/api/equality",
         "//vendor:k8s.io/apimachinery/pkg/api/meta",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1/unstructured",

pkg/apis/apps/v1beta1/BUILD

@@ -25,12 +25,12 @@ go_library(
     tags = ["automanaged"],
     deps = [
         "//pkg/api:go_default_library",
-        "//pkg/api/resource:go_default_library",
         "//pkg/api/v1:go_default_library",
         "//pkg/apis/apps:go_default_library",
         "//pkg/util/intstr:go_default_library",
         "//vendor:github.com/gogo/protobuf/proto",
         "//vendor:github.com/ugorji/go/codec",
+        "//vendor:k8s.io/apimachinery/pkg/api/resource",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/conversion",
         "//vendor:k8s.io/apimachinery/pkg/runtime",

pkg/apis/apps/v1beta1/generated.pb.go

@@ -1033,46 +1033,46 @@ var (
 )
 
 var fileDescriptorGenerated = []byte{
-	// 645 bytes of a gzipped FileDescriptorProto
+	// 647 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x9c, 0x93, 0xcd, 0x6e, 0xd3, 0x40,
 	0x10, 0xc7, 0xe3, 0xa4, 0x29, 0x61, 0x53, 0xbe, 0x96, 0x0a, 0x45, 0x15, 0x72, 0xab, 0x5c, 0x08,
-	0x52, 0xbb, 0x26, 0x6d, 0x81, 0x8a, 0xa3, 0x91, 0x40, 0x48, 0x40, 0x91, 0x83, 0x2a, 0x51, 0x40,
+	0x52, 0xbb, 0x4b, 0xda, 0x02, 0x15, 0x47, 0x23, 0x81, 0x90, 0x80, 0x22, 0x07, 0x55, 0xa2, 0x80,
-	0x62, 0xed, 0x4c, 0xd3, 0x25, 0xfe, 0x92, 0x77, 0x1c, 0x89, 0x1b, 0x17, 0x0e, 0xdc, 0x78, 0x13,
+	0xc4, 0xda, 0x99, 0xa6, 0x4b, 0xec, 0xd8, 0xf2, 0x8e, 0x23, 0x71, 0xe3, 0xc2, 0x81, 0x1b, 0x6f,
-	0x6e, 0x3c, 0x43, 0xc5, 0xa9, 0x47, 0x4e, 0x15, 0x0d, 0x2f, 0x82, 0xbc, 0xd9, 0x24, 0x06, 0x27,
+	0xc2, 0x8d, 0x67, 0xa8, 0x38, 0xf5, 0xc8, 0xa9, 0xa2, 0xe1, 0x45, 0x90, 0x37, 0x9b, 0x0f, 0xea,
-	0x6a, 0xd5, 0x5b, 0x66, 0x3d, 0xff, 0xdf, 0xcc, 0xfc, 0x67, 0x42, 0x1e, 0xf6, 0x77, 0x24, 0x13,
+	0x94, 0x56, 0xbd, 0x65, 0xd6, 0xf3, 0xff, 0xcd, 0xcc, 0x7f, 0x26, 0xe4, 0x61, 0x77, 0x4b, 0x31,
-	0x91, 0xd5, 0x4f, 0x5d, 0x48, 0x42, 0x40, 0x90, 0x56, 0xdc, 0xef, 0x59, 0x3c, 0x16, 0xd2, 0xe2,
+	0x19, 0xf1, 0x6e, 0xea, 0x41, 0xd2, 0x03, 0x04, 0xc5, 0xe3, 0x6e, 0x87, 0x8b, 0x58, 0x2a, 0x2e,
-	0x71, 0x2c, 0xad, 0x41, 0xdb, 0x05, 0xe4, 0x6d, 0xab, 0x07, 0x21, 0x24, 0x1c, 0xa1, 0xcb, 0xe2,
+	0xe2, 0x58, 0xf1, 0x7e, 0xd3, 0x03, 0x14, 0x4d, 0xde, 0x81, 0x1e, 0x24, 0x02, 0xa1, 0xcd, 0xe2,
-	0x24, 0xc2, 0x88, 0xde, 0x19, 0x09, 0xd9, 0x54, 0xc8, 0xe2, 0x7e, 0x8f, 0x65, 0x42, 0x96, 0x09,
+	0x24, 0xc2, 0x88, 0xde, 0x19, 0x0a, 0xd9, 0x44, 0xc8, 0xe2, 0x6e, 0x87, 0x65, 0x42, 0x96, 0x09,
-	0x99, 0x16, 0xae, 0x6c, 0xf4, 0x04, 0x1e, 0xa6, 0x2e, 0xf3, 0xa2, 0xc0, 0xea, 0x45, 0xbd, 0xc8,
+	0x99, 0x11, 0x2e, 0xad, 0x75, 0x24, 0xee, 0xa7, 0x1e, 0xf3, 0xa3, 0x90, 0x77, 0xa2, 0x4e, 0xc4,
-	0x52, 0x7a, 0x37, 0x3d, 0x50, 0x91, 0x0a, 0xd4, 0xaf, 0x11, 0x77, 0x65, 0x5b, 0x37, 0xc4, 0x63,
+	0xb5, 0xde, 0x4b, 0xf7, 0x74, 0xa4, 0x03, 0xfd, 0x6b, 0xc8, 0x5d, 0xda, 0x34, 0x0d, 0x89, 0x58,
-	0x11, 0x70, 0xef, 0x50, 0x84, 0x90, 0x7c, 0x9a, 0xb6, 0x14, 0x00, 0x72, 0x6b, 0x50, 0xe8, 0x66,
+	0x86, 0xc2, 0xdf, 0x97, 0x3d, 0x48, 0x3e, 0x8d, 0x5a, 0xe2, 0x09, 0xa8, 0x28, 0x4d, 0x7c, 0x38,
-	0xc5, 0x9a, 0xa7, 0x4a, 0xd2, 0x10, 0x45, 0x00, 0x05, 0xc1, 0x83, 0xb3, 0x04, 0xd2, 0x3b, 0x84,
+	0xd9, 0xcd, 0x7f, 0x55, 0x8a, 0x87, 0x80, 0x82, 0xf7, 0x73, 0x33, 0x2c, 0xf1, 0xd3, 0x54, 0x49,
-	0x80, 0x17, 0x74, 0x9b, 0x73, 0xfd, 0xb2, 0x12, 0x90, 0x51, 0x9a, 0x78, 0xc5, 0x5a, 0xeb, 0xf3,
+	0xda, 0x43, 0x19, 0xe6, 0xcb, 0x3c, 0x38, 0x4b, 0xa0, 0xfc, 0x7d, 0x08, 0x45, 0x4e, 0xb7, 0x7a,
-	0x35, 0x33, 0x46, 0x69, 0xcf, 0xce, 0x4e, 0x51, 0xf8, 0x96, 0x08, 0x51, 0x62, 0xf2, 0xbf, 0xa4,
+	0xaa, 0xcb, 0xb3, 0xda, 0x6a, 0xce, 0xce, 0x4e, 0x51, 0x06, 0x5c, 0xf6, 0x50, 0x61, 0x72, 0x52,
-	0xf9, 0xbd, 0x4c, 0xea, 0x1d, 0xe4, 0x08, 0x07, 0xa9, 0xdf, 0x01, 0xa4, 0x1f, 0x48, 0x2d, 0x33,
+	0x52, 0xff, 0x5e, 0x24, 0xd5, 0x16, 0x0a, 0x84, 0xbd, 0x34, 0x68, 0x01, 0xd2, 0x0f, 0xa4, 0x92,
-	0xaa, 0xcb, 0x91, 0x37, 0x8c, 0x35, 0xa3, 0x55, 0xdf, 0xbc, 0xc7, 0xf4, 0xba, 0xf2, 0xf3, 0x4e,
+	0x0d, 0xdd, 0x16, 0x28, 0x6a, 0xd6, 0x8a, 0xd5, 0xa8, 0xae, 0xdf, 0x63, 0x66, 0x61, 0xd3, 0xbd,
-	0x17, 0x96, 0x65, 0xb3, 0x41, 0x9b, 0xed, 0xba, 0x1f, 0xc1, 0xc3, 0x17, 0x80, 0xdc, 0xa6, 0x47,
+	0x4f, 0x56, 0x96, 0x65, 0xb3, 0x7e, 0x93, 0x6d, 0x7b, 0x1f, 0xc1, 0xc7, 0x17, 0x80, 0xc2, 0xa1,
-	0x27, 0xab, 0xa5, 0xe1, 0xc9, 0x2a, 0x99, 0xbe, 0x39, 0x13, 0x2a, 0xdd, 0x27, 0x0b, 0x32, 0x06,
+	0x07, 0x47, 0xcb, 0x85, 0xc1, 0xd1, 0x32, 0x99, 0xbc, 0xb9, 0x63, 0x2a, 0xdd, 0x25, 0x73, 0x2a,
-	0xaf, 0x51, 0x56, 0xf4, 0x1d, 0x76, 0xce, 0x63, 0x60, 0xb9, 0x2e, 0x3b, 0x31, 0x78, 0xf6, 0x92,
+	0x06, 0xbf, 0x56, 0xd4, 0xf4, 0x2d, 0x76, 0xce, 0x73, 0x60, 0x53, 0x5d, 0xb6, 0x62, 0xf0, 0x9d,
-	0xae, 0xb2, 0x90, 0x45, 0x8e, 0x62, 0x52, 0x97, 0x2c, 0x4a, 0xe4, 0x98, 0xca, 0x46, 0x45, 0xd1,
+	0x05, 0x53, 0x65, 0x2e, 0x8b, 0x5c, 0xcd, 0xa4, 0x1e, 0x99, 0x57, 0x28, 0x30, 0x55, 0xb5, 0x92,
-	0x1f, 0x5d, 0x88, 0xae, 0x08, 0xf6, 0x55, 0xcd, 0x5f, 0x1c, 0xc5, 0x8e, 0x26, 0x37, 0x7f, 0x1a,
+	0xa6, 0x3f, 0xba, 0x10, 0x5d, 0x13, 0x9c, 0xab, 0x86, 0x3f, 0x3f, 0x8c, 0x5d, 0x43, 0xae, 0xff,
-	0xe4, 0x5a, 0x2e, 0xfb, 0xb9, 0x90, 0x48, 0xdf, 0x15, 0x5c, 0x63, 0xe7, 0x73, 0x2d, 0x53, 0x2b,
+	0xb4, 0xc8, 0xb5, 0xa9, 0xec, 0xe7, 0x52, 0x21, 0x7d, 0x97, 0x73, 0x8d, 0x9d, 0xcf, 0xb5, 0x4c,
-	0xcf, 0xae, 0xeb, 0x6a, 0xb5, 0xf1, 0x4b, 0xce, 0xb1, 0x37, 0xa4, 0x2a, 0x10, 0x02, 0xd9, 0x28,
+	0xad, 0x3d, 0xbb, 0x6e, 0xaa, 0x55, 0x46, 0x2f, 0x53, 0x8e, 0xbd, 0x21, 0x65, 0x89, 0x10, 0xaa,
-	0xaf, 0x55, 0x5a, 0xf5, 0xcd, 0xed, 0x8b, 0x0c, 0x65, 0x5f, 0xd1, 0x05, 0xaa, 0xcf, 0x32, 0x94,
+	0x5a, 0x71, 0xa5, 0xd4, 0xa8, 0xae, 0x6f, 0x5e, 0x64, 0x28, 0xe7, 0x8a, 0x29, 0x50, 0x7e, 0x96,
-	0x33, 0x22, 0x36, 0x7f, 0x54, 0xfe, 0x19, 0x26, 0xb3, 0x92, 0xb6, 0x48, 0x2d, 0x81, 0xd8, 0x17,
+	0xa1, 0xdc, 0x21, 0xb1, 0xfe, 0xa3, 0xf4, 0xcf, 0x30, 0x99, 0x95, 0xb4, 0x41, 0x2a, 0x09, 0xc4,
-	0x1e, 0x97, 0x6a, 0x98, 0xaa, 0xbd, 0x94, 0x35, 0xe6, 0xe8, 0x37, 0x67, 0xf2, 0x95, 0xbe, 0x27,
+	0x81, 0xf4, 0x85, 0xd2, 0xc3, 0x94, 0x9d, 0x85, 0xac, 0x31, 0xd7, 0xbc, 0xb9, 0xe3, 0xaf, 0xf4,
-	0x35, 0x09, 0x3e, 0x78, 0x18, 0x25, 0x7a, 0x9d, 0x5b, 0xe7, 0x1c, 0x9b, 0xbb, 0xe0, 0x77, 0xb4,
+	0x3d, 0xa9, 0x28, 0x08, 0xc0, 0xc7, 0x28, 0x31, 0xeb, 0xdc, 0x38, 0xe7, 0xd8, 0xc2, 0x83, 0xa0,
-	0x74, 0x84, 0x1f, 0x47, 0xce, 0x04, 0x49, 0xdf, 0x92, 0x1a, 0x42, 0x10, 0xfb, 0x1c, 0x41, 0xef,
+	0x65, 0xa4, 0x43, 0xfc, 0x28, 0x72, 0xc7, 0x48, 0xfa, 0x96, 0x54, 0x10, 0xc2, 0x38, 0x10, 0x08,
-	0x73, 0x63, 0xfe, 0xe8, 0x19, 0xf6, 0x55, 0xd4, 0x7d, 0xad, 0x05, 0xea, 0x44, 0x26, 0xa6, 0x8e,
+	0x66, 0x9f, 0x6b, 0xa7, 0x8f, 0x9e, 0x61, 0x5f, 0x45, 0xed, 0xd7, 0x46, 0xa0, 0x4f, 0x64, 0x6c,
-	0x5f, 0x9d, 0x09, 0x90, 0x7e, 0x31, 0xc8, 0xf2, 0x20, 0xf2, 0xd3, 0x00, 0x1e, 0xfb, 0x5c, 0x04,
+	0xea, 0xe8, 0xd5, 0x1d, 0x03, 0xe9, 0x17, 0x8b, 0x2c, 0xf6, 0xa3, 0x20, 0x0d, 0xe1, 0x71, 0x20,
-	0xe3, 0x0c, 0xd9, 0x58, 0x50, 0x26, 0x6f, 0x9d, 0x51, 0x09, 0x12, 0x29, 0x24, 0x42, 0x88, 0x7b,
+	0x64, 0x38, 0xca, 0x50, 0xb5, 0x39, 0x6d, 0xf2, 0xc6, 0x19, 0x95, 0x20, 0x51, 0x52, 0x21, 0xf4,
-	0x53, 0x86, 0x7d, 0x5b, 0xd7, 0x5b, 0xde, 0x9b, 0x01, 0x76, 0x66, 0x96, 0xa3, 0xf7, 0x49, 0x5d,
+	0x70, 0x67, 0xc2, 0x70, 0x6e, 0x9b, 0x7a, 0x8b, 0x3b, 0x33, 0xc0, 0xee, 0xcc, 0x72, 0xf4, 0x3e,
-	0x42, 0x32, 0x10, 0x1e, 0xbc, 0xe4, 0x01, 0x34, 0xaa, 0x6b, 0x46, 0xeb, 0xb2, 0x7d, 0x53, 0x83,
+	0xa9, 0x2a, 0x48, 0xfa, 0xd2, 0x87, 0x97, 0x22, 0x84, 0x5a, 0x79, 0xc5, 0x6a, 0x5c, 0x76, 0x6e,
-	0xea, 0x9d, 0xe9, 0x27, 0x27, 0x9f, 0xd7, 0xfc, 0x6a, 0x90, 0x1b, 0x85, 0x9b, 0xa5, 0x4f, 0x08,
+	0x1a, 0x50, 0xb5, 0x35, 0xf9, 0xe4, 0x4e, 0xe7, 0xd5, 0xbf, 0x5a, 0xe4, 0x46, 0xee, 0x66, 0xe9,
-	0x8d, 0xdc, 0x2c, 0x0d, 0xba, 0x4f, 0x47, 0x7f, 0x74, 0x11, 0x85, 0x6a, 0x89, 0x15, 0xfb, 0xd6,
+	0x13, 0x42, 0x23, 0x2f, 0x4b, 0x83, 0xf6, 0xd3, 0xe1, 0x1f, 0x5d, 0x46, 0x3d, 0xbd, 0xc4, 0x92,
-	0xf0, 0x64, 0x95, 0xee, 0x16, 0xbe, 0x3a, 0x33, 0x14, 0x74, 0x3d, 0x77, 0x02, 0x65, 0x75, 0x02,
+	0x73, 0x6b, 0x70, 0xb4, 0x4c, 0xb7, 0x73, 0x5f, 0xdd, 0x19, 0x0a, 0xba, 0x3a, 0x75, 0x02, 0x45,
-	0x13, 0x2b, 0x8b, 0x67, 0x60, 0xdf, 0x3d, 0x3a, 0x35, 0x4b, 0xc7, 0xa7, 0x66, 0xe9, 0xd7, 0xa9,
+	0x7d, 0x02, 0x63, 0x2b, 0xf3, 0x67, 0xe0, 0xdc, 0x3d, 0x38, 0xb6, 0x0b, 0x87, 0xc7, 0x76, 0xe1,
-	0x59, 0xfa, 0x3c, 0x34, 0x8d, 0xa3, 0xa1, 0x69, 0x1c, 0x0f, 0x4d, 0xe3, 0xf7, 0xd0, 0x34, 0xbe,
+	0xd7, 0xb1, 0x5d, 0xf8, 0x3c, 0xb0, 0xad, 0x83, 0x81, 0x6d, 0x1d, 0x0e, 0x6c, 0xeb, 0xf7, 0xc0,
-	0xfd, 0x31, 0x4b, 0xfb, 0x97, 0xf4, 0x45, 0xfe, 0x0d, 0x00, 0x00, 0xff, 0xff, 0xe5, 0x5a, 0x18,
+	0xb6, 0xbe, 0xfd, 0xb1, 0x0b, 0xbb, 0x97, 0xcc, 0x45, 0xfe, 0x0d, 0x00, 0x00, 0xff, 0xff, 0x39,
-	0x81, 0x34, 0x06, 0x00, 0x00,
+	0x79, 0xea, 0x95, 0x36, 0x06, 0x00, 0x00,
 }

pkg/apis/apps/v1beta1/generated.proto

@@ -21,10 +21,10 @@ syntax = 'proto2';
 
 package k8s.io.kubernetes.pkg.apis.apps.v1beta1;
 
+import "k8s.io/apimachinery/pkg/api/resource/generated.proto";
 import "k8s.io/apimachinery/pkg/apis/meta/v1/generated.proto";
 import "k8s.io/apimachinery/pkg/runtime/generated.proto";
 import "k8s.io/apimachinery/pkg/runtime/schema/generated.proto";
-import "k8s.io/apimachinery/pkg/api/resource/generated.proto";
 import "k8s.io/kubernetes/pkg/api/v1/generated.proto";
 import "k8s.io/kubernetes/pkg/util/intstr/generated.proto";
 

pkg/apis/apps/v1beta1/types.generated.go

@@ -65,9 +65,9 @@ func init() {
 		panic(err)
 	}
 	if false { // reference the types, but skip this branch at build/run time
-		var v0 pkg1_v1.TypeMeta
+		var v0 pkg4_resource.Quantity
-		var v1 pkg2_types.UID
+		var v1 pkg1_v1.TypeMeta
-		var v2 pkg4_resource.Quantity
+		var v2 pkg2_types.UID
 		var v3 pkg3_v1.PodTemplateSpec
 		var v4 pkg5_intstr.IntOrString
 		var v5 time.Time

pkg/apis/authentication/v1beta1/generated.pb.go

@@ -1236,47 +1236,47 @@ var (
 )
 
 var fileDescriptorGenerated = []byte{
-	// 660 bytes of a gzipped FileDescriptorProto
+	// 662 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xa4, 0x53, 0xcf, 0x4f, 0x13, 0x41,
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xa4, 0x53, 0x4d, 0x6f, 0xd3, 0x40,
-	0x14, 0xee, 0xf6, 0x07, 0xb6, 0x53, 0x51, 0x9c, 0xc4, 0xa4, 0x69, 0xe2, 0xb6, 0xa9, 0x17, 0x4c,
+	0x10, 0xb5, 0xf3, 0x51, 0x92, 0x0d, 0x85, 0xb2, 0x12, 0x52, 0x14, 0x09, 0x27, 0x0a, 0x97, 0x22,
-	0x70, 0xd6, 0x12, 0x83, 0x04, 0xe2, 0x81, 0x0d, 0x68, 0x38, 0x18, 0x93, 0x41, 0x3c, 0x98, 0x98,
+	0x95, 0x35, 0xa9, 0x50, 0xa9, 0x5a, 0x71, 0xa8, 0xd5, 0x82, 0x7a, 0x40, 0x48, 0x5b, 0xca, 0x01,
-	0x38, 0xdd, 0x3e, 0xb6, 0xe3, 0xb2, 0x3f, 0x32, 0x3b, 0x5b, 0xe4, 0xc6, 0x9f, 0xe0, 0xd1, 0xa3,
+	0x09, 0x89, 0x8d, 0x33, 0x75, 0x8c, 0xeb, 0x0f, 0xad, 0xd7, 0x29, 0xbd, 0xf5, 0x27, 0x70, 0xe4,
-	0xff, 0x8b, 0x17, 0x8e, 0x1c, 0x3c, 0x78, 0x30, 0xc4, 0xd6, 0x7f, 0xc4, 0xcc, 0xec, 0x48, 0x0b,
+	0xc8, 0x7f, 0xe1, 0xd2, 0x63, 0x0f, 0x1c, 0x38, 0xa0, 0x8a, 0x84, 0x3f, 0x82, 0x76, 0xbd, 0x6d,
-	0x85, 0x18, 0xe1, 0xb6, 0xf3, 0xcd, 0xfb, 0xbe, 0xef, 0xbd, 0x6f, 0xf6, 0xa1, 0x8d, 0x60, 0x35,
+	0xd2, 0xa4, 0x05, 0xd1, 0xde, 0xbc, 0x6f, 0x66, 0xde, 0x7b, 0x33, 0xe3, 0x41, 0x1b, 0xc1, 0x6a,
-	0x25, 0x3c, 0x76, 0x82, 0xac, 0x07, 0x22, 0x02, 0x09, 0xa9, 0x93, 0x04, 0xbe, 0xc3, 0x12, 0x9e,
+	0x4a, 0xfc, 0xd8, 0x0e, 0xb2, 0x2e, 0xf0, 0x08, 0x04, 0xa4, 0x76, 0x12, 0x78, 0x36, 0x4b, 0xfc,
-	0x3a, 0x2c, 0x93, 0x03, 0x88, 0x24, 0xf7, 0x98, 0xe4, 0x71, 0xe4, 0x0c, 0xbb, 0x3d, 0x90, 0xac,
+	0xd4, 0x66, 0x99, 0xe8, 0x43, 0x24, 0x7c, 0x97, 0x09, 0x3f, 0x8e, 0xec, 0x41, 0xa7, 0x0b, 0x82,
-	0xeb, 0xf8, 0x10, 0x81, 0x60, 0x12, 0xfa, 0x24, 0x11, 0xb1, 0x8c, 0x71, 0x37, 0x97, 0x20, 0x13,
+	0x75, 0x6c, 0x0f, 0x22, 0xe0, 0x4c, 0x40, 0x8f, 0x24, 0x3c, 0x16, 0x31, 0xee, 0xe4, 0x14, 0x64,
-	0x09, 0x92, 0x04, 0x3e, 0x51, 0x12, 0xe4, 0xbc, 0x04, 0x31, 0x12, 0xcd, 0xc7, 0x3e, 0x97, 0x83,
+	0x4c, 0x41, 0x92, 0xc0, 0x23, 0x92, 0x82, 0x5c, 0xa4, 0x20, 0x9a, 0xa2, 0xf1, 0xd8, 0xf3, 0x45,
-	0xac, 0x47, 0xbc, 0x38, 0x74, 0xfc, 0xd8, 0x8f, 0x1d, 0xad, 0xd4, 0xcb, 0xf6, 0xf4, 0x49, 0x1f,
+	0x3f, 0xeb, 0x12, 0x37, 0x0e, 0x6d, 0x2f, 0xf6, 0x62, 0x5b, 0x31, 0x75, 0xb3, 0x3d, 0xf5, 0x52,
-	0xf4, 0x57, 0xee, 0xd0, 0x7c, 0x6a, 0x9a, 0x64, 0x09, 0x0f, 0x99, 0x37, 0xe0, 0x11, 0x88, 0xc3,
+	0x0f, 0xf5, 0x95, 0x2b, 0x34, 0x9e, 0x6a, 0x93, 0x2c, 0xf1, 0x43, 0xe6, 0xf6, 0xfd, 0x08, 0xf8,
-	0x49, 0x9b, 0x21, 0x48, 0xe6, 0x0c, 0x67, 0xfa, 0x6a, 0x3a, 0x57, 0xb1, 0x44, 0x16, 0x49, 0x1e,
+	0xe1, 0x99, 0x4d, 0x9b, 0x43, 0x1a, 0x67, 0xdc, 0x85, 0x69, 0x5f, 0x7f, 0xad, 0x4a, 0xed, 0x10,
-	0xc2, 0x0c, 0x61, 0xe5, 0x5f, 0x84, 0xd4, 0x1b, 0x40, 0xc8, 0x66, 0x78, 0xcb, 0x57, 0x66, 0xe8,
+	0x04, 0xb3, 0x07, 0x33, 0xdd, 0x34, 0xec, 0xab, 0xaa, 0x78, 0x16, 0x09, 0x3f, 0x9c, 0x95, 0x59,
-	0x08, 0x48, 0xe3, 0x4c, 0x78, 0xb3, 0x5e, 0x4b, 0x57, 0x73, 0x2e, 0x19, 0xa5, 0x7b, 0x79, 0x75,
+	0xf9, 0x57, 0x41, 0xea, 0xf6, 0x21, 0x64, 0x33, 0x75, 0x4b, 0x57, 0x4e, 0xfe, 0x32, 0x5b, 0x9d,
-	0x26, 0xf9, 0xbe, 0xc3, 0x23, 0x99, 0x4a, 0x71, 0x91, 0xd2, 0x79, 0x86, 0xd0, 0xd6, 0x27, 0x29,
+	0xcb, 0xb3, 0x33, 0xe1, 0xef, 0xdb, 0x7e, 0x24, 0x52, 0xc1, 0xa7, 0x4b, 0xda, 0xcf, 0x10, 0xda,
-	0xd8, 0x5b, 0xb6, 0x9f, 0x01, 0x6e, 0xa1, 0x0a, 0x97, 0x10, 0xa6, 0x0d, 0xab, 0x5d, 0x5a, 0xac,
+	0xfa, 0x24, 0x38, 0x7b, 0xcb, 0xf6, 0x33, 0xc0, 0x4d, 0x54, 0xf6, 0x05, 0x84, 0x69, 0xdd, 0x6c,
-	0xb9, 0xb5, 0xf1, 0x69, 0xab, 0xb2, 0xad, 0x00, 0x9a, 0xe3, 0x6b, 0xd5, 0x2f, 0x5f, 0x5b, 0x85,
+	0x15, 0x17, 0xab, 0x4e, 0x75, 0x74, 0xda, 0x2c, 0x6f, 0x4b, 0x80, 0xe6, 0xf8, 0x5a, 0xe5, 0xcb,
-	0xa3, 0x9f, 0xed, 0x42, 0xe7, 0x5b, 0x11, 0xd5, 0xdf, 0xc4, 0x01, 0x44, 0x14, 0x86, 0x1c, 0x0e,
+	0xd7, 0xa6, 0x71, 0xf4, 0xb3, 0x65, 0xb4, 0xbf, 0x15, 0x50, 0xed, 0x4d, 0x1c, 0x40, 0x44, 0x61,
-	0xf0, 0x07, 0x54, 0x55, 0x09, 0xf7, 0x99, 0x64, 0x0d, 0xab, 0x6d, 0x2d, 0xd6, 0x97, 0x9f, 0x10,
+	0xe0, 0xc3, 0x01, 0xfe, 0x80, 0x2a, 0x72, 0x5a, 0x3d, 0x26, 0x58, 0xdd, 0x6c, 0x99, 0x8b, 0xb5,
-	0xf3, 0xe2, 0xd3, 0x41, 0x4d, 0xde, 0x5c, 0x55, 0x93, 0x61, 0x97, 0xbc, 0xee, 0x7d, 0x04, 0x4f,
+	0xe5, 0x27, 0x44, 0xef, 0x7c, 0xb2, 0xe9, 0xf1, 0xd6, 0x65, 0x36, 0x19, 0x74, 0xc8, 0xeb, 0xee,
-	0xbe, 0x02, 0xc9, 0x5c, 0x7c, 0x7c, 0xda, 0x2a, 0x8c, 0x4f, 0x5b, 0x68, 0x82, 0xd1, 0x33, 0x55,
+	0x47, 0x70, 0xc5, 0x2b, 0x10, 0xcc, 0xc1, 0xc7, 0xa7, 0x4d, 0x63, 0x74, 0xda, 0x44, 0x63, 0x8c,
-	0xdc, 0x47, 0xe5, 0x34, 0x01, 0xaf, 0x51, 0xd4, 0xea, 0x2e, 0xf9, 0xef, 0xff, 0x89, 0x4c, 0xf5,
+	0x9e, 0xb3, 0xe2, 0x1e, 0x2a, 0xa5, 0x09, 0xb8, 0xf5, 0x82, 0x62, 0x77, 0xc8, 0x7f, 0xff, 0x51,
-	0xbb, 0x93, 0x80, 0xe7, 0xde, 0x36, 0x7e, 0x65, 0x75, 0xa2, 0x5a, 0x1d, 0xef, 0xa3, 0xb9, 0x54,
+	0x64, 0xc2, 0xef, 0x4e, 0x02, 0xae, 0x73, 0x5b, 0xeb, 0x95, 0xe4, 0x8b, 0x2a, 0x76, 0xbc, 0x8f,
-	0x32, 0x99, 0xa5, 0x8d, 0x92, 0xf6, 0xd9, 0xbc, 0xa1, 0x8f, 0xd6, 0x72, 0xef, 0x18, 0xa7, 0xb9,
+	0xe6, 0x52, 0xc1, 0x44, 0x96, 0xd6, 0x8b, 0x4a, 0x67, 0xf3, 0x86, 0x3a, 0x8a, 0xcb, 0xb9, 0xa3,
-	0xfc, 0x4c, 0x8d, 0x47, 0x67, 0x05, 0xdd, 0xbd, 0xd0, 0x14, 0x7e, 0x88, 0x2a, 0x52, 0x41, 0x3a,
+	0x95, 0xe6, 0xf2, 0x37, 0xd5, 0x1a, 0xed, 0x15, 0x74, 0x77, 0xca, 0x14, 0x7e, 0x88, 0xca, 0x42,
-	0xc5, 0x9a, 0x3b, 0x6f, 0x98, 0x95, 0xbc, 0x2e, 0xbf, 0xeb, 0x7c, 0xb7, 0xd0, 0xbd, 0x19, 0x17,
+	0x42, 0x6a, 0x8a, 0x55, 0x67, 0x5e, 0x57, 0x96, 0xf3, 0xbc, 0x3c, 0xd6, 0xfe, 0x6e, 0xa2, 0x7b,
-	0xbc, 0x8e, 0xe6, 0xa7, 0x3a, 0x82, 0xbe, 0x96, 0xa8, 0xba, 0xf7, 0x8d, 0xc4, 0xfc, 0xc6, 0xf4,
+	0x33, 0x2a, 0x78, 0x1d, 0xcd, 0x4f, 0x38, 0x82, 0x9e, 0xa2, 0xa8, 0x38, 0xf7, 0x35, 0xc5, 0xfc,
-	0x25, 0x3d, 0x5f, 0x8b, 0xdf, 0xa3, 0x72, 0x96, 0x82, 0x30, 0xf1, 0xae, 0x5f, 0x63, 0xec, 0xdd,
+	0xc6, 0x64, 0x90, 0x5e, 0xcc, 0xc5, 0xef, 0x51, 0x29, 0x4b, 0x81, 0xeb, 0xf1, 0xae, 0x5f, 0xa3,
-	0x14, 0xc4, 0x76, 0xb4, 0x17, 0x4f, 0x72, 0x55, 0x08, 0xd5, 0xb2, 0x6a, 0x2c, 0x10, 0x22, 0x16,
+	0xed, 0xdd, 0x14, 0xf8, 0x76, 0xb4, 0x17, 0x8f, 0xe7, 0x2a, 0x11, 0xaa, 0x68, 0x65, 0x5b, 0xc0,
-	0x3a, 0xd6, 0xa9, 0xb1, 0xb6, 0x14, 0x48, 0xf3, 0xbb, 0xce, 0xa8, 0x88, 0xaa, 0x7f, 0x55, 0xf0,
+	0x79, 0xcc, 0xd5, 0x58, 0x27, 0xda, 0xda, 0x92, 0x20, 0xcd, 0x63, 0xed, 0x61, 0x01, 0x55, 0xce,
-	0x12, 0xaa, 0x2a, 0x66, 0xc4, 0x42, 0x30, 0x59, 0x2c, 0x18, 0x92, 0xae, 0x51, 0x38, 0x3d, 0xab,
+	0x58, 0xf0, 0x12, 0xaa, 0xc8, 0xca, 0x88, 0x85, 0xa0, 0x67, 0xb1, 0xa0, 0x8b, 0x54, 0x8e, 0xc4,
-	0xc0, 0x0f, 0x50, 0x29, 0xe3, 0x7d, 0xdd, 0x7d, 0xcd, 0xad, 0x9b, 0xc2, 0xd2, 0xee, 0xf6, 0x26,
+	0xe9, 0x79, 0x06, 0x7e, 0x80, 0x8a, 0x99, 0xdf, 0x53, 0xee, 0xab, 0x4e, 0x4d, 0x27, 0x16, 0x77,
-	0x55, 0x38, 0xee, 0xa0, 0x39, 0x5f, 0xc4, 0x59, 0xa2, 0x9e, 0x55, 0xfd, 0xda, 0x48, 0x3d, 0xc6,
+	0xb7, 0x37, 0xa9, 0xc4, 0x71, 0x1b, 0xcd, 0x79, 0x3c, 0xce, 0x12, 0xb9, 0x56, 0xf9, 0x6b, 0x23,
-	0x4b, 0x8d, 0x50, 0x73, 0x83, 0x03, 0x54, 0x01, 0xb5, 0x0b, 0x8d, 0x72, 0xbb, 0xb4, 0x58, 0x5f,
+	0xb9, 0x8c, 0x97, 0x0a, 0xa1, 0x3a, 0x82, 0x03, 0x54, 0x06, 0x79, 0x0b, 0xf5, 0x52, 0xab, 0xb8,
-	0x7e, 0x71, 0x83, 0x08, 0x88, 0x5e, 0xaa, 0xad, 0x48, 0x8a, 0xc3, 0xa9, 0x51, 0x15, 0x46, 0x73,
+	0x58, 0x5b, 0x7e, 0x71, 0x83, 0x11, 0x10, 0x75, 0x54, 0x5b, 0x91, 0xe0, 0x87, 0x13, 0xad, 0x4a,
-	0x8f, 0xe6, 0x81, 0x59, 0x3c, 0x5d, 0x83, 0x17, 0x50, 0x29, 0x80, 0xc3, 0x7c, 0x4c, 0xaa, 0x3e,
+	0x8c, 0xe6, 0x1a, 0x8d, 0x03, 0x7d, 0x78, 0x2a, 0x07, 0x2f, 0xa0, 0x62, 0x00, 0x87, 0x79, 0x9b,
-	0xf1, 0x0e, 0xaa, 0x0c, 0xd5, 0x4e, 0x9a, 0xf7, 0x78, 0x7e, 0x8d, 0x66, 0x26, 0x8b, 0x4d, 0x73,
+	0x54, 0x7e, 0xe2, 0x1d, 0x54, 0x1e, 0xc8, 0x9b, 0xd4, 0xfb, 0x78, 0x7e, 0x0d, 0x33, 0xe3, 0xc3,
-	0xad, 0xb5, 0xe2, 0xaa, 0xe5, 0x3e, 0x3a, 0x1e, 0xd9, 0x85, 0x93, 0x91, 0x5d, 0xf8, 0x31, 0xb2,
+	0xa6, 0x39, 0xd7, 0x5a, 0x61, 0xd5, 0x74, 0x1e, 0x1d, 0x0f, 0x2d, 0xe3, 0x64, 0x68, 0x19, 0x3f,
-	0x0b, 0x47, 0x63, 0xdb, 0x3a, 0x1e, 0xdb, 0xd6, 0xc9, 0xd8, 0xb6, 0x7e, 0x8d, 0x6d, 0xeb, 0xf3,
+	0x86, 0x96, 0x71, 0x34, 0xb2, 0xcc, 0xe3, 0x91, 0x65, 0x9e, 0x8c, 0x2c, 0xf3, 0xd7, 0xc8, 0x32,
-	0x6f, 0xbb, 0xf0, 0xee, 0x96, 0x11, 0xf8, 0x13, 0x00, 0x00, 0xff, 0xff, 0x29, 0x85, 0x06, 0x53,
+	0x3f, 0xff, 0xb6, 0x8c, 0x77, 0xb7, 0x34, 0xc1, 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x5d, 0x37,
-	0xf6, 0x05, 0x00, 0x00,
+	0x33, 0x68, 0xf8, 0x05, 0x00, 0x00,
 }

pkg/apis/authentication/v1beta1/generated.proto

@@ -21,10 +21,10 @@ syntax = 'proto2';
 
 package k8s.io.kubernetes.pkg.apis.authentication.v1beta1;
 
+import "k8s.io/apimachinery/pkg/api/resource/generated.proto";
 import "k8s.io/apimachinery/pkg/apis/meta/v1/generated.proto";
 import "k8s.io/apimachinery/pkg/runtime/generated.proto";
 import "k8s.io/apimachinery/pkg/runtime/schema/generated.proto";
-import "k8s.io/apimachinery/pkg/api/resource/generated.proto";
 import "k8s.io/kubernetes/pkg/api/v1/generated.proto";
 import "k8s.io/kubernetes/pkg/util/intstr/generated.proto";
 

pkg/apis/authorization/v1beta1/generated.pb.go

@@ -2283,62 +2283,62 @@ var (
 )
 
 var fileDescriptorGenerated = []byte{
-	// 897 bytes of a gzipped FileDescriptorProto
+	// 898 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xec, 0x56, 0x4f, 0x6f, 0xdc, 0x44,
-	0x14, 0x5f, 0xef, 0x9f, 0x64, 0x77, 0x02, 0xa4, 0x4c, 0x55, 0xe2, 0x06, 0xc9, 0xbb, 0x5a, 0x24,
+	0x14, 0x5f, 0xef, 0x9f, 0x64, 0x77, 0x02, 0xa4, 0x4c, 0x55, 0xe2, 0x06, 0x69, 0x77, 0xb5, 0x48,
-	0x94, 0x4a, 0xc5, 0x6e, 0x22, 0xfe, 0x54, 0x15, 0x07, 0x62, 0x11, 0x55, 0x15, 0xb4, 0xa0, 0x09,
+	0x28, 0x95, 0x8a, 0xdd, 0x54, 0xfc, 0xa9, 0x2a, 0x0e, 0xc4, 0x22, 0xaa, 0x2a, 0x68, 0x41, 0x13,
-	0xe4, 0x00, 0x17, 0xc6, 0xce, 0xeb, 0xae, 0xd9, 0x5d, 0x8f, 0x35, 0x33, 0x76, 0x09, 0xa7, 0x7e,
+	0xc8, 0x01, 0x2e, 0x8c, 0x9d, 0xd7, 0x5d, 0xb3, 0xbb, 0x1e, 0x6b, 0x66, 0xec, 0x12, 0x4e, 0xfd,
-	0x00, 0x0e, 0x1c, 0x7b, 0xe4, 0x2b, 0xf0, 0x05, 0xb8, 0x92, 0x63, 0x8f, 0x20, 0xa1, 0x15, 0x31,
+	0x00, 0x1c, 0x38, 0xf6, 0xc8, 0x57, 0xe0, 0x0b, 0x70, 0x25, 0xc7, 0x1e, 0x41, 0x42, 0x2b, 0x62,
-	0xdf, 0x82, 0x13, 0x9a, 0xf1, 0xec, 0x3a, 0xdb, 0x75, 0xa8, 0x16, 0x8a, 0xe8, 0xa1, 0x37, 0xfb,
+	0xbe, 0x05, 0x27, 0x34, 0xe3, 0xf1, 0x3a, 0x9b, 0x75, 0x5a, 0x2d, 0x14, 0xc1, 0xa1, 0x37, 0xfb,
-	0xbd, 0xdf, 0xfb, 0xbd, 0xdf, 0xbc, 0x79, 0x33, 0x6f, 0xd0, 0x07, 0xa3, 0x9b, 0xc2, 0x8d, 0x98,
+	0xbd, 0xdf, 0x7b, 0xef, 0x37, 0x6f, 0x7e, 0x33, 0x6f, 0xd0, 0x07, 0xe3, 0x5b, 0xc2, 0x09, 0x99,
-	0x37, 0x4a, 0x03, 0xe0, 0x31, 0x48, 0x10, 0x5e, 0x32, 0x1a, 0x78, 0x34, 0x89, 0x84, 0x47, 0x53,
+	0x3b, 0x4e, 0x7c, 0xe0, 0x11, 0x48, 0x10, 0x6e, 0x3c, 0x1e, 0xba, 0x34, 0x0e, 0x85, 0x4b, 0x13,
-	0x39, 0x64, 0x3c, 0xfa, 0x96, 0xca, 0x88, 0xc5, 0x5e, 0xb6, 0x1b, 0x80, 0xa4, 0xbb, 0xde, 0x00,
+	0x39, 0x62, 0x3c, 0xfc, 0x96, 0xca, 0x90, 0x45, 0x6e, 0xba, 0xeb, 0x83, 0xa4, 0xbb, 0xee, 0x10,
-	0x62, 0xe0, 0x54, 0xc2, 0xb1, 0x9b, 0x70, 0x26, 0x19, 0xbe, 0x51, 0x30, 0xb8, 0x25, 0x83, 0x9b,
+	0x22, 0xe0, 0x54, 0xc2, 0x91, 0x13, 0x73, 0x26, 0x19, 0xbe, 0x91, 0x67, 0x70, 0xca, 0x0c, 0x4e,
-	0x8c, 0x06, 0xae, 0x62, 0x70, 0x17, 0x18, 0x5c, 0xc3, 0xb0, 0xfd, 0xd6, 0x20, 0x92, 0xc3, 0x34,
+	0x3c, 0x1e, 0x3a, 0x2a, 0x83, 0xb3, 0x90, 0xc1, 0x31, 0x19, 0xb6, 0xdf, 0x1a, 0x86, 0x72, 0x94,
-	0x70, 0x43, 0x36, 0xf1, 0x06, 0x6c, 0xc0, 0x3c, 0x4d, 0x14, 0xa4, 0xf7, 0xf5, 0x9f, 0xfe, 0xd1,
+	0xf8, 0x4e, 0xc0, 0xa6, 0xee, 0x90, 0x0d, 0x99, 0xab, 0x13, 0xf9, 0xc9, 0x03, 0xfd, 0xa7, 0x7f,
-	0x5f, 0x45, 0x82, 0xed, 0xb7, 0x8d, 0x44, 0x9a, 0x44, 0x13, 0x1a, 0x0e, 0xa3, 0x18, 0xf8, 0x49,
+	0xf4, 0x57, 0x5e, 0x60, 0xfb, 0x6d, 0x43, 0x91, 0xc6, 0xe1, 0x94, 0x06, 0xa3, 0x30, 0x02, 0x7e,
-	0x29, 0x72, 0x02, 0x92, 0x7a, 0xd9, 0x92, 0xac, 0x6d, 0xef, 0xa2, 0x28, 0x9e, 0xc6, 0x32, 0x9a,
+	0x5c, 0x90, 0x74, 0x39, 0x08, 0x96, 0xf0, 0x00, 0xce, 0xd3, 0x7a, 0x6a, 0x94, 0x70, 0xa7, 0x20,
-	0xc0, 0x52, 0xc0, 0xbb, 0x4f, 0x0b, 0x10, 0xe1, 0x10, 0x26, 0x74, 0x29, 0x6e, 0xef, 0xc2, 0x0a,
+	0xa9, 0x9b, 0x2e, 0x2d, 0x66, 0xdb, 0xbd, 0x28, 0x8a, 0x27, 0x91, 0x0c, 0xa7, 0xcb, 0x65, 0xde,
-	0x7a, 0x1c, 0x04, 0x4b, 0x79, 0xb8, 0x9c, 0xeb, 0xfa, 0xc5, 0x31, 0x15, 0x4b, 0xd9, 0xad, 0x46,
+	0x7d, 0x56, 0x80, 0x08, 0x46, 0x30, 0xa5, 0x4b, 0x71, 0xd7, 0x2f, 0xec, 0x7b, 0x15, 0xad, 0xdd,
-	0xa7, 0x32, 0x1a, 0x7b, 0x51, 0x2c, 0x85, 0xe4, 0x4f, 0x86, 0xf4, 0xdf, 0x43, 0xe8, 0xe0, 0x1b,
+	0x6a, 0x74, 0x22, 0xc3, 0x89, 0x1b, 0x46, 0x52, 0x48, 0x7e, 0x3e, 0x64, 0xf0, 0x1e, 0x42, 0xfb,
-	0xc9, 0xe9, 0x11, 0x1d, 0xa7, 0x80, 0xbb, 0xa8, 0x15, 0x49, 0x98, 0x08, 0xdb, 0xea, 0x35, 0x76,
+	0xdf, 0x48, 0x4e, 0x0f, 0xe9, 0x24, 0x01, 0xdc, 0x43, 0xad, 0x50, 0xc2, 0x54, 0xd8, 0x56, 0xbf,
-	0x3a, 0x7e, 0x27, 0x9f, 0x76, 0x5b, 0x77, 0x94, 0x81, 0x14, 0xf6, 0x5b, 0xed, 0x47, 0x3f, 0x74,
+	0xb1, 0xd3, 0xf1, 0x3a, 0xd9, 0xac, 0xd7, 0xba, 0xab, 0x0c, 0x24, 0xb7, 0xdf, 0x6e, 0x3f, 0xfe,
-	0x6b, 0x0f, 0x7f, 0xeb, 0xd5, 0xfa, 0xd3, 0x3a, 0xb2, 0x3f, 0x66, 0x21, 0x1d, 0x1f, 0xa6, 0xc1,
+	0xa1, 0x57, 0x7b, 0xf4, 0x5b, 0xbf, 0x36, 0x98, 0xd5, 0x91, 0xfd, 0x31, 0x0b, 0xe8, 0xe4, 0x20,
-	0xd7, 0x10, 0xca, 0xfd, 0x30, 0x04, 0x21, 0x08, 0x64, 0x11, 0x3c, 0xc0, 0x5f, 0xa1, 0xb6, 0x2a,
+	0xf1, 0xbf, 0x86, 0x40, 0xee, 0x05, 0x01, 0x08, 0x41, 0x20, 0x0d, 0xe1, 0x21, 0xfe, 0x0a, 0xb5,
-	0xf7, 0x31, 0x95, 0xd4, 0xb6, 0x7a, 0xd6, 0xce, 0xc6, 0xde, 0x0d, 0xd7, 0xec, 0xfe, 0xf9, 0xaa,
+	0x55, 0xeb, 0x8e, 0xa8, 0xa4, 0xb6, 0xd5, 0xb7, 0x76, 0x36, 0x6e, 0xde, 0x70, 0xcc, 0xfe, 0x9f,
-	0x95, 0xfb, 0xaf, 0xd0, 0x6e, 0xb6, 0xeb, 0x7e, 0xa2, 0xb9, 0xee, 0x82, 0xa4, 0x3e, 0x3e, 0x9d,
+	0xed, 0x40, 0xa9, 0x00, 0x85, 0x76, 0xd2, 0x5d, 0xe7, 0x13, 0x9d, 0xeb, 0x1e, 0x48, 0xea, 0xe1,
-	0x76, 0x6b, 0xf9, 0xb4, 0x8b, 0x4a, 0x1b, 0x99, 0xb3, 0xe2, 0x11, 0x6a, 0x8a, 0x04, 0x42, 0xbb,
+	0x93, 0x59, 0xaf, 0x96, 0xcd, 0x7a, 0xa8, 0xb4, 0x91, 0x79, 0x56, 0x3c, 0x46, 0x4d, 0x11, 0x43,
-	0xae, 0xd9, 0xef, 0xb8, 0xab, 0xf6, 0x96, 0x5b, 0x21, 0xfb, 0x30, 0x81, 0xd0, 0x7f, 0xc9, 0xa4,
+	0x60, 0xd7, 0x75, 0xf6, 0xbb, 0xce, 0xaa, 0xea, 0x72, 0x2a, 0x68, 0x1f, 0xc4, 0x10, 0x78, 0x2f,
-	0x6d, 0xaa, 0x3f, 0xa2, 0x93, 0x60, 0x81, 0xd6, 0x84, 0xa4, 0x32, 0x15, 0x76, 0x43, 0xa7, 0xfb,
+	0x99, 0xb2, 0x4d, 0xf5, 0x47, 0x74, 0x11, 0x2c, 0xd0, 0x9a, 0x90, 0x54, 0x26, 0xc2, 0x6e, 0xe8,
-	0xe8, 0xd9, 0xa4, 0xd3, 0x94, 0xfe, 0x2b, 0x26, 0xe1, 0x5a, 0xf1, 0x4f, 0x4c, 0xaa, 0xfe, 0x97,
+	0x72, 0x1f, 0x3d, 0x9f, 0x72, 0x3a, 0xa5, 0xf7, 0x8a, 0x29, 0xb8, 0x96, 0xff, 0x13, 0x53, 0x6a,
-	0xe8, 0xca, 0x3d, 0x16, 0x13, 0xd3, 0x19, 0xfb, 0x52, 0xf2, 0x28, 0x48, 0x25, 0x08, 0xdc, 0x43,
+	0xf0, 0x25, 0xba, 0x72, 0x9f, 0x45, 0xc4, 0x08, 0x77, 0x4f, 0x4a, 0x1e, 0xfa, 0x89, 0x04, 0x81,
-	0xcd, 0x84, 0xca, 0xa1, 0x2e, 0x6c, 0xa7, 0xd4, 0xfb, 0x29, 0x95, 0x43, 0xa2, 0x3d, 0x0a, 0x91,
+	0xfb, 0xa8, 0x19, 0x53, 0x39, 0xd2, 0x8d, 0xed, 0x94, 0x7c, 0x3f, 0xa5, 0x72, 0x44, 0xb4, 0x47,
-	0x01, 0x0f, 0x74, 0x71, 0xce, 0x21, 0x8e, 0x80, 0x07, 0x44, 0x7b, 0xfa, 0x3f, 0xd5, 0x11, 0xae,
+	0x21, 0x52, 0xe0, 0xbe, 0x6e, 0xce, 0x19, 0xc4, 0x21, 0x70, 0x9f, 0x68, 0xcf, 0xe0, 0xa7, 0x3a,
-	0xa0, 0xf6, 0x50, 0x27, 0xa6, 0x13, 0x10, 0x09, 0x0d, 0xc1, 0xf0, 0xbf, 0x6a, 0xa2, 0x3b, 0xf7,
+	0xc2, 0x15, 0xa9, 0x5d, 0xd4, 0x89, 0xe8, 0x14, 0x44, 0x4c, 0x03, 0x30, 0xf9, 0x5f, 0x35, 0xd1,
-	0x66, 0x0e, 0x52, 0x62, 0x9e, 0x9e, 0x09, 0xbf, 0x81, 0x5a, 0x03, 0xce, 0xd2, 0x44, 0x97, 0xae,
+	0x9d, 0xfb, 0x85, 0x83, 0x94, 0x98, 0x67, 0x57, 0xc2, 0x6f, 0xa0, 0xd6, 0x90, 0xb3, 0x24, 0xd6,
-	0xe3, 0xbf, 0x6c, 0x20, 0xad, 0xdb, 0xca, 0x48, 0x0a, 0x1f, 0xbe, 0x86, 0xd6, 0x33, 0xe0, 0x22,
+	0xad, 0xeb, 0x78, 0x2f, 0x1b, 0x48, 0xeb, 0x8e, 0x32, 0x92, 0xdc, 0x87, 0xaf, 0xa1, 0xf5, 0x14,
-	0x62, 0xb1, 0xdd, 0xd4, 0xb0, 0x4d, 0x03, 0x5b, 0x3f, 0x2a, 0xcc, 0x64, 0xe6, 0xc7, 0xd7, 0x51,
+	0xb8, 0x08, 0x59, 0x64, 0x37, 0x35, 0x6c, 0xd3, 0xc0, 0xd6, 0x0f, 0x73, 0x33, 0x29, 0xfc, 0xf8,
-	0x7b, 0x76, 0x5a, 0xec, 0x96, 0xc6, 0x5e, 0x32, 0xd8, 0xf6, 0x6c, 0x41, 0x64, 0x8e, 0xc0, 0xef,
+	0x3a, 0x6a, 0x17, 0x87, 0xd9, 0x6e, 0x69, 0xec, 0x25, 0x83, 0x6d, 0x17, 0x0b, 0x22, 0x73, 0x04,
-	0xa0, 0x0d, 0x91, 0x06, 0xf3, 0x80, 0x35, 0x1d, 0x70, 0xd9, 0x04, 0x6c, 0x1c, 0x96, 0x2e, 0x72,
+	0x7e, 0x07, 0x6d, 0x88, 0xc4, 0x9f, 0x07, 0xac, 0xe9, 0x80, 0xcb, 0x26, 0x60, 0xe3, 0xa0, 0x74,
-	0x1e, 0xa7, 0x96, 0xa5, 0xd6, 0x68, 0xaf, 0x2f, 0x2e, 0x4b, 0x95, 0x80, 0x68, 0x4f, 0xff, 0xac,
+	0x91, 0xb3, 0x38, 0xb5, 0x2c, 0xb5, 0x46, 0x7b, 0x7d, 0x71, 0x59, 0xaa, 0x05, 0x44, 0x7b, 0x06,
-	0x8e, 0xb6, 0x0e, 0x61, 0x7c, 0xff, 0xff, 0xe9, 0x7e, 0xb6, 0xd0, 0xfd, 0x77, 0xff, 0x41, 0x3b,
+	0xa7, 0x75, 0xb4, 0x75, 0x00, 0x93, 0x07, 0xff, 0x8d, 0xfa, 0xd9, 0x82, 0xfa, 0xef, 0xfd, 0x0d,
-	0x56, 0x4b, 0x7f, 0xbe, 0x4e, 0xc0, 0xcf, 0x75, 0xf4, 0xfa, 0xdf, 0x08, 0xc5, 0xdf, 0x59, 0x08,
+	0x39, 0x56, 0x53, 0xff, 0x7f, 0x9d, 0x80, 0x9f, 0xeb, 0xe8, 0xf5, 0xa7, 0x10, 0xc5, 0xdf, 0x59,
-	0xf3, 0xa5, 0x26, 0x36, 0x25, 0xff, 0x70, 0x75, 0x85, 0xcb, 0x07, 0xc2, 0x7f, 0x2d, 0x9f, 0x76,
+	0x08, 0xf3, 0x25, 0x11, 0x9b, 0x96, 0x7f, 0xb8, 0x3a, 0xc3, 0xe5, 0x03, 0xe1, 0xbd, 0x96, 0xcd,
-	0x2b, 0x0e, 0x0a, 0xa9, 0xc8, 0x8b, 0x1f, 0x59, 0xe8, 0x4a, 0x5c, 0x75, 0x62, 0xcd, 0x36, 0xdd,
+	0x7a, 0x15, 0x07, 0x85, 0x54, 0xd4, 0xc5, 0x8f, 0x2d, 0x74, 0x25, 0xaa, 0x3a, 0xb1, 0x66, 0x9b,
-	0x5e, 0x5d, 0x51, 0xe5, 0x05, 0xe0, 0x5f, 0xcd, 0xa7, 0xdd, 0xea, 0xbb, 0x81, 0x54, 0x0b, 0xe8,
+	0xee, 0xac, 0xce, 0xa8, 0xf2, 0x02, 0xf0, 0xae, 0x66, 0xb3, 0x5e, 0xf5, 0xdd, 0x40, 0xaa, 0x09,
-	0xff, 0x5a, 0x47, 0x97, 0x5f, 0xdc, 0xd3, 0xff, 0x4d, 0x97, 0xfe, 0xd9, 0x44, 0x5b, 0x2f, 0x3a,
+	0x0c, 0x7e, 0xad, 0xa3, 0xcb, 0x2f, 0xee, 0xe9, 0x7f, 0x47, 0xa5, 0x7f, 0x36, 0xd1, 0xd6, 0x0b,
-	0xf4, 0x5f, 0x76, 0xe8, 0x7c, 0x90, 0x34, 0x16, 0x6f, 0xdc, 0xcf, 0x05, 0x70, 0x33, 0x48, 0x7a,
+	0x85, 0xfe, 0x43, 0x85, 0xce, 0x07, 0x49, 0x63, 0xf1, 0xc6, 0xfd, 0x5c, 0x00, 0x37, 0x83, 0xa4,
-	0xb3, 0x41, 0xd2, 0xd4, 0x6f, 0x13, 0xa4, 0xb6, 0x42, 0x0f, 0x11, 0x31, 0x9b, 0x22, 0x27, 0xa8,
+	0x5f, 0x0c, 0x92, 0xa6, 0x7e, 0x9b, 0x20, 0xb5, 0x15, 0x7a, 0x88, 0x88, 0x62, 0x8a, 0x1c, 0xa3,
-	0x05, 0xea, 0x2d, 0x63, 0xb7, 0x7a, 0x8d, 0x9d, 0x8d, 0xbd, 0xcf, 0x9e, 0x59, 0xb3, 0xb9, 0xfa,
+	0x16, 0xa8, 0xb7, 0x8c, 0xdd, 0xea, 0x37, 0x76, 0x36, 0x6e, 0x7e, 0xf6, 0xdc, 0xc4, 0xe6, 0xe8,
-	0x89, 0x74, 0x10, 0x4b, 0x7e, 0x52, 0x0e, 0x30, 0x6d, 0x23, 0x45, 0xc6, 0xed, 0xcc, 0x3c, 0xa3,
+	0x27, 0xd2, 0x7e, 0x24, 0xf9, 0x71, 0x39, 0xc0, 0xb4, 0x8d, 0xe4, 0x15, 0xb7, 0x53, 0xf3, 0x8c,
-	0x34, 0x06, 0x5f, 0x42, 0x8d, 0x11, 0x9c, 0x14, 0x03, 0x94, 0xa8, 0x4f, 0x4c, 0x50, 0x2b, 0x53,
+	0xd2, 0x18, 0x7c, 0x09, 0x35, 0xc6, 0x70, 0x9c, 0x0f, 0x50, 0xa2, 0x3e, 0x31, 0x41, 0xad, 0x54,
-	0x2f, 0x2c, 0x53, 0xe8, 0xf7, 0x57, 0x97, 0x56, 0xbe, 0xd2, 0x48, 0x41, 0x75, 0xab, 0x7e, 0xd3,
+	0xbd, 0xb0, 0x4c, 0xa3, 0xdf, 0x5f, 0x9d, 0x5a, 0xf9, 0x4a, 0x23, 0x79, 0xaa, 0xdb, 0xf5, 0x5b,
-	0xea, 0xff, 0x68, 0xa1, 0xab, 0x17, 0xb6, 0xac, 0x1a, 0xab, 0x74, 0x3c, 0x66, 0x0f, 0xe0, 0x58,
+	0xd6, 0xe0, 0x47, 0x0b, 0x5d, 0xbd, 0x50, 0xb2, 0x6a, 0xac, 0xd2, 0xc9, 0x84, 0x3d, 0x84, 0x23,
-	0x6b, 0x69, 0x97, 0x63, 0x75, 0xbf, 0x30, 0x93, 0x99, 0x1f, 0xbf, 0x89, 0xd6, 0x38, 0x50, 0xc1,
+	0xcd, 0xa5, 0x5d, 0x8e, 0xd5, 0xbd, 0xdc, 0x4c, 0x0a, 0x3f, 0x7e, 0x13, 0xad, 0x71, 0xa0, 0x82,
-	0x62, 0x33, 0xca, 0xe7, 0xdd, 0x4e, 0xb4, 0x95, 0x18, 0x2f, 0xde, 0x47, 0x9b, 0xa0, 0xd2, 0x6b,
+	0x45, 0x66, 0x94, 0xcf, 0xd5, 0x4e, 0xb4, 0x95, 0x18, 0x2f, 0xde, 0x43, 0x9b, 0xa0, 0xca, 0x6b,
-	0x71, 0x07, 0x9c, 0x33, 0x6e, 0xb6, 0x6c, 0xcb, 0x04, 0x6c, 0x1e, 0x2c, 0xba, 0xc9, 0x93, 0x78,
+	0x72, 0xfb, 0x9c, 0x33, 0x6e, 0xb6, 0x6c, 0xcb, 0x04, 0x6c, 0xee, 0x2f, 0xba, 0xc9, 0x79, 0xbc,
-	0xff, 0xda, 0xe9, 0x99, 0x53, 0x7b, 0x7c, 0xe6, 0xd4, 0x7e, 0x39, 0x73, 0x6a, 0x0f, 0x73, 0xc7,
+	0x77, 0xed, 0xe4, 0xb4, 0x5b, 0x7b, 0x72, 0xda, 0xad, 0xfd, 0x72, 0xda, 0xad, 0x3d, 0xca, 0xba,
-	0x3a, 0xcd, 0x1d, 0xeb, 0x71, 0xee, 0x58, 0xbf, 0xe7, 0x8e, 0xf5, 0xfd, 0x1f, 0x4e, 0xed, 0x8b,
+	0xd6, 0x49, 0xd6, 0xb5, 0x9e, 0x64, 0x5d, 0xeb, 0xf7, 0xac, 0x6b, 0x7d, 0xff, 0x47, 0xb7, 0xf6,
-	0x75, 0xb3, 0xe8, 0xbf, 0x02, 0x00, 0x00, 0xff, 0xff, 0x31, 0x9f, 0xbd, 0x1e, 0x75, 0x0c, 0x00,
+	0xc5, 0xba, 0x59, 0xf4, 0x5f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x11, 0xdb, 0xa5, 0xac, 0x77, 0x0c,
-	0x00,
+	0x00, 0x00,
 }

pkg/apis/authorization/v1beta1/generated.proto

@@ -21,10 +21,10 @@ syntax = 'proto2';
 
 package k8s.io.kubernetes.pkg.apis.authorization.v1beta1;
 
+import "k8s.io/apimachinery/pkg/api/resource/generated.proto";
 import "k8s.io/apimachinery/pkg/apis/meta/v1/generated.proto";
 import "k8s.io/apimachinery/pkg/runtime/generated.proto";
 import "k8s.io/apimachinery/pkg/runtime/schema/generated.proto";
-import "k8s.io/apimachinery/pkg/api/resource/generated.proto";
 import "k8s.io/kubernetes/pkg/api/v1/generated.proto";
 import "k8s.io/kubernetes/pkg/util/intstr/generated.proto";
 

pkg/apis/authorization/validation/BUILD

@@ -13,8 +13,8 @@ go_library(
     srcs = ["validation.go"],
     tags = ["automanaged"],
     deps = [
-        "//pkg/api:go_default_library",
         "//pkg/apis/authorization:go_default_library",
+        "//vendor:k8s.io/apimachinery/pkg/api/equality",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/util/validation/field",
     ],

pkg/apis/autoscaling/v1/generated.pb.go

@@ -1730,59 +1730,59 @@ var (
 )
 
 var fileDescriptorGenerated = []byte{
-	// 855 bytes of a gzipped FileDescriptorProto
+	// 856 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xbc, 0x55, 0x4f, 0x6f, 0xdc, 0x44,
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xbc, 0x55, 0x4f, 0x6f, 0x1b, 0x45,
-	0x14, 0x5f, 0xef, 0x9f, 0x2a, 0x1d, 0x93, 0x04, 0x06, 0xa9, 0x5d, 0xa5, 0xc2, 0x8e, 0x16, 0x0e,
+	0x14, 0xf7, 0xfa, 0x4f, 0x95, 0xce, 0x92, 0x04, 0x06, 0xa9, 0xb5, 0x52, 0xb1, 0x1b, 0x19, 0x0e,
-	0x05, 0x15, 0x9b, 0x5d, 0x95, 0x8a, 0x1e, 0xe3, 0xa0, 0xd2, 0x8a, 0x86, 0x46, 0x93, 0xb6, 0x07,
+	0x05, 0x95, 0x5d, 0x6c, 0x95, 0x8a, 0x1e, 0xb3, 0x41, 0xa5, 0x15, 0x0d, 0x8d, 0x26, 0x6d, 0x0f,
-	0x84, 0x10, 0xb3, 0xde, 0x57, 0x67, 0xba, 0x6b, 0x8f, 0x35, 0x33, 0x5e, 0x41, 0x4f, 0x9c, 0x38,
+	0x08, 0x21, 0xc6, 0xeb, 0xd7, 0xcd, 0xd4, 0xde, 0x9d, 0xd5, 0xcc, 0xac, 0x05, 0x3d, 0x71, 0xe2,
-	0x73, 0xe1, 0x03, 0xf0, 0x51, 0xb8, 0xe5, 0xd8, 0x1b, 0x9c, 0x56, 0xc4, 0xf0, 0x31, 0x38, 0x20,
+	0xcc, 0x85, 0x0f, 0xc0, 0x47, 0xe1, 0x96, 0x63, 0x6f, 0x70, 0xb2, 0xc8, 0xc2, 0xc7, 0xe0, 0x80,
-	0xcf, 0x4e, 0xbc, 0xff, 0xe2, 0x4d, 0x22, 0x50, 0x6f, 0x3b, 0xf3, 0x7e, 0x7f, 0xde, 0xbc, 0xf7,
+	0x76, 0x3c, 0x59, 0xaf, 0x9d, 0xd8, 0x89, 0x05, 0xea, 0xcd, 0x33, 0xef, 0xf7, 0xe7, 0xcd, 0x7b,
-	0xfc, 0x16, 0xdd, 0x1f, 0x7e, 0x26, 0x3d, 0xc6, 0xfd, 0x61, 0xd6, 0x07, 0x91, 0x80, 0x02, 0xe9,
+	0x6f, 0x9f, 0xd1, 0xfd, 0xe1, 0x67, 0xd2, 0x63, 0xdc, 0x1f, 0x66, 0x7d, 0x10, 0x09, 0x28, 0x90,
-	0xa7, 0xc3, 0xc8, 0xa7, 0x29, 0x93, 0x3e, 0xcd, 0x14, 0x97, 0x21, 0x1d, 0xb1, 0x24, 0xf2, 0xc7,
+	0x7e, 0x3a, 0x8c, 0x7c, 0x9a, 0x32, 0xe9, 0xd3, 0x4c, 0x71, 0x19, 0xd2, 0x11, 0x4b, 0x22, 0x7f,
-	0x5d, 0x3f, 0x82, 0x04, 0x04, 0x55, 0x30, 0xf0, 0x52, 0xc1, 0x15, 0xc7, 0x1f, 0x4e, 0xa9, 0xde,
+	0xdc, 0xf5, 0x23, 0x48, 0x40, 0x50, 0x05, 0x03, 0x2f, 0x15, 0x5c, 0x71, 0xfc, 0xe1, 0x94, 0xea,
-	0x8c, 0xea, 0xa5, 0xc3, 0xc8, 0x2b, 0xa8, 0xde, 0x1c, 0xd5, 0x1b, 0x77, 0x77, 0x3e, 0x8e, 0x98,
+	0xcd, 0xa8, 0x5e, 0x3a, 0x8c, 0xbc, 0x82, 0xea, 0x55, 0xa8, 0xde, 0xb8, 0xbb, 0xf3, 0x71, 0xc4,
-	0x3a, 0xce, 0xfa, 0x5e, 0xc8, 0x63, 0x3f, 0xe2, 0x11, 0xf7, 0xb5, 0x42, 0x3f, 0x7b, 0xa1, 0x4f,
+	0xd4, 0x71, 0xd6, 0xf7, 0x42, 0x1e, 0xfb, 0x11, 0x8f, 0xb8, 0xaf, 0x15, 0xfa, 0xd9, 0x0b, 0x7d,
-	0xfa, 0xa0, 0x7f, 0x4d, 0x95, 0x77, 0xee, 0x9a, 0xa4, 0x68, 0xca, 0x62, 0x1a, 0x1e, 0xb3, 0x04,
+	0xd2, 0x07, 0xfd, 0x6b, 0xaa, 0xbc, 0x73, 0xd7, 0x24, 0x45, 0x53, 0x16, 0xd3, 0xf0, 0x98, 0x25,
-	0xc4, 0x0f, 0xb3, 0xb4, 0x62, 0x50, 0xf4, 0x9c, 0x7c, 0x76, 0xfc, 0x2a, 0x96, 0xc8, 0x12, 0xc5,
+	0x20, 0x7e, 0x38, 0x4b, 0xcb, 0x17, 0x20, 0x79, 0x26, 0x42, 0x58, 0xcc, 0x67, 0x25, 0x4b, 0xfa,
-	0x62, 0x58, 0x21, 0xdc, 0xbb, 0x88, 0x20, 0xc3, 0x63, 0x88, 0xe9, 0x0a, 0xaf, 0x57, 0x59, 0x33,
+	0x31, 0x28, 0x7a, 0xc1, 0x2b, 0x76, 0xfc, 0x65, 0x2c, 0x91, 0x25, 0x8a, 0xc5, 0xe7, 0x6d, 0xee,
-	0x5f, 0x80, 0xe4, 0x99, 0x08, 0x57, 0xbd, 0xee, 0x54, 0x73, 0xce, 0x79, 0x4a, 0xf7, 0x7c, 0x74,
+	0x5d, 0x46, 0x90, 0xe1, 0x31, 0xc4, 0xf4, 0x1c, 0xef, 0xce, 0xd2, 0x4a, 0x5f, 0x94, 0x56, 0xf7,
-	0xa6, 0xd8, 0xc8, 0x67, 0x89, 0x92, 0x4a, 0x2c, 0x53, 0x3a, 0xbf, 0x58, 0xe8, 0xd6, 0xbe, 0xe0,
+	0x62, 0x74, 0xa6, 0xd8, 0xc8, 0x67, 0x89, 0x92, 0x4a, 0x2c, 0x52, 0x3a, 0xbf, 0x58, 0xe8, 0xd6,
-	0x52, 0x3e, 0x07, 0x21, 0x19, 0x4f, 0x9e, 0xf4, 0x5f, 0x42, 0xa8, 0x08, 0xbc, 0x00, 0x01, 0x49,
+	0xbe, 0xe0, 0x52, 0x3e, 0x07, 0x21, 0x19, 0x4f, 0x9e, 0xf4, 0x5f, 0x42, 0xa8, 0x08, 0xbc, 0x00,
-	0x08, 0x78, 0x17, 0x35, 0x87, 0x2c, 0x19, 0xb4, 0xad, 0x5d, 0xeb, 0xf6, 0xf5, 0xe0, 0xad, 0x93,
+	0x01, 0x49, 0x08, 0x78, 0x17, 0x35, 0x87, 0x2c, 0x19, 0xb4, 0xad, 0x5d, 0xeb, 0xf6, 0xf5, 0xe0,
-	0x89, 0x5b, 0xcb, 0x27, 0x6e, 0xf3, 0x4b, 0x96, 0x0c, 0x88, 0x8e, 0x14, 0x88, 0x84, 0xc6, 0xd0,
+	0xad, 0x93, 0x89, 0x5b, 0xcb, 0x27, 0x6e, 0xf3, 0x4b, 0x96, 0x0c, 0x88, 0x8e, 0x14, 0x88, 0x84,
-	0xae, 0x2f, 0x22, 0xbe, 0xa2, 0x31, 0x10, 0x1d, 0xc1, 0x3d, 0x84, 0x68, 0xca, 0x8c, 0x41, 0xbb,
+	0xc6, 0xd0, 0xae, 0xcf, 0x23, 0xbe, 0xa2, 0x31, 0x10, 0x1d, 0xc1, 0x3d, 0x84, 0x68, 0xca, 0x8c,
-	0xa1, 0x71, 0xd8, 0xe0, 0xd0, 0xde, 0xe1, 0x23, 0x13, 0x21, 0x73, 0xa8, 0xce, 0xef, 0x75, 0x74,
+	0x41, 0xbb, 0xa1, 0x71, 0xd8, 0xe0, 0xd0, 0xde, 0xe1, 0x23, 0x13, 0x21, 0x15, 0x54, 0xe7, 0xf7,
-	0xf3, 0x21, 0x17, 0xec, 0x15, 0x4f, 0x14, 0x1d, 0x1d, 0xf2, 0xc1, 0x9e, 0x19, 0x0d, 0x10, 0xf8,
+	0x3a, 0xba, 0xf9, 0x90, 0x0b, 0xf6, 0x8a, 0x27, 0x8a, 0x8e, 0x0e, 0xf9, 0x60, 0xcf, 0x0c, 0x07,
-	0x3b, 0xb4, 0x51, 0x34, 0x73, 0x40, 0x15, 0xd5, 0x79, 0xd9, 0xbd, 0x4f, 0x3c, 0x33, 0x54, 0xf3,
+	0x08, 0xfc, 0x1d, 0xda, 0x28, 0x1a, 0x33, 0xa0, 0x8a, 0xea, 0xbc, 0xec, 0xde, 0x27, 0x9e, 0x19,
-	0x3d, 0x99, 0x8d, 0x55, 0x81, 0xf6, 0xc6, 0x5d, 0x6f, 0xfa, 0xb8, 0x03, 0x50, 0x74, 0xe6, 0x3f,
+	0xab, 0x6a, 0x7d, 0x67, 0x83, 0x55, 0xa0, 0xbd, 0x71, 0xd7, 0x9b, 0x3e, 0xee, 0x00, 0x14, 0x9d,
-	0xbb, 0x23, 0xa5, 0x2a, 0x3e, 0x46, 0x4d, 0x99, 0x42, 0xa8, 0xdf, 0x64, 0xf7, 0x1e, 0x78, 0x97,
+	0xf9, 0xcf, 0xee, 0x48, 0xa9, 0x8a, 0x8f, 0x51, 0x53, 0xa6, 0x10, 0xea, 0x37, 0xd9, 0xbd, 0x07,
-	0x1e, 0x59, 0xaf, 0x22, 0xe7, 0xa3, 0x14, 0xc2, 0x59, 0x6d, 0x8a, 0x13, 0xd1, 0x0e, 0x38, 0x45,
+	0xde, 0x95, 0x87, 0xd6, 0x5b, 0x92, 0xf3, 0x51, 0x0a, 0xe1, 0xac, 0x36, 0xc5, 0x89, 0x68, 0x07,
-	0xd7, 0xa4, 0xa2, 0x2a, 0x93, 0xba, 0x2e, 0x76, 0xef, 0xe1, 0xff, 0xe0, 0xa5, 0xf5, 0x82, 0x2d,
+	0x9c, 0xa2, 0x6b, 0x52, 0x51, 0x95, 0x49, 0x5d, 0x17, 0xbb, 0xf7, 0xf0, 0x7f, 0xf0, 0xd2, 0x7a,
-	0xe3, 0x76, 0x6d, 0x7a, 0x26, 0xc6, 0xa7, 0xf3, 0xb7, 0x85, 0x6e, 0x55, 0x30, 0x1f, 0x33, 0xa9,
+	0xc1, 0x96, 0x71, 0xbb, 0x36, 0x3d, 0x13, 0xe3, 0xd3, 0xf9, 0xdb, 0x42, 0xb7, 0x96, 0x30, 0x1f,
-	0xf0, 0x37, 0x2b, 0xd5, 0xf5, 0x2e, 0x57, 0xdd, 0x82, 0xad, 0x6b, 0xfb, 0xb6, 0x71, 0xde, 0x38,
+	0x33, 0xa9, 0xf0, 0x37, 0xe7, 0xaa, 0xeb, 0x5d, 0xad, 0xba, 0x05, 0x5b, 0xd7, 0xf6, 0x6d, 0xe3,
-	0xbb, 0x99, 0xab, 0x6c, 0x84, 0x5a, 0x4c, 0x41, 0x2c, 0xdb, 0xf5, 0xdd, 0xc6, 0x6d, 0xbb, 0x17,
+	0xbc, 0x71, 0x76, 0x53, 0xa9, 0x6c, 0x84, 0x5a, 0x4c, 0x41, 0x2c, 0xdb, 0xf5, 0xdd, 0xc6, 0x6d,
-	0xfc, 0xf7, 0xe7, 0x06, 0x9b, 0xc6, 0xae, 0xf5, 0xa8, 0x10, 0x26, 0x53, 0xfd, 0xce, 0x3f, 0xf5,
+	0xbb, 0x17, 0xfc, 0xf7, 0xe7, 0x06, 0x9b, 0xc6, 0xae, 0xf5, 0xa8, 0x10, 0x26, 0x53, 0xfd, 0xce,
-	0xca, 0x67, 0x16, 0xe5, 0xc7, 0x3f, 0x59, 0x68, 0x4b, 0x1f, 0x9f, 0x52, 0x11, 0x41, 0x31, 0xf1,
+	0x3f, 0xf5, 0xa5, 0xcf, 0x2c, 0xca, 0x8f, 0x7f, 0xb2, 0xd0, 0x96, 0x3e, 0x3e, 0xa5, 0x22, 0x82,
-	0xe6, 0xb5, 0x57, 0xe9, 0xf6, 0x9a, 0x2f, 0x27, 0xb8, 0x61, 0xd2, 0xda, 0x3a, 0x5a, 0x70, 0x21,
+	0x62, 0xe2, 0xcd, 0x6b, 0xd7, 0xe9, 0xf6, 0x8a, 0x2f, 0x27, 0xb8, 0x61, 0xd2, 0xda, 0x3a, 0x9a,
-	0x4b, 0xae, 0xb8, 0x8b, 0xec, 0x98, 0x25, 0x04, 0xd2, 0x11, 0x0b, 0xa9, 0xd4, 0x23, 0xd7, 0x0a,
+	0x73, 0x21, 0x0b, 0xae, 0xb8, 0x8b, 0xec, 0x98, 0x25, 0x04, 0xd2, 0x11, 0x0b, 0xa9, 0xd4, 0x23,
-	0xb6, 0xf3, 0x89, 0x6b, 0x1f, 0xcc, 0xae, 0xc9, 0x3c, 0x06, 0x7f, 0x8a, 0xec, 0x98, 0x7e, 0x5f,
+	0xd7, 0x0a, 0xb6, 0xf3, 0x89, 0x6b, 0x1f, 0xcc, 0xae, 0x49, 0x15, 0x83, 0x3f, 0x45, 0x76, 0x4c,
-	0x52, 0x1a, 0x9a, 0xf2, 0xae, 0xf1, 0xb3, 0x0f, 0x66, 0x21, 0x32, 0x8f, 0xc3, 0x2f, 0x91, 0xa3,
+	0xbf, 0x2f, 0x29, 0x0d, 0x4d, 0x79, 0xd7, 0xf8, 0xd9, 0x07, 0xb3, 0x10, 0xa9, 0xe2, 0xf0, 0x4b,
-	0xb4, 0xed, 0xfe, 0xe1, 0xb3, 0x67, 0x8a, 0x8d, 0xd8, 0x2b, 0xaa, 0x18, 0x4f, 0x0e, 0x41, 0x84,
+	0xe4, 0x28, 0x6d, 0xbb, 0x7f, 0xf8, 0xec, 0x99, 0x62, 0x23, 0xf6, 0x8a, 0x2a, 0xc6, 0x93, 0x43,
-	0x90, 0x28, 0x1a, 0x41, 0xbb, 0xa9, 0x95, 0x3a, 0xf9, 0xc4, 0x75, 0x9e, 0xae, 0x45, 0x92, 0x0b,
+	0x10, 0x21, 0x24, 0x8a, 0x46, 0xd0, 0x6e, 0x6a, 0xa5, 0x4e, 0x3e, 0x71, 0x9d, 0xa7, 0x2b, 0x91,
-	0x94, 0x3a, 0xbf, 0x35, 0xd0, 0x7b, 0x6b, 0xe7, 0x13, 0x3f, 0x40, 0x98, 0xf7, 0x25, 0x88, 0x31,
+	0xe4, 0x12, 0xa5, 0xce, 0x6f, 0x0d, 0xf4, 0xde, 0xca, 0xf9, 0xc4, 0x0f, 0x10, 0xe6, 0x7d, 0x09,
-	0x0c, 0xbe, 0x98, 0x2e, 0xa5, 0x62, 0x3b, 0x14, 0x3d, 0x68, 0x04, 0x37, 0xf2, 0x89, 0x8b, 0x9f,
+	0x62, 0x0c, 0x83, 0x2f, 0xa6, 0x4b, 0xa9, 0xd8, 0x0e, 0x45, 0x0f, 0x1a, 0xc1, 0x8d, 0x7c, 0xe2,
-	0xac, 0x44, 0xc9, 0x39, 0x0c, 0x1c, 0xa2, 0xcd, 0x11, 0x95, 0x6a, 0x5a, 0x65, 0x66, 0x16, 0x91,
+	0xe2, 0x27, 0xe7, 0xa2, 0xe4, 0x02, 0x06, 0x0e, 0xd1, 0xe6, 0x88, 0x4a, 0x35, 0xad, 0x32, 0x33,
-	0xdd, 0xfb, 0xe8, 0x72, 0x43, 0x5b, 0x30, 0x82, 0x77, 0xf2, 0x89, 0xbb, 0xf9, 0x78, 0x5e, 0x84,
+	0x8b, 0xc8, 0xee, 0x7d, 0x74, 0xb5, 0xa1, 0x2d, 0x18, 0xc1, 0x3b, 0xf9, 0xc4, 0xdd, 0x7c, 0x5c,
-	0x2c, 0x6a, 0xe2, 0x3d, 0xb4, 0x1d, 0x66, 0x42, 0x40, 0xa2, 0x96, 0xaa, 0x7e, 0xd3, 0x54, 0x7d,
+	0x15, 0x21, 0xf3, 0x9a, 0x78, 0x0f, 0x6d, 0x87, 0x99, 0x10, 0x90, 0xa8, 0x85, 0xaa, 0xdf, 0x34,
-	0x7b, 0x7f, 0x31, 0x4c, 0x96, 0xf1, 0x85, 0xc4, 0x00, 0x24, 0x13, 0x30, 0x28, 0x25, 0x9a, 0x8b,
+	0x55, 0xdf, 0xde, 0x9f, 0x0f, 0x93, 0x45, 0x7c, 0x21, 0x31, 0x00, 0xc9, 0x04, 0x0c, 0x4a, 0x89,
-	0x12, 0x9f, 0x2f, 0x86, 0xc9, 0x32, 0x1e, 0xc7, 0xc8, 0x35, 0xaa, 0x95, 0x1d, 0x6c, 0x69, 0xc9,
+	0xe6, 0xbc, 0xc4, 0xe7, 0xf3, 0x61, 0xb2, 0x88, 0xc7, 0x31, 0x72, 0x8d, 0xea, 0xd2, 0x0e, 0xb6,
-	0xf7, 0xf3, 0x89, 0xeb, 0xee, 0xaf, 0x87, 0x92, 0x8b, 0xb4, 0x3a, 0xbf, 0xd6, 0x51, 0x4b, 0x97,
+	0xb4, 0xe4, 0xfb, 0xf9, 0xc4, 0x75, 0xf7, 0x57, 0x43, 0xc9, 0x65, 0x5a, 0x9d, 0x5f, 0xeb, 0xa8,
-	0xe0, 0x0d, 0x6c, 0xdc, 0xe7, 0x0b, 0x1b, 0xf7, 0xee, 0x15, 0xbe, 0x41, 0x9d, 0x61, 0xe5, 0x7e,
+	0xa5, 0x4b, 0xf0, 0x06, 0x36, 0xee, 0xf3, 0xb9, 0x8d, 0x7b, 0x77, 0x8d, 0x6f, 0x50, 0x67, 0xb8,
-	0xfd, 0x76, 0x69, 0xbf, 0xde, 0xbb, 0xb2, 0xf2, 0xfa, 0x6d, 0x7a, 0x1f, 0x5d, 0x2f, 0x13, 0xc0,
+	0x74, 0xbf, 0x7e, 0xbb, 0xb0, 0x5f, 0xef, 0xad, 0xad, 0xbc, 0x7a, 0x9b, 0xde, 0x47, 0xd7, 0xcb,
-	0x77, 0xd0, 0x86, 0x38, 0xeb, 0xad, 0xa5, 0x1b, 0x51, 0xae, 0xc2, 0xb2, 0xa9, 0x25, 0xa2, 0xc3,
+	0x04, 0xf0, 0x1d, 0xb4, 0x21, 0xce, 0x7a, 0x6b, 0xe9, 0x46, 0x94, 0xab, 0xb0, 0x6c, 0x6a, 0x89,
-	0x90, 0x3d, 0xe7, 0x70, 0x35, 0x72, 0x81, 0x96, 0x30, 0x82, 0x50, 0x71, 0x61, 0xfe, 0x79, 0x4b,
+	0xe8, 0x30, 0x64, 0x57, 0x1c, 0xd6, 0x23, 0x17, 0x68, 0x09, 0x23, 0x08, 0x15, 0x17, 0xe6, 0x9f,
-	0xf4, 0x91, 0xb9, 0x27, 0x25, 0x22, 0xf8, 0xe0, 0xe4, 0xd4, 0xa9, 0xbd, 0x3e, 0x75, 0x6a, 0x7f,
+	0xb7, 0x44, 0x1f, 0x99, 0x7b, 0x52, 0x22, 0x82, 0x0f, 0x4e, 0x4e, 0x9d, 0xda, 0xeb, 0x53, 0xa7,
-	0x9c, 0x3a, 0xb5, 0x1f, 0x73, 0xc7, 0x3a, 0xc9, 0x1d, 0xeb, 0x75, 0xee, 0x58, 0x7f, 0xe6, 0x8e,
+	0xf6, 0xc7, 0xa9, 0x53, 0xfb, 0x31, 0x77, 0xac, 0x93, 0xdc, 0xb1, 0x5e, 0xe7, 0x8e, 0xf5, 0x67,
-	0xf5, 0xf3, 0x5f, 0x4e, 0xed, 0xeb, 0xfa, 0xb8, 0xfb, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x81,
+	0xee, 0x58, 0x3f, 0xff, 0xe5, 0xd4, 0xbe, 0xae, 0x8f, 0xbb, 0xff, 0x06, 0x00, 0x00, 0xff, 0xff,
-	0xf7, 0x9a, 0x52, 0xd5, 0x09, 0x00, 0x00,
+	0x86, 0x24, 0xe7, 0xa3, 0xd7, 0x09, 0x00, 0x00,
 }

pkg/apis/autoscaling/v1/generated.proto

@@ -21,10 +21,10 @@ syntax = 'proto2';
 
 package k8s.io.kubernetes.pkg.apis.autoscaling.v1;
 
+import "k8s.io/apimachinery/pkg/api/resource/generated.proto";
 import "k8s.io/apimachinery/pkg/apis/meta/v1/generated.proto";
 import "k8s.io/apimachinery/pkg/runtime/generated.proto";
 import "k8s.io/apimachinery/pkg/runtime/schema/generated.proto";
-import "k8s.io/apimachinery/pkg/api/resource/generated.proto";
 import "k8s.io/kubernetes/pkg/api/v1/generated.proto";
 import "k8s.io/kubernetes/pkg/util/intstr/generated.proto";
 

pkg/apis/batch/v1/BUILD

@@ -26,12 +26,12 @@ go_library(
     tags = ["automanaged"],
     deps = [
         "//pkg/api:go_default_library",
-        "//pkg/api/resource:go_default_library",
         "//pkg/api/v1:go_default_library",
         "//pkg/apis/batch:go_default_library",
         "//pkg/util/intstr:go_default_library",
         "//vendor:github.com/gogo/protobuf/proto",
         "//vendor:github.com/ugorji/go/codec",
+        "//vendor:k8s.io/apimachinery/pkg/api/resource",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/conversion",
         "//vendor:k8s.io/apimachinery/pkg/runtime",

pkg/apis/batch/v1/generated.pb.go

@@ -1520,61 +1520,61 @@ var (
 )
 
 var fileDescriptorGenerated = []byte{
-	// 881 bytes of a gzipped FileDescriptorProto
+	// 882 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x9c, 0x54, 0xdd, 0x6e, 0xe3, 0x44,
-	0x14, 0xce, 0x4f, 0xd3, 0x26, 0x93, 0xb6, 0xbb, 0x8c, 0x54, 0x29, 0xf4, 0x22, 0x59, 0x05, 0x84,
+	0x18, 0x6d, 0x92, 0xa6, 0x4d, 0x26, 0x6d, 0x77, 0x19, 0xa9, 0x52, 0xe8, 0x45, 0xb2, 0x0a, 0x08,
-	0x0a, 0xda, 0xb5, 0x49, 0x77, 0x85, 0x10, 0x17, 0x48, 0xb8, 0x08, 0x89, 0xaa, 0x65, 0xab, 0x49,
+	0x15, 0xb4, 0x6b, 0x93, 0xee, 0x0a, 0x21, 0x2e, 0x90, 0x70, 0x11, 0x12, 0x55, 0xcb, 0x56, 0x93,
-	0x05, 0x12, 0x3f, 0x12, 0x63, 0xfb, 0x34, 0x1d, 0x6a, 0x7b, 0x2c, 0xcf, 0x38, 0x52, 0xef, 0x78,
+	0x0a, 0x24, 0x7e, 0x24, 0xc6, 0xf6, 0xd7, 0x74, 0xa8, 0xed, 0xb1, 0x3c, 0xe3, 0x48, 0xbd, 0xe3,
-	0x03, 0x78, 0x18, 0x84, 0x78, 0x84, 0x5e, 0xf6, 0x92, 0xab, 0x88, 0x9a, 0xb7, 0xd8, 0x2b, 0x34,
+	0x0d, 0xe0, 0x61, 0x10, 0xe2, 0x11, 0x7a, 0xd9, 0x4b, 0xae, 0x22, 0x6a, 0xde, 0x62, 0xaf, 0xd0,
-	0xe3, 0x89, 0xed, 0x34, 0x29, 0xa4, 0xdc, 0xd9, 0x67, 0xbe, 0xef, 0x3b, 0x67, 0xce, 0xf9, 0xce,
+	0x8c, 0xc7, 0x3f, 0x69, 0xd3, 0x25, 0xbb, 0x77, 0x9e, 0x6f, 0xce, 0x39, 0xdf, 0xf1, 0x7c, 0x67,
-	0xa0, 0x97, 0x57, 0x1f, 0x0b, 0x8b, 0x71, 0xfb, 0x2a, 0x75, 0x21, 0x89, 0x40, 0x82, 0xb0, 0xe3,
+	0x06, 0x3d, 0xbf, 0xfc, 0x54, 0x58, 0x8c, 0xdb, 0x97, 0xa9, 0x0b, 0x49, 0x04, 0x12, 0x84, 0x1d,
-	0xab, 0x89, 0x4d, 0x63, 0x26, 0x6c, 0x97, 0x4a, 0xef, 0xd2, 0x9e, 0x8e, 0xec, 0x09, 0x44, 0x90,
+	0x5f, 0x4e, 0x6d, 0x1a, 0x33, 0x61, 0xbb, 0x54, 0x7a, 0x17, 0xf6, 0x6c, 0x6c, 0x4f, 0x21, 0x82,
-	0x50, 0x09, 0xbe, 0x15, 0x27, 0x5c, 0x72, 0xfc, 0x4e, 0x4e, 0xb2, 0x4a, 0x92, 0x15, 0x5f, 0x4d,
+	0x84, 0x4a, 0xf0, 0xad, 0x38, 0xe1, 0x92, 0xe3, 0xf7, 0x72, 0x92, 0x55, 0x91, 0xac, 0xf8, 0x72,
-	0x2c, 0x45, 0xb2, 0x34, 0xc9, 0x9a, 0x8e, 0xf6, 0x5f, 0x4c, 0x98, 0xbc, 0x4c, 0x5d, 0xcb, 0xe3,
+	0x6a, 0x29, 0x92, 0xa5, 0x49, 0xd6, 0x6c, 0xbc, 0xf7, 0x6c, 0xca, 0xe4, 0x45, 0xea, 0x5a, 0x1e,
-	0xa1, 0x3d, 0xe1, 0x13, 0x6e, 0x6b, 0xae, 0x9b, 0x5e, 0xe8, 0x3f, 0xfd, 0xa3, 0xbf, 0x72, 0xcd,
+	0x0f, 0xed, 0x29, 0x9f, 0x72, 0x5b, 0x73, 0xdd, 0xf4, 0x5c, 0xaf, 0xf4, 0x42, 0x7f, 0xe5, 0x9a,
-	0xfd, 0x57, 0xa6, 0x10, 0x1a, 0xb3, 0x90, 0x7a, 0x97, 0x2c, 0x82, 0xe4, 0xba, 0x2c, 0x25, 0x04,
+	0x7b, 0x2f, 0x8c, 0x11, 0x1a, 0xb3, 0x90, 0x7a, 0x17, 0x2c, 0x82, 0xe4, 0xaa, 0xb0, 0x62, 0x27,
-	0x49, 0x57, 0x54, 0xb2, 0x6f, 0x3f, 0xc4, 0x4a, 0xd2, 0x48, 0xb2, 0x10, 0x96, 0x08, 0x1f, 0xfd,
+	0x20, 0x78, 0x9a, 0x78, 0x70, 0xd7, 0xc9, 0x6b, 0x59, 0xc2, 0x0e, 0x41, 0xd2, 0x25, 0xfe, 0xf7,
-	0x17, 0x41, 0x78, 0x97, 0x10, 0xd2, 0x25, 0xde, 0xe1, 0x83, 0x7d, 0xb2, 0x13, 0x10, 0x3c, 0x4d,
+	0xec, 0x87, 0x58, 0x49, 0x1a, 0x49, 0x16, 0xde, 0x6f, 0xf3, 0xc9, 0xff, 0x11, 0x84, 0x77, 0x01,
-	0xbc, 0xe5, 0x5c, 0xcf, 0x1f, 0xe6, 0xac, 0xb8, 0xca, 0x68, 0x35, 0x3a, 0x95, 0x2c, 0xb0, 0x59,
+	0x21, 0xbd, 0xc7, 0x7b, 0xfa, 0xe0, 0xe9, 0x2e, 0xb3, 0x35, 0x5e, 0x8e, 0x4e, 0x25, 0x0b, 0x6c,
-	0x24, 0x85, 0x4c, 0xee, 0x53, 0x86, 0xbf, 0x34, 0x50, 0xf3, 0x98, 0xbb, 0xf8, 0x47, 0xd4, 0x56,
+	0x16, 0x49, 0x21, 0x93, 0xbb, 0x94, 0xd1, 0x6f, 0x4d, 0xd4, 0x3a, 0xe2, 0x2e, 0xfe, 0x19, 0x75,
-	0x0d, 0xf2, 0xa9, 0xa4, 0xbd, 0xfa, 0xb3, 0xfa, 0x41, 0xf7, 0xf0, 0x43, 0xcb, 0x8c, 0xa8, 0x7a,
+	0xd4, 0xcf, 0xfa, 0x54, 0xd2, 0x7e, 0xe3, 0x49, 0x63, 0xbf, 0x77, 0xf0, 0xb1, 0x65, 0x86, 0x54,
-	0xcf, 0x72, 0x48, 0x0a, 0x6d, 0x4d, 0x47, 0xd6, 0x6b, 0xf7, 0x27, 0xf0, 0xe4, 0x29, 0x48, 0xea,
+	0xf7, 0x5c, 0x8d, 0x49, 0xa1, 0xad, 0xd9, 0xd8, 0x7a, 0xe9, 0xfe, 0x02, 0x9e, 0x3c, 0x01, 0x49,
-	0xe0, 0x9b, 0xd9, 0xa0, 0x96, 0xcd, 0x06, 0xa8, 0x8c, 0x91, 0x42, 0x15, 0x7f, 0x85, 0x36, 0x44,
+	0x1d, 0x7c, 0x3d, 0x1f, 0xae, 0x65, 0xf3, 0x21, 0xaa, 0x6a, 0xa4, 0x54, 0xc5, 0xdf, 0xa0, 0x75,
-	0x0c, 0x5e, 0xaf, 0xa1, 0xd5, 0x9f, 0x5b, 0x6b, 0x18, 0xc0, 0x3a, 0xe6, 0xee, 0x38, 0x06, 0xcf,
+	0x11, 0x83, 0xd7, 0x6f, 0x6a, 0xf5, 0xa7, 0xd6, 0x0a, 0x11, 0xb0, 0x8e, 0xb8, 0x3b, 0x89, 0xc1,
-	0xd9, 0x36, 0xca, 0x1b, 0xea, 0x8f, 0x68, 0x1d, 0xfc, 0x35, 0xda, 0x14, 0x92, 0xca, 0x54, 0xf4,
+	0x73, 0xb6, 0x8c, 0xf2, 0xba, 0x5a, 0x11, 0xad, 0x83, 0xbf, 0x45, 0x1b, 0x42, 0x52, 0x99, 0x8a,
-	0x9a, 0x5a, 0xd1, 0x5a, 0x5b, 0x51, 0xb3, 0x9c, 0x5d, 0xa3, 0xb9, 0x99, 0xff, 0x13, 0xa3, 0x36,
+	0x7e, 0x4b, 0x2b, 0x5a, 0x2b, 0x2b, 0x6a, 0x96, 0xb3, 0x63, 0x34, 0x37, 0xf2, 0x35, 0x31, 0x6a,
-	0xbc, 0x6d, 0xa2, 0xed, 0x63, 0xee, 0x1e, 0xf1, 0xc8, 0x67, 0x92, 0xf1, 0x08, 0xbf, 0x42, 0x1b,
+	0xa3, 0x9b, 0x16, 0xda, 0x3a, 0xe2, 0xee, 0x21, 0x8f, 0x7c, 0x26, 0x19, 0x8f, 0xf0, 0x0b, 0xb4,
-	0xf2, 0x3a, 0x06, 0xdd, 0x96, 0x8e, 0xf3, 0x6c, 0x5e, 0xca, 0xf9, 0x75, 0x0c, 0x6f, 0x66, 0x83,
+	0x2e, 0xaf, 0x62, 0xd0, 0xc7, 0xd2, 0x75, 0x9e, 0x14, 0x56, 0xce, 0xae, 0x62, 0x78, 0x35, 0x1f,
-	0xa7, 0x55, 0xac, 0x8a, 0x11, 0x8d, 0xae, 0x94, 0xd7, 0xd0, 0xbc, 0x4f, 0x17, 0xd3, 0xbd, 0x99,
+	0x3e, 0xae, 0x63, 0x55, 0x8d, 0x68, 0x74, 0xcd, 0x5e, 0x53, 0xf3, 0x3e, 0x5f, 0x6c, 0xf7, 0x6a,
-	0x0d, 0xfe, 0x75, 0xb6, 0x56, 0xa1, 0xb9, 0x58, 0x1e, 0x9e, 0xa0, 0x9d, 0x80, 0x0a, 0x79, 0x96,
+	0x3e, 0x7c, 0xed, 0x6c, 0xad, 0x52, 0x73, 0xd1, 0x1e, 0x9e, 0xa2, 0xed, 0x80, 0x0a, 0x79, 0x9a,
-	0x70, 0x17, 0xce, 0x59, 0x08, 0xe6, 0xf6, 0x1f, 0xac, 0x37, 0x2d, 0xc5, 0x70, 0xf6, 0x4c, 0x29,
+	0x70, 0x17, 0xce, 0x58, 0x08, 0xe6, 0xef, 0x3f, 0x5a, 0x6d, 0x5a, 0x8a, 0xe1, 0xec, 0x1a, 0x2b,
-	0x3b, 0x27, 0x55, 0x21, 0xb2, 0xa8, 0x8b, 0xa7, 0x08, 0xab, 0xc0, 0x79, 0x42, 0x23, 0x91, 0x5f,
+	0xdb, 0xc7, 0x75, 0x21, 0xb2, 0xa8, 0x8b, 0x67, 0x08, 0xab, 0xc2, 0x59, 0x42, 0x23, 0x91, 0xff,
-	0x4e, 0x65, 0xdb, 0x78, 0x74, 0xb6, 0x7d, 0x93, 0x0d, 0x9f, 0x2c, 0xa9, 0x91, 0x15, 0x19, 0xf0,
+	0x9c, 0xea, 0xb6, 0xfe, 0xc6, 0xdd, 0xf6, 0x4c, 0x37, 0x7c, 0x7c, 0x4f, 0x8d, 0x2c, 0xe9, 0x80,
-	0x7b, 0x68, 0x33, 0x01, 0x2a, 0x78, 0xd4, 0x6b, 0xe9, 0xc6, 0x15, 0x73, 0x22, 0x3a, 0x4a, 0xcc,
+	0x3f, 0x40, 0x1b, 0x09, 0x50, 0xc1, 0xa3, 0x7e, 0x5b, 0x1f, 0x5c, 0x39, 0x27, 0xa2, 0xab, 0xc4,
-	0x29, 0x7e, 0x1f, 0x6d, 0x85, 0x20, 0x04, 0x9d, 0x40, 0x6f, 0x53, 0x03, 0x9f, 0x18, 0xe0, 0xd6,
+	0xec, 0xe2, 0x0f, 0xd1, 0x66, 0x08, 0x42, 0xd0, 0x29, 0xf4, 0x37, 0x34, 0xf0, 0x91, 0x01, 0x6e,
-	0x69, 0x1e, 0x26, 0xf3, 0xf3, 0xe1, 0xef, 0x75, 0xb4, 0x75, 0xcc, 0xdd, 0x13, 0x26, 0x24, 0xfe,
+	0x9e, 0xe4, 0x65, 0x52, 0xec, 0x8f, 0xfe, 0x6c, 0xa0, 0xcd, 0x23, 0xee, 0x1e, 0x33, 0x21, 0xf1,
-	0x7e, 0xc9, 0xe8, 0xd6, 0x7a, 0x97, 0x51, 0x6c, 0x6d, 0xf3, 0xa7, 0x26, 0x4f, 0x7b, 0x1e, 0xa9,
+	0x8f, 0xf7, 0x82, 0x6e, 0xad, 0xf6, 0x33, 0x8a, 0xad, 0x63, 0xfe, 0xd8, 0xf4, 0xe9, 0x14, 0x95,
-	0x98, 0xfc, 0x14, 0xb5, 0x98, 0x84, 0x50, 0x0d, 0xbd, 0x79, 0xd0, 0x3d, 0x3c, 0x58, 0xd7, 0x93,
+	0x5a, 0xc8, 0x4f, 0x50, 0x9b, 0x49, 0x08, 0xd5, 0xd0, 0x5b, 0xfb, 0xbd, 0x83, 0xfd, 0x55, 0x33,
-	0xce, 0x8e, 0x11, 0x6d, 0x7d, 0xa9, 0xe8, 0x24, 0x57, 0x19, 0xfe, 0xd1, 0xd4, 0x85, 0x2b, 0xd7,
+	0xe9, 0x6c, 0x1b, 0xd1, 0xf6, 0xd7, 0x8a, 0x4e, 0x72, 0x95, 0xd1, 0x5f, 0x2d, 0x6d, 0x5c, 0xa5,
-	0xe3, 0x11, 0xea, 0xc6, 0x34, 0xa1, 0x41, 0x00, 0x01, 0x13, 0xa1, 0xae, 0xbd, 0xe5, 0x3c, 0xc9,
+	0x1e, 0x8f, 0x51, 0x2f, 0xa6, 0x09, 0x0d, 0x02, 0x08, 0x98, 0x08, 0xb5, 0xf7, 0xb6, 0xf3, 0x28,
-	0x66, 0x83, 0xee, 0x59, 0x19, 0x26, 0x55, 0x8c, 0xa2, 0x78, 0x3c, 0x8c, 0x03, 0x50, 0xcd, 0xcd,
+	0x9b, 0x0f, 0x7b, 0xa7, 0x55, 0x99, 0xd4, 0x31, 0x8a, 0xe2, 0xf1, 0x30, 0x0e, 0x40, 0x1d, 0x6e,
-	0x8d, 0x68, 0x28, 0x47, 0x65, 0x98, 0x54, 0x31, 0xf8, 0x35, 0xda, 0xa3, 0x9e, 0x64, 0x53, 0xf8,
+	0x1e, 0x44, 0x43, 0x39, 0xac, 0xca, 0xa4, 0x8e, 0xc1, 0x2f, 0xd1, 0x2e, 0xf5, 0x24, 0x9b, 0xc1,
-	0x1c, 0xa8, 0x1f, 0xb0, 0x08, 0xc6, 0xe0, 0xf1, 0xc8, 0xcf, 0x97, 0xac, 0xe9, 0xbc, 0x9d, 0xcd,
+	0x97, 0x40, 0xfd, 0x80, 0x45, 0x30, 0x01, 0x8f, 0x47, 0x7e, 0x7e, 0xc9, 0x5a, 0xce, 0xbb, 0xd9,
-	0x06, 0x7b, 0x9f, 0xad, 0x02, 0x90, 0xd5, 0x3c, 0xfc, 0x03, 0x6a, 0x0b, 0x08, 0xc0, 0x93, 0x3c,
+	0x7c, 0xb8, 0xfb, 0xc5, 0x32, 0x00, 0x59, 0xce, 0xc3, 0x3f, 0xa1, 0x8e, 0x80, 0x00, 0x3c, 0xc9,
-	0x31, 0xe6, 0x79, 0xb9, 0x66, 0xbf, 0xa9, 0x0b, 0xc1, 0xd8, 0x50, 0x9d, 0x6d, 0xd5, 0xf0, 0xf9,
+	0x13, 0x13, 0x9e, 0xe7, 0x2b, 0x9e, 0x37, 0x75, 0x21, 0x98, 0x18, 0xaa, 0xb3, 0xa5, 0x0e, 0xbc,
-	0x1f, 0x29, 0x24, 0xf1, 0x27, 0x68, 0x37, 0xa4, 0x51, 0x4a, 0x0b, 0xa4, 0x76, 0x4d, 0xdb, 0xc1,
+	0x58, 0x91, 0x52, 0x12, 0x7f, 0x86, 0x76, 0x42, 0x1a, 0xa5, 0xb4, 0x44, 0xea, 0xd4, 0x74, 0x1c,
-	0xd9, 0x6c, 0xb0, 0x7b, 0xba, 0x70, 0x42, 0xee, 0x21, 0xf1, 0x77, 0xa8, 0x2d, 0x21, 0x8c, 0x03,
+	0x9c, 0xcd, 0x87, 0x3b, 0x27, 0x0b, 0x3b, 0xe4, 0x0e, 0x12, 0xff, 0x80, 0x3a, 0x12, 0xc2, 0x38,
-	0x2a, 0x73, 0x0b, 0x75, 0x0f, 0x5f, 0x3c, 0x3c, 0x2f, 0x55, 0xd2, 0x19, 0xf7, 0xcf, 0x0d, 0x41,
+	0xa0, 0x32, 0x8f, 0x50, 0xef, 0xe0, 0xd9, 0xc3, 0xf3, 0x52, 0x96, 0x4e, 0xb9, 0x7f, 0x66, 0x08,
-	0x3f, 0x4b, 0x85, 0x13, 0xe6, 0x51, 0x52, 0x08, 0x0e, 0x7f, 0x6b, 0xa2, 0x4e, 0xf1, 0xd8, 0x60,
+	0xfa, 0x59, 0x2a, 0x93, 0x50, 0x54, 0x49, 0x29, 0x38, 0xfa, 0xa3, 0x85, 0xba, 0xe5, 0x63, 0x83,
-	0x40, 0xc8, 0x9b, 0x2f, 0xb4, 0xe8, 0xd5, 0xb5, 0x39, 0x46, 0xeb, 0x9a, 0xa3, 0x78, 0x0a, 0xca,
+	0x01, 0x21, 0xaf, 0xb8, 0xd0, 0xa2, 0xdf, 0xd0, 0xe1, 0x18, 0xaf, 0x1a, 0x8e, 0xf2, 0x29, 0xa8,
-	0x17, 0xb6, 0x08, 0x09, 0x52, 0x11, 0xc6, 0xdf, 0xa0, 0x8e, 0x90, 0x34, 0x91, 0x7a, 0x55, 0x1b,
+	0x5e, 0xd8, 0xb2, 0x24, 0x48, 0x4d, 0x18, 0x7f, 0x87, 0xba, 0x42, 0xd2, 0x44, 0xea, 0xab, 0xda,
-	0x8f, 0x5e, 0xd5, 0x9d, 0x6c, 0x36, 0xe8, 0x8c, 0xe7, 0x02, 0xa4, 0xd4, 0xc2, 0x17, 0x68, 0xb7,
+	0x7c, 0xe3, 0xab, 0xba, 0x9d, 0xcd, 0x87, 0xdd, 0x49, 0x21, 0x40, 0x2a, 0x2d, 0x7c, 0x8e, 0x76,
-	0x74, 0xc9, 0xff, 0x7c, 0x76, 0xf4, 0x48, 0x8e, 0x16, 0x54, 0xc8, 0x3d, 0x55, 0xb5, 0xfc, 0xb9,
+	0xaa, 0x94, 0xbc, 0xe5, 0xb3, 0xa3, 0x47, 0x72, 0xb8, 0xa0, 0x42, 0xee, 0xa8, 0xaa, 0xcb, 0x9f,
-	0x8d, 0xb4, 0x57, 0x5a, 0xe5, 0xf2, 0xe7, 0x9e, 0x23, 0xe6, 0x14, 0xdb, 0xa8, 0x23, 0x52, 0xcf,
+	0xc7, 0x48, 0x67, 0xa5, 0x5d, 0x5d, 0xfe, 0x3c, 0x73, 0xc4, 0xec, 0x62, 0x1b, 0x75, 0x45, 0xea,
-	0x03, 0xf0, 0xc1, 0xd7, 0x13, 0x6f, 0x39, 0x6f, 0x19, 0x68, 0x67, 0x3c, 0x3f, 0x20, 0x25, 0x46,
+	0x79, 0x00, 0x3e, 0xf8, 0x7a, 0xe2, 0x6d, 0xe7, 0x1d, 0x03, 0xed, 0x4e, 0x8a, 0x0d, 0x52, 0x61,
-	0x09, 0x5f, 0x50, 0x16, 0x80, 0xaf, 0x27, 0x5d, 0x11, 0xfe, 0x42, 0x47, 0x89, 0x39, 0x75, 0xde,
+	0x94, 0xf0, 0x39, 0x65, 0x01, 0xf8, 0x7a, 0xd2, 0x35, 0xe1, 0xaf, 0x74, 0x95, 0x98, 0x5d, 0xe7,
-	0xbd, 0xb9, 0xeb, 0xd7, 0x6e, 0xef, 0xfa, 0xb5, 0x3f, 0xef, 0xfa, 0xb5, 0x9f, 0xb3, 0x7e, 0xfd,
+	0xfd, 0xeb, 0xdb, 0xc1, 0xda, 0xcd, 0xed, 0x60, 0xed, 0xef, 0xdb, 0xc1, 0xda, 0xaf, 0xd9, 0xa0,
-	0x26, 0xeb, 0xd7, 0x6f, 0xb3, 0x7e, 0xfd, 0xaf, 0xac, 0x5f, 0xff, 0xf5, 0xef, 0x7e, 0xed, 0xdb,
+	0x71, 0x9d, 0x0d, 0x1a, 0x37, 0xd9, 0xa0, 0xf1, 0x4f, 0x36, 0x68, 0xfc, 0xfe, 0xef, 0x60, 0xed,
-	0xc6, 0x74, 0xf4, 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x6a, 0x9a, 0xe5, 0xae, 0xf3, 0x08, 0x00,
+	0xfb, 0xe6, 0x6c, 0xfc, 0x5f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xf1, 0x6d, 0xf1, 0x7d, 0xf5, 0x08,
-	0x00,
+	0x00, 0x00,
 }

pkg/apis/batch/v1/generated.proto

@@ -21,10 +21,10 @@ syntax = 'proto2';
 
 package k8s.io.kubernetes.pkg.apis.batch.v1;
 
+import "k8s.io/apimachinery/pkg/api/resource/generated.proto";
 import "k8s.io/apimachinery/pkg/apis/meta/v1/generated.proto";
 import "k8s.io/apimachinery/pkg/runtime/generated.proto";
 import "k8s.io/apimachinery/pkg/runtime/schema/generated.proto";
-import "k8s.io/apimachinery/pkg/api/resource/generated.proto";
 import "k8s.io/kubernetes/pkg/api/v1/generated.proto";
 import "k8s.io/kubernetes/pkg/util/intstr/generated.proto";
 

pkg/apis/batch/v1/types.generated.go

@@ -65,9 +65,9 @@ func init() {
 		panic(err)
 	}
 	if false { // reference the types, but skip this branch at build/run time
-		var v0 pkg1_v1.TypeMeta
+		var v0 pkg4_resource.Quantity
-		var v1 pkg2_types.UID
+		var v1 pkg1_v1.TypeMeta
-		var v2 pkg4_resource.Quantity
+		var v2 pkg2_types.UID
 		var v3 pkg3_v1.PodTemplateSpec
 		var v4 pkg5_intstr.IntOrString
 		var v5 time.Time

pkg/apis/batch/v2alpha1/BUILD

@@ -26,12 +26,12 @@ go_library(
     tags = ["automanaged"],
     deps = [
         "//pkg/api:go_default_library",
-        "//pkg/api/resource:go_default_library",
         "//pkg/api/v1:go_default_library",
         "//pkg/apis/batch:go_default_library",
         "//pkg/util/intstr:go_default_library",
         "//vendor:github.com/gogo/protobuf/proto",
         "//vendor:github.com/ugorji/go/codec",
+        "//vendor:k8s.io/apimachinery/pkg/api/resource",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/conversion",
         "//vendor:k8s.io/apimachinery/pkg/runtime",

pkg/apis/batch/v2alpha1/generated.pb.go

@@ -2720,65 +2720,65 @@ var fileDescriptorGenerated = []byte{
 	0x31, 0x55, 0xcf, 0xa7, 0x9c, 0xc2, 0xfb, 0x03, 0xa8, 0x9a, 0x42, 0x55, 0xef, 0xb4, 0xa3, 0x46,
 	0x50, 0x55, 0x40, 0xd5, 0x18, 0xba, 0xf1, 0xa8, 0x63, 0xf1, 0x6e, 0xd0, 0x56, 0x0d, 0xea, 0x68,
 	0x1d, 0xda, 0xa1, 0x9a, 0x60, 0x68, 0x07, 0x27, 0x62, 0x25, 0x16, 0xe2, 0x6b, 0xc0, 0xbc, 0xb1,
-	0x23, 0x83, 0xc2, 0x9e, 0xe5, 0x60, 0xa3, 0x6b, 0xb9, 0xc4, 0xef, 0xa5, 0x61, 0x39, 0x84, 0x63,
+	0x23, 0x83, 0xc2, 0x9e, 0xe5, 0x60, 0xa3, 0x6b, 0xb9, 0xc4, 0xef, 0xc5, 0x61, 0x69, 0x3e, 0x61,
-	0xed, 0x6c, 0x2c, 0x9e, 0x0d, 0x6d, 0x1a, 0xca, 0x0f, 0x5c, 0x6e, 0x39, 0x64, 0x0c, 0xf0, 0xf8,
+	0x34, 0xf0, 0x0d, 0x32, 0x1a, 0xcf, 0xb5, 0x28, 0xa6, 0x39, 0x84, 0x63, 0xed, 0x6c, 0xec, 0x16,
-	0x4d, 0x00, 0x66, 0x74, 0x89, 0x83, 0xc7, 0x70, 0xcd, 0xa9, 0x39, 0xd3, 0x7c, 0xc2, 0x68, 0xe0,
+	0x1b, 0xda, 0x34, 0x94, 0x1f, 0xb8, 0xdc, 0x72, 0xc6, 0x8f, 0x79, 0xfc, 0x26, 0x00, 0x33, 0xba,
-	0x1b, 0xe3, 0x67, 0x3d, 0x9c, 0x8e, 0x99, 0x70, 0x95, 0xed, 0xc9, 0xde, 0x01, 0xb7, 0x6c, 0xcd,
+	0xc4, 0xc1, 0x63, 0xb8, 0x87, 0x53, 0x33, 0x3d, 0x29, 0xac, 0xed, 0xc9, 0xde, 0x01, 0xb7, 0x6c,
-	0x72, 0x39, 0xe3, 0xfe, 0x28, 0xa4, 0xf1, 0x53, 0x0e, 0x14, 0x77, 0x7d, 0xea, 0xee, 0xd1, 0x36,
+	0xcd, 0x72, 0x39, 0xe3, 0xfe, 0x28, 0xa4, 0xf1, 0x53, 0x0e, 0x14, 0x77, 0x7d, 0xea, 0xee, 0xd1,
-	0x7c, 0x05, 0x4a, 0x51, 0x92, 0x4c, 0xcc, 0x71, 0x55, 0xd9, 0x54, 0xb6, 0x2a, 0xcd, 0x0f, 0x54,
+	0x36, 0x7c, 0x05, 0x4a, 0xd1, 0x85, 0x4d, 0xcc, 0x71, 0x55, 0xd9, 0x54, 0xb6, 0x2a, 0xcd, 0x0f,
-	0x59, 0xac, 0xec, 0x5d, 0xd3, 0x72, 0x45, 0xde, 0xea, 0xd9, 0xb6, 0xfa, 0xbc, 0xfd, 0x9a, 0x18,
+	0x54, 0x59, 0xae, 0x6c, 0xdc, 0x69, 0xc1, 0x22, 0x6f, 0xf5, 0x6c, 0x5b, 0x7d, 0xde, 0x7e, 0x4d,
-	0xfc, 0x80, 0x70, 0xac, 0xc3, 0xf3, 0x7e, 0x7d, 0x2e, 0xec, 0xd7, 0x41, 0x6a, 0x43, 0x09, 0x2b,
+	0x0c, 0x7e, 0x40, 0x38, 0xd6, 0xe1, 0x79, 0xbf, 0x3e, 0x17, 0xf6, 0xeb, 0x20, 0xb5, 0xa1, 0x84,
-	0xfc, 0x12, 0xcc, 0x33, 0x8f, 0x18, 0xd5, 0x9c, 0x60, 0x7f, 0xac, 0xde, 0x58, 0x0a, 0xaa, 0x8c,
+	0x15, 0x7e, 0x09, 0xe6, 0x99, 0x47, 0x8c, 0x6a, 0x4e, 0xb0, 0x3f, 0x56, 0x6f, 0x2c, 0x06, 0x55,
-	0xb1, 0xe5, 0x11, 0x43, 0x5f, 0x94, 0x67, 0xcc, 0x47, 0x2b, 0x24, 0x18, 0xe1, 0x2b, 0x50, 0x60,
+	0xc6, 0xd8, 0xf2, 0x88, 0xa1, 0x2f, 0xca, 0x33, 0xe6, 0xa3, 0x15, 0x12, 0x8c, 0xf0, 0x15, 0x28,
-	0x1c, 0xf3, 0x80, 0x55, 0xf3, 0x82, 0xfb, 0xc9, 0x2d, 0xb8, 0x05, 0x5e, 0x5f, 0x96, 0xec, 0x85,
+	0x30, 0x8e, 0x79, 0xc0, 0xaa, 0x79, 0xc1, 0xfd, 0xe4, 0x16, 0xdc, 0x02, 0xaf, 0x2f, 0x4b, 0xf6,
-	0xc1, 0x1a, 0x49, 0xde, 0xc6, 0x6f, 0x0a, 0xa8, 0x48, 0xcf, 0x7d, 0x8b, 0x71, 0x78, 0x3c, 0x96,
+	0xc2, 0x60, 0x8d, 0x24, 0x6f, 0xe3, 0x37, 0x05, 0x54, 0xa4, 0xe7, 0xbe, 0xc5, 0x38, 0x3c, 0x1e,
-	0x2d, 0xf5, 0x66, 0xd9, 0x8a, 0xd0, 0x22, 0x57, 0xab, 0xf2, 0xa4, 0x52, 0x6c, 0xc9, 0x64, 0xea,
+	0xcb, 0x96, 0x7a, 0xb3, 0x6c, 0x45, 0x68, 0x91, 0xab, 0x55, 0x79, 0x52, 0x29, 0xb6, 0x64, 0x32,
-	0x25, 0x58, 0xb0, 0x38, 0x71, 0x58, 0x35, 0xb7, 0x99, 0xdf, 0xaa, 0x34, 0x9b, 0xb3, 0x5f, 0x47,
+	0xf5, 0x12, 0x2c, 0x58, 0x9c, 0x38, 0xac, 0x9a, 0xdb, 0xcc, 0x6f, 0x55, 0x9a, 0xcd, 0xd9, 0xaf,
-	0x5f, 0x92, 0xf4, 0x0b, 0x9f, 0x47, 0x44, 0x68, 0xc0, 0xd7, 0xf8, 0x3e, 0x9f, 0x5c, 0x23, 0x4a,
+	0xa3, 0x2f, 0x49, 0xfa, 0x85, 0xcf, 0x23, 0x22, 0x34, 0xe0, 0x6b, 0x7c, 0x9f, 0x4f, 0xae, 0x11,
-	0x1f, 0x7c, 0x08, 0x4a, 0x91, 0x5e, 0xcd, 0xc0, 0x26, 0xe2, 0x1a, 0xe5, 0x34, 0xac, 0x96, 0xb4,
+	0xa5, 0x0f, 0x3e, 0x04, 0xa5, 0x48, 0x7b, 0x66, 0x60, 0x13, 0x71, 0x8d, 0x72, 0x1a, 0x56, 0x4b,
-	0xa3, 0xc4, 0x03, 0xbe, 0x00, 0xf7, 0x18, 0xc7, 0x3e, 0xb7, 0xdc, 0xce, 0xa7, 0x04, 0x9b, 0xb6,
+	0xda, 0x51, 0xe2, 0x01, 0x5f, 0x80, 0x7b, 0x8c, 0x63, 0x9f, 0x5b, 0x6e, 0xe7, 0x53, 0x82, 0x4d,
-	0xe5, 0x92, 0x16, 0x31, 0xa8, 0x6b, 0x32, 0x51, 0xd3, 0xbc, 0xfe, 0x6e, 0xd8, 0xaf, 0xdf, 0x6b,
+	0xdb, 0x72, 0x49, 0x8b, 0x18, 0xd4, 0x35, 0x99, 0xa8, 0x69, 0x5e, 0x7f, 0x37, 0xec, 0xd7, 0xef,
-	0x4d, 0x76, 0x41, 0xd3, 0xb0, 0xf0, 0x18, 0xac, 0x19, 0xd4, 0x35, 0x02, 0xdf, 0x27, 0xae, 0xd1,
+	0xb5, 0x26, 0xbb, 0xa0, 0x69, 0x58, 0x78, 0x0c, 0xd6, 0x0c, 0xea, 0x1a, 0x81, 0xef, 0x13, 0xd7,
-	0x3b, 0xa4, 0xb6, 0x65, 0xf4, 0x44, 0x21, 0xcb, 0xba, 0x2a, 0xa3, 0x59, 0xdb, 0x1d, 0x75, 0xb8,
+	0xe8, 0x1d, 0x52, 0xdb, 0x32, 0x7a, 0xa2, 0x90, 0x65, 0x5d, 0x95, 0xd1, 0xac, 0xed, 0x8e, 0x3a,
-	0x9a, 0x64, 0x44, 0xe3, 0x44, 0xf0, 0x3d, 0x50, 0x64, 0x01, 0xf3, 0x88, 0x6b, 0x56, 0xe7, 0x37,
+	0x5c, 0x4d, 0x32, 0xa2, 0x71, 0x22, 0xf8, 0x1e, 0x28, 0xb2, 0x80, 0x79, 0xc4, 0x35, 0xab, 0xf3,
-	0x95, 0xad, 0x92, 0x5e, 0x09, 0xfb, 0xf5, 0x62, 0x6b, 0x60, 0x42, 0xf1, 0x1e, 0xfc, 0x16, 0x54,
+	0x9b, 0xca, 0x56, 0x49, 0xaf, 0x84, 0xfd, 0x7a, 0xb1, 0x35, 0x30, 0xa1, 0x78, 0x0f, 0x7e, 0x0b,
-	0x5e, 0xd3, 0xf6, 0x11, 0x71, 0x3c, 0x1b, 0x73, 0x52, 0x5d, 0x10, 0x35, 0x7d, 0x3a, 0x43, 0xe2,
+	0x2a, 0xaf, 0x69, 0xfb, 0x88, 0x38, 0x9e, 0x8d, 0x39, 0xa9, 0x2e, 0x88, 0x9a, 0x3e, 0x9d, 0x21,
-	0xf7, 0x52, 0xb4, 0xd0, 0xe9, 0x5b, 0x32, 0xf4, 0x4a, 0x66, 0x03, 0x65, 0xcf, 0x68, 0xfc, 0xa1,
+	0xf1, 0x7b, 0x29, 0x5a, 0xe8, 0xf4, 0x2d, 0x19, 0x7a, 0x25, 0xb3, 0x81, 0xb2, 0x67, 0x34, 0xfe,
-	0x80, 0xa5, 0x21, 0xf5, 0xc1, 0x17, 0xa0, 0x80, 0x0d, 0x6e, 0x9d, 0x45, 0xc5, 0x88, 0x0a, 0xff,
+	0x50, 0xc0, 0xd2, 0x90, 0xfa, 0xe0, 0x0b, 0x50, 0xc0, 0x06, 0xb7, 0xce, 0xa2, 0x62, 0x44, 0x85,
-	0x68, 0xfa, 0xf9, 0xe9, 0xcb, 0x43, 0xe4, 0x84, 0x44, 0x17, 0x26, 0xa9, 0x78, 0x9f, 0x09, 0x12,
+	0x7f, 0x34, 0xfd, 0xfc, 0xf4, 0xe5, 0x21, 0x72, 0x42, 0xa2, 0x0b, 0x93, 0x54, 0xbc, 0xcf, 0x04,
-	0x24, 0xc9, 0xa0, 0x0d, 0x56, 0x6d, 0xcc, 0x78, 0x5c, 0xd1, 0x23, 0xcb, 0x21, 0x22, 0x17, 0x95,
+	0x09, 0x92, 0x64, 0xd0, 0x06, 0xab, 0x36, 0x66, 0x3c, 0xae, 0xe8, 0x91, 0xe5, 0x10, 0x91, 0x8b,
-	0xe6, 0x83, 0x9b, 0x89, 0x36, 0x42, 0xe8, 0x6f, 0x87, 0xfd, 0xfa, 0xea, 0xfe, 0x08, 0x0f, 0x1a,
+	0x4a, 0xf3, 0xc1, 0xcd, 0x44, 0x1b, 0x21, 0xf4, 0xb7, 0xc3, 0x7e, 0x7d, 0x75, 0x7f, 0x84, 0x07,
-	0x63, 0x6e, 0xfc, 0x98, 0x03, 0xf9, 0xbb, 0x69, 0x28, 0x47, 0x43, 0x0d, 0xa5, 0x39, 0x5b, 0xb1,
+	0x8d, 0x31, 0x37, 0x7e, 0xcc, 0x81, 0xfc, 0xdd, 0x34, 0x94, 0xa3, 0xa1, 0x86, 0xd2, 0x9c, 0xad,
-	0xa6, 0x36, 0x93, 0xe3, 0x91, 0x66, 0xb2, 0x33, 0x23, 0xef, 0xf5, 0x8d, 0xe4, 0x22, 0x0f, 0x16,
+	0x58, 0x53, 0x9b, 0xc9, 0xf1, 0x48, 0x33, 0xd9, 0x99, 0x91, 0xf7, 0xfa, 0x46, 0x72, 0x91, 0x07,
-	0xf7, 0x68, 0x7b, 0x97, 0xba, 0xa6, 0xc5, 0x2d, 0xea, 0xc2, 0x1d, 0x30, 0xcf, 0x7b, 0x5e, 0xfc,
+	0x8b, 0x7b, 0xb4, 0xbd, 0x4b, 0x5d, 0xd3, 0xe2, 0x16, 0x75, 0xe1, 0x0e, 0x98, 0xe7, 0x3d, 0x2f,
-	0xfc, 0x36, 0xe3, 0x80, 0x8e, 0x7a, 0x1e, 0xb9, 0xea, 0xd7, 0x57, 0xb3, 0xbe, 0x91, 0x0d, 0x09,
+	0x7e, 0x7e, 0x9b, 0x71, 0x40, 0x47, 0x3d, 0x8f, 0x5c, 0xf5, 0xeb, 0xab, 0x59, 0xdf, 0xc8, 0x86,
-	0x6f, 0xf8, 0x45, 0x12, 0x64, 0x4e, 0xe0, 0x3e, 0x19, 0x3e, 0xee, 0xaa, 0x5f, 0xbf, 0x76, 0x78,
+	0x84, 0x37, 0xfc, 0x22, 0x09, 0x32, 0x27, 0x70, 0x9f, 0x0c, 0x1f, 0x77, 0xd5, 0xaf, 0x5f, 0x3b,
-	0xa8, 0x09, 0xe7, 0x70, 0x78, 0xb0, 0x03, 0x96, 0xa2, 0x82, 0x1e, 0xfa, 0xb4, 0x3d, 0xd0, 0x49,
+	0x3c, 0xd4, 0x84, 0x73, 0x38, 0x3c, 0xd8, 0x01, 0x4b, 0x51, 0x41, 0x0f, 0x7d, 0xda, 0x1e, 0xe8,
-	0x7e, 0x66, 0x9d, 0xac, 0xcb, 0x50, 0x96, 0xf6, 0xb3, 0x44, 0x68, 0x98, 0x17, 0x9e, 0x01, 0x18,
+	0x24, 0x3f, 0xb3, 0x4e, 0xd6, 0x65, 0x28, 0x4b, 0xfb, 0x59, 0x22, 0x34, 0xcc, 0x0b, 0xcf, 0x00,
-	0x19, 0x8e, 0x7c, 0xec, 0xb2, 0xc1, 0xe5, 0x6e, 0xa7, 0xca, 0x0d, 0x79, 0x1a, 0xdc, 0x1f, 0x63,
+	0x8c, 0x0c, 0x47, 0x3e, 0x76, 0xd9, 0xe0, 0x72, 0xb7, 0x53, 0xe5, 0x86, 0x3c, 0x0d, 0xee, 0x8f,
-	0x43, 0x13, 0x4e, 0x80, 0xef, 0x83, 0x82, 0x4f, 0x30, 0xa3, 0xae, 0x78, 0xe2, 0xe5, 0xb4, 0x4e,
+	0xb1, 0xa1, 0x09, 0x27, 0xc0, 0xf7, 0x41, 0xc1, 0x27, 0x98, 0x51, 0x57, 0x3c, 0xf1, 0x72, 0x5a,
-	0x48, 0x58, 0x91, 0xdc, 0x85, 0xf7, 0x41, 0xd1, 0x21, 0x8c, 0xe1, 0x0e, 0xa9, 0x16, 0x84, 0xe3,
+	0x27, 0x24, 0xac, 0x48, 0xee, 0xc2, 0xfb, 0xa0, 0xe8, 0x10, 0xc6, 0x70, 0x87, 0x54, 0x0b, 0xc2,
-	0x8a, 0x74, 0x2c, 0x1e, 0x0c, 0xcc, 0x28, 0xde, 0x6f, 0xfc, 0xaa, 0x80, 0xe2, 0xdd, 0xcc, 0x85,
+	0x71, 0x45, 0x3a, 0x16, 0x0f, 0x06, 0x66, 0x14, 0xef, 0x37, 0x7e, 0x55, 0x40, 0xf1, 0x6e, 0xe6,
-	0xd6, 0xf0, 0x5c, 0x50, 0x67, 0x53, 0xe6, 0x94, 0x99, 0xf0, 0x73, 0x5e, 0x84, 0x2f, 0xe6, 0xc1,
+	0x42, 0x6b, 0x78, 0x2e, 0xa8, 0xb3, 0x29, 0x73, 0xca, 0x4c, 0xf8, 0x39, 0x2f, 0xc2, 0x17, 0xf3,
-	0x36, 0xa8, 0x78, 0xd8, 0xc7, 0xb6, 0x4d, 0x6c, 0x8b, 0x39, 0xe2, 0x06, 0x0b, 0xfa, 0x4a, 0xd4,
+	0x60, 0x1b, 0x54, 0x3c, 0xec, 0x63, 0xdb, 0x26, 0xb6, 0xc5, 0x1c, 0x71, 0x83, 0x05, 0x7d, 0x25,
-	0xc5, 0x0e, 0x53, 0x33, 0xca, 0xfa, 0x44, 0x10, 0x83, 0x3a, 0x9e, 0x4d, 0xa2, 0x14, 0x0f, 0xe4,
+	0xea, 0x62, 0x87, 0xa9, 0x19, 0x65, 0x7d, 0x22, 0x88, 0x41, 0x1d, 0xcf, 0x26, 0x51, 0x8a, 0x07,
-	0x28, 0x21, 0xbb, 0xa9, 0x19, 0x65, 0x7d, 0xe0, 0x73, 0xb0, 0x3e, 0xe8, 0x4c, 0xa3, 0x53, 0x24,
+	0x72, 0x94, 0x90, 0xdd, 0xd4, 0x8c, 0xb2, 0x3e, 0xf0, 0x39, 0x58, 0x1f, 0x74, 0xa6, 0xd1, 0x29,
-	0x2f, 0xa6, 0xc8, 0x3b, 0x61, 0xbf, 0xbe, 0xfe, 0x6c, 0x92, 0x03, 0x9a, 0x8c, 0x83, 0xdf, 0x80,
+	0x92, 0x17, 0x53, 0xe4, 0x9d, 0xb0, 0x5f, 0x5f, 0x7f, 0x36, 0xc9, 0x01, 0x4d, 0xc6, 0xc1, 0x6f,
-	0x12, 0x23, 0x36, 0x31, 0x38, 0xf5, 0xa5, 0x84, 0x3e, 0xbc, 0x61, 0xd6, 0x71, 0x9b, 0xd8, 0x2d,
+	0x40, 0x89, 0x11, 0x9b, 0x18, 0x9c, 0xfa, 0x52, 0x42, 0x1f, 0xde, 0x30, 0xeb, 0xb8, 0x4d, 0xec,
-	0x09, 0xd5, 0x17, 0xc5, 0xdc, 0x93, 0x2b, 0x94, 0x50, 0xc2, 0xa7, 0x60, 0xd9, 0xc1, 0x6e, 0x80,
+	0x96, 0x84, 0xea, 0x8b, 0x62, 0xee, 0xc9, 0x15, 0x4a, 0x28, 0xe1, 0x53, 0xb0, 0xec, 0x60, 0x37,
-	0x13, 0x4f, 0xa1, 0x9d, 0x92, 0x0e, 0xc3, 0x7e, 0x7d, 0xf9, 0x60, 0x68, 0x07, 0x8d, 0x78, 0xc2,
+	0xc0, 0x89, 0xa7, 0xd0, 0x4e, 0x49, 0x87, 0x61, 0xbf, 0xbe, 0x7c, 0x30, 0xb4, 0x83, 0x46, 0x3c,
-	0xaf, 0x41, 0x89, 0xc7, 0x43, 0xa5, 0x20, 0x42, 0x7b, 0x43, 0x53, 0x3f, 0xa4, 0xe6, 0xd0, 0x1c,
+	0xe1, 0xd7, 0xa0, 0xc4, 0xe3, 0xa1, 0x52, 0x10, 0xa1, 0xbd, 0xa1, 0xa9, 0x1f, 0x52, 0x73, 0x68,
-	0x49, 0xf4, 0x90, 0x0c, 0x91, 0x84, 0xb0, 0xf1, 0x4b, 0x1e, 0x94, 0xd3, 0xe9, 0x71, 0x0a, 0x80,
+	0x8e, 0x24, 0x7a, 0x48, 0x86, 0x48, 0x42, 0xd8, 0xf8, 0x25, 0x0f, 0xca, 0xe9, 0xf4, 0x38, 0x05,
-	0x11, 0x3f, 0x6b, 0x26, 0x27, 0xc8, 0x47, 0xb3, 0x49, 0x24, 0x69, 0x0b, 0x69, 0xe7, 0x4d, 0x4c,
+	0xc0, 0x88, 0x9f, 0x35, 0x93, 0x13, 0xe4, 0xa3, 0xd9, 0x24, 0x92, 0xb4, 0x85, 0xb4, 0xf3, 0x26,
-	0x0c, 0x65, 0xe8, 0xe1, 0x4b, 0x50, 0x16, 0xf3, 0x5c, 0x3c, 0xdb, 0xdc, 0xcc, 0xcf, 0x76, 0x29,
+	0x26, 0x86, 0x32, 0xf4, 0xf0, 0x25, 0x28, 0x8b, 0x79, 0x2e, 0x9e, 0x6d, 0x6e, 0xe6, 0x67, 0xbb,
-	0xec, 0xd7, 0xcb, 0xad, 0x98, 0x00, 0xa5, 0x5c, 0xf0, 0x04, 0x2c, 0xa7, 0x5a, 0xb9, 0x65, 0x0b,
+	0x14, 0xf6, 0xeb, 0xe5, 0x56, 0x4c, 0x80, 0x52, 0x2e, 0x78, 0x02, 0x96, 0x53, 0xad, 0xdc, 0xb2,
-	0x12, 0x85, 0xd9, 0x1d, 0x62, 0x41, 0x23, 0xac, 0x51, 0x23, 0x90, 0xb3, 0x76, 0x5e, 0x48, 0x76,
+	0x05, 0x89, 0xc2, 0xec, 0x0e, 0xb1, 0xa0, 0x11, 0xd6, 0xa8, 0x11, 0xc8, 0x59, 0x3b, 0x2f, 0x24,
-	0xda, 0xf0, 0xd4, 0x40, 0x99, 0x05, 0x86, 0x41, 0x88, 0x49, 0x4c, 0x51, 0xf7, 0x05, 0x7d, 0x4d,
+	0x3b, 0x6d, 0x78, 0x6a, 0xa0, 0xcc, 0x02, 0xc3, 0x20, 0xc4, 0x24, 0xa6, 0xa8, 0xfb, 0x82, 0xbe,
-	0xba, 0x96, 0x5b, 0xf1, 0x06, 0x4a, 0x7d, 0x22, 0xe2, 0x13, 0x6c, 0xd9, 0xc4, 0x14, 0xf5, 0xce,
+	0x26, 0x5d, 0xcb, 0xad, 0x78, 0x03, 0xa5, 0x3e, 0x11, 0xf1, 0x09, 0xb6, 0x6c, 0x62, 0x8a, 0x7a,
-	0x10, 0x7f, 0x26, 0xac, 0x48, 0xee, 0x36, 0xfe, 0x52, 0x40, 0xf6, 0xdf, 0xe0, 0x0e, 0xe6, 0x65,
+	0x67, 0x88, 0x3f, 0x13, 0x56, 0x24, 0x77, 0x1b, 0x7f, 0x29, 0x20, 0xfb, 0x6f, 0x70, 0x07, 0xf3,
-	0x37, 0xa3, 0xc5, 0xdc, 0x7f, 0xfe, 0xc1, 0xb9, 0x4e, 0x98, 0xbf, 0x2b, 0x60, 0x65, 0xc4, 0xff,
+	0xb2, 0x9b, 0xd1, 0x62, 0xee, 0x3f, 0xff, 0xe0, 0x5c, 0x27, 0xcc, 0xdf, 0x15, 0xb0, 0x32, 0xe2,
-	0xff, 0xfa, 0x3f, 0xa0, 0x3f, 0x38, 0xbf, 0xac, 0xcd, 0x5d, 0x5c, 0xd6, 0xe6, 0xfe, 0xbc, 0xac,
+	0xff, 0x7f, 0xfd, 0x1f, 0xd0, 0x1f, 0x9c, 0x5f, 0xd6, 0xe6, 0x2e, 0x2e, 0x6b, 0x73, 0x7f, 0x5e,
-	0xcd, 0x7d, 0x17, 0xd6, 0x94, 0xf3, 0xb0, 0xa6, 0x5c, 0x84, 0x35, 0xe5, 0xef, 0xb0, 0xa6, 0xfc,
+	0xd6, 0xe6, 0xbe, 0x0b, 0x6b, 0xca, 0x79, 0x58, 0x53, 0x2e, 0xc2, 0x9a, 0xf2, 0x77, 0x58, 0x53,
-	0xf0, 0x4f, 0x6d, 0xee, 0xab, 0x52, 0xcc, 0xf3, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x94, 0x36,
+	0x7e, 0xf8, 0xa7, 0x36, 0xf7, 0x55, 0x29, 0xe6, 0xf9, 0x37, 0x00, 0x00, 0xff, 0xff, 0xf9, 0x0c,
-	0x56, 0x74, 0x1a, 0x0f, 0x00, 0x00,
+	0xf3, 0xb4, 0x1c, 0x0f, 0x00, 0x00,
 }

pkg/apis/batch/v2alpha1/generated.proto

@@ -21,10 +21,10 @@ syntax = 'proto2';
 
 package k8s.io.kubernetes.pkg.apis.batch.v2alpha1;
 
+import "k8s.io/apimachinery/pkg/api/resource/generated.proto";
 import "k8s.io/apimachinery/pkg/apis/meta/v1/generated.proto";
 import "k8s.io/apimachinery/pkg/runtime/generated.proto";
 import "k8s.io/apimachinery/pkg/runtime/schema/generated.proto";
-import "k8s.io/apimachinery/pkg/api/resource/generated.proto";
 import "k8s.io/kubernetes/pkg/api/v1/generated.proto";
 import "k8s.io/kubernetes/pkg/util/intstr/generated.proto";
 

pkg/apis/batch/v2alpha1/types.generated.go

@@ -65,9 +65,9 @@ func init() {
 		panic(err)
 	}
 	if false { // reference the types, but skip this branch at build/run time
-		var v0 pkg1_v1.TypeMeta
+		var v0 pkg4_resource.Quantity
-		var v1 pkg2_types.UID
+		var v1 pkg1_v1.TypeMeta
-		var v2 pkg4_resource.Quantity
+		var v2 pkg2_types.UID
 		var v3 pkg3_v1.PodTemplateSpec
 		var v4 pkg5_intstr.IntOrString
 		var v5 time.Time

pkg/apis/certificates/v1beta1/generated.pb.go

@@ -1328,51 +1328,51 @@ var (
 )
 
 var fileDescriptorGenerated = []byte{
-	// 731 bytes of a gzipped FileDescriptorProto
+	// 728 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xac, 0x54, 0x4d, 0x4f, 0x13, 0x5b,
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xac, 0x54, 0x4d, 0x4f, 0x13, 0x41,
-	0x18, 0xee, 0xb4, 0xa5, 0x1f, 0xa7, 0x5c, 0xb8, 0x39, 0xb9, 0x21, 0xbd, 0x24, 0x4c, 0x49, 0x73,
+	0x18, 0xee, 0xb6, 0xa5, 0x1f, 0x53, 0x04, 0x33, 0x31, 0xa4, 0x92, 0xb0, 0x25, 0x8d, 0x1a, 0x30,
-	0xaf, 0x01, 0x83, 0x33, 0xb6, 0x31, 0x86, 0x9d, 0xc9, 0x60, 0x62, 0x50, 0x50, 0x73, 0xa0, 0x1b,
+	0xb8, 0x6b, 0x89, 0x31, 0xdc, 0x4c, 0x16, 0x13, 0x83, 0x82, 0x9a, 0x81, 0x5e, 0x8c, 0x07, 0xa7,
-	0xe3, 0xc2, 0xd3, 0xe9, 0xcb, 0x70, 0x28, 0xf3, 0xe1, 0x9c, 0x33, 0xc4, 0xee, 0xdc, 0xb9, 0xf5,
+	0xdb, 0x97, 0x65, 0x28, 0xfb, 0xe1, 0xce, 0x2c, 0xb1, 0x37, 0x6f, 0x5e, 0xfd, 0x03, 0xfe, 0x1f,
-	0x0f, 0xf8, 0x7f, 0x58, 0xb2, 0x74, 0xd5, 0x48, 0x5d, 0x19, 0x13, 0x7f, 0x00, 0x2b, 0x73, 0x4e,
+	0x8e, 0x1c, 0x3d, 0x35, 0x52, 0x4f, 0xc6, 0xc4, 0x1f, 0xc0, 0xc9, 0xcc, 0x74, 0xfa, 0x61, 0x4b,
-	0x4f, 0xdb, 0x91, 0x52, 0xc1, 0x84, 0x5d, 0xcf, 0xf3, 0x3e, 0xef, 0xf3, 0xbc, 0x5f, 0x53, 0xf4,
+	0x01, 0x13, 0x6e, 0x9d, 0xe7, 0x7d, 0xde, 0xe7, 0x79, 0xbf, 0xb6, 0xe8, 0x59, 0x6b, 0x83, 0x5b,
-	0xa8, 0xbb, 0xc9, 0x2d, 0x16, 0xda, 0xdd, 0xa4, 0x0d, 0x71, 0x00, 0x02, 0xb8, 0x1d, 0x75, 0x3d,
+	0x2c, 0xb4, 0x5b, 0x49, 0x03, 0xe2, 0x00, 0x04, 0x70, 0x3b, 0x6a, 0x79, 0x36, 0x8d, 0x18, 0xb7,
-	0x9b, 0x46, 0x8c, 0xdb, 0x2e, 0xc4, 0x82, 0x1d, 0x30, 0x97, 0x4a, 0xf4, 0xa4, 0xd1, 0x06, 0x41,
+	0x5d, 0x88, 0x05, 0xdb, 0x67, 0x2e, 0x95, 0xe8, 0x71, 0xad, 0x01, 0x82, 0xd6, 0x6c, 0x0f, 0x02,
-	0x1b, 0xb6, 0x07, 0x01, 0xc4, 0x54, 0x40, 0xc7, 0x8a, 0xe2, 0x50, 0x84, 0xd8, 0x1e, 0x0a, 0x58,
+	0x88, 0xa9, 0x80, 0xa6, 0x15, 0xc5, 0xa1, 0x08, 0xb1, 0xdd, 0x13, 0xb0, 0x86, 0x02, 0x56, 0xd4,
-	0x13, 0x01, 0x2b, 0xea, 0x7a, 0x96, 0x14, 0xb0, 0xd2, 0x02, 0x96, 0x16, 0x58, 0xbe, 0xe7, 0x31,
+	0xf2, 0x2c, 0x29, 0x60, 0x8d, 0x0a, 0x58, 0x5a, 0x60, 0xf1, 0x91, 0xc7, 0xc4, 0x41, 0xd2, 0xb0,
-	0x71, 0x98, 0xb4, 0x2d, 0x37, 0xf4, 0x6d, 0x2f, 0xf4, 0x42, 0x5b, 0xe9, 0xb4, 0x93, 0x03, 0xf5,
+	0xdc, 0xd0, 0xb7, 0xbd, 0xd0, 0x0b, 0x6d, 0xa5, 0xd3, 0x48, 0xf6, 0xd5, 0x4b, 0x3d, 0xd4, 0xaf,
-	0x52, 0x0f, 0xf5, 0x6b, 0xa8, 0xbf, 0xfc, 0x40, 0x17, 0x48, 0x23, 0xe6, 0x53, 0xf7, 0x90, 0x05,
+	0x9e, 0xfe, 0xe2, 0x13, 0x5d, 0x20, 0x8d, 0x98, 0x4f, 0xdd, 0x03, 0x16, 0x40, 0xdc, 0xee, 0x97,
-	0x10, 0xf7, 0x26, 0x25, 0xfa, 0x20, 0xa8, 0x7d, 0x32, 0x55, 0xd5, 0xb2, 0x3d, 0x2b, 0x2b, 0x4e,
+	0x68, 0xc7, 0xc0, 0xc3, 0x24, 0x76, 0x61, 0xbc, 0xaa, 0x4b, 0xb3, 0xb8, 0xed, 0x83, 0xa0, 0xf6,
-	0x02, 0xc1, 0x7c, 0x98, 0x4a, 0x78, 0x78, 0x5d, 0x02, 0x77, 0x0f, 0xc1, 0xa7, 0x53, 0x79, 0xcd,
+	0xf1, 0x44, 0x2f, 0x8b, 0xf6, 0xb4, 0xac, 0x38, 0x09, 0x04, 0xf3, 0x27, 0x6d, 0x9e, 0x5e, 0x95,
-	0x99, 0xf3, 0xb3, 0x63, 0xe0, 0x61, 0x12, 0xbb, 0xd3, 0x5e, 0x1b, 0xb3, 0x73, 0xae, 0x68, 0xa5,
+	0xc0, 0xdd, 0x03, 0xf0, 0xe9, 0x44, 0xde, 0xda, 0xd4, 0xa9, 0x5f, 0x54, 0x56, 0xed, 0x62, 0x76,
-	0x71, 0x35, 0x3b, 0x11, 0xec, 0xd8, 0x66, 0x81, 0xe0, 0x22, 0xbe, 0x9c, 0x52, 0xff, 0x96, 0x45,
+	0x22, 0xd8, 0x91, 0xcd, 0x02, 0xc1, 0x45, 0x3c, 0x9e, 0x52, 0xfd, 0x95, 0x46, 0x77, 0x37, 0x87,
-	0xff, 0x6e, 0x4d, 0x66, 0xbf, 0xc7, 0xbc, 0x80, 0x05, 0x1e, 0x81, 0xb7, 0x09, 0x70, 0x81, 0xdf,
+	0xd3, 0xdf, 0x65, 0x5e, 0xc0, 0x02, 0x8f, 0xc0, 0xc7, 0x04, 0xb8, 0xc0, 0x1f, 0x50, 0x41, 0x8e,
-	0xa0, 0x92, 0x1c, 0x5b, 0x87, 0x0a, 0x5a, 0x35, 0x56, 0x8d, 0xb5, 0x4a, 0xf3, 0xbe, 0xa5, 0x97,
+	0xa0, 0x49, 0x05, 0x2d, 0x1b, 0xcb, 0xc6, 0x4a, 0x69, 0xfd, 0xb1, 0xa5, 0xd7, 0x38, 0xda, 0xc9,
-	0x98, 0xee, 0x7e, 0xb2, 0x46, 0xc9, 0xb6, 0x4e, 0x1a, 0xd6, 0x8b, 0xf6, 0x11, 0xb8, 0x62, 0x17,
+	0x70, 0x91, 0x92, 0x6d, 0x1d, 0xd7, 0xac, 0x37, 0x8d, 0x43, 0x70, 0xc5, 0x0e, 0x08, 0xea, 0xe0,
-	0x04, 0x75, 0xf0, 0x69, 0xbf, 0x96, 0x19, 0xf4, 0x6b, 0x68, 0x82, 0x91, 0xb1, 0x2a, 0x8e, 0x50,
+	0x93, 0x4e, 0x25, 0xd5, 0xed, 0x54, 0xd0, 0x10, 0x23, 0x03, 0x55, 0x1c, 0xa1, 0x2c, 0x8f, 0xc0,
-	0x9e, 0x47, 0xe0, 0x56, 0xb3, 0x4a, 0xfd, 0xb9, 0xf5, 0x87, 0x27, 0x62, 0xcd, 0xac, 0x7d, 0x2f,
+	0x2d, 0xa7, 0x95, 0xfa, 0x6b, 0xeb, 0x3f, 0x8f, 0xc4, 0x9a, 0x5a, 0xfb, 0x6e, 0x04, 0xae, 0x33,
-	0x02, 0xd7, 0x99, 0xd7, 0xde, 0x79, 0xf9, 0x22, 0xca, 0x09, 0xbf, 0x43, 0x05, 0x2e, 0xa8, 0x48,
+	0xab, 0xbd, 0xb3, 0xf2, 0x45, 0x94, 0x13, 0xfe, 0x84, 0x72, 0x5c, 0x50, 0x91, 0xf0, 0x72, 0x46,
-	0x78, 0x35, 0xa7, 0x3c, 0x5f, 0xde, 0xa2, 0xa7, 0xd2, 0x75, 0x16, 0xb4, 0x6b, 0x61, 0xf8, 0x26,
+	0x79, 0xbe, 0xbd, 0x41, 0x4f, 0xa5, 0xeb, 0xcc, 0x69, 0xd7, 0x5c, 0xef, 0x4d, 0xb4, 0x5f, 0xf5,
-	0xda, 0xaf, 0xfe, 0x29, 0x8b, 0xea, 0x33, 0x73, 0xb7, 0xc2, 0xa0, 0xc3, 0x04, 0x0b, 0x03, 0xbc,
+	0x5b, 0x1a, 0x55, 0xa7, 0xe6, 0x6e, 0x86, 0x41, 0x93, 0x09, 0x16, 0x06, 0x78, 0x03, 0x65, 0x45,
-	0x89, 0xf2, 0xa2, 0x17, 0x81, 0x1a, 0x78, 0xd9, 0xf9, 0x6f, 0xd4, 0xc2, 0x7e, 0x2f, 0x82, 0x8b,
+	0x3b, 0x02, 0x35, 0xf0, 0xa2, 0x73, 0xaf, 0xdf, 0xc2, 0x5e, 0x3b, 0x82, 0xf3, 0x4e, 0xe5, 0xce,
-	0x7e, 0xed, 0x9f, 0xcb, 0x7c, 0x89, 0x13, 0x95, 0x81, 0xef, 0xa0, 0x42, 0x0c, 0x94, 0x87, 0x81,
+	0x38, 0x5f, 0xe2, 0x44, 0x65, 0xe0, 0x07, 0x28, 0x17, 0x03, 0xe5, 0x61, 0xa0, 0xc6, 0x59, 0x1c,
-	0x1a, 0x67, 0x79, 0x52, 0x08, 0x51, 0x28, 0xd1, 0x51, 0xbc, 0x8e, 0x8a, 0x3e, 0x70, 0x4e, 0x3d,
+	0x16, 0x42, 0x14, 0x4a, 0x74, 0x14, 0xaf, 0xa2, 0xbc, 0x0f, 0x9c, 0x53, 0x0f, 0xd4, 0x0c, 0x8a,
-	0x50, 0x33, 0x28, 0x3b, 0x8b, 0x9a, 0x58, 0xdc, 0x1d, 0xc2, 0x64, 0x14, 0xc7, 0x47, 0x68, 0xe1,
+	0xce, 0xbc, 0x26, 0xe6, 0x77, 0x7a, 0x30, 0xe9, 0xc7, 0xf1, 0x21, 0x9a, 0x3b, 0xa2, 0x5c, 0xd4,
-	0x98, 0x72, 0xd1, 0x8a, 0x3a, 0x54, 0xc0, 0x3e, 0xf3, 0xa1, 0x9a, 0x57, 0x53, 0xbb, 0x7b, 0xb3,
+	0xa3, 0x26, 0x15, 0xb0, 0xc7, 0x7c, 0x28, 0x67, 0xd5, 0xd4, 0x1e, 0x5e, 0xef, 0x0e, 0x64, 0x86,
-	0x3b, 0x90, 0x19, 0xce, 0x92, 0x56, 0x5f, 0xd8, 0xf9, 0x45, 0x89, 0x5c, 0x52, 0xae, 0xff, 0x30,
+	0xb3, 0xa0, 0xd5, 0xe7, 0xb6, 0xff, 0x51, 0x22, 0x63, 0xca, 0xd5, 0x3f, 0x06, 0x5a, 0x9a, 0x3a,
-	0xd0, 0xca, 0xcc, 0xf9, 0xec, 0x30, 0x2e, 0xf0, 0xeb, 0xa9, 0x7b, 0xb4, 0x6e, 0x56, 0x87, 0xcc,
+	0x9f, 0x6d, 0xc6, 0x05, 0x7e, 0x3f, 0x71, 0x8f, 0xd6, 0xf5, 0xea, 0x90, 0xd9, 0xea, 0x1a, 0x6f,
-	0x56, 0xd7, 0xf8, 0xb7, 0xae, 0xa5, 0x34, 0x42, 0x52, 0xb7, 0x18, 0xa2, 0x39, 0x26, 0xc0, 0xe7,
+	0xeb, 0x5a, 0x0a, 0x7d, 0x64, 0xe4, 0x16, 0x43, 0x34, 0xc3, 0x04, 0xf8, 0xbc, 0x9c, 0x5e, 0xce,
-	0xd5, 0xec, 0x6a, 0x6e, 0xad, 0xd2, 0x7c, 0x7a, 0x7b, 0x87, 0xe1, 0xfc, 0xa5, 0x6d, 0xe7, 0xb6,
+	0xac, 0x94, 0xd6, 0x5f, 0xde, 0xdc, 0x61, 0x38, 0xb7, 0xb4, 0xed, 0xcc, 0x96, 0x34, 0x20, 0x3d,
-	0xa5, 0x01, 0x19, 0xfa, 0xd4, 0xbf, 0xff, 0xae, 0x61, 0x79, 0xb2, 0xf8, 0x7f, 0x54, 0x8c, 0x87,
+	0x9f, 0xea, 0xef, 0xcb, 0x1a, 0x96, 0x27, 0x8b, 0xef, 0xa3, 0x7c, 0xdc, 0x7b, 0xaa, 0x7e, 0x67,
-	0x4f, 0xd5, 0xef, 0xbc, 0x53, 0x91, 0x5b, 0xd2, 0x0c, 0x32, 0x8a, 0xe1, 0x0d, 0x54, 0x4a, 0x38,
+	0x9d, 0x92, 0xdc, 0x92, 0x66, 0x90, 0x7e, 0x0c, 0xaf, 0xa1, 0x42, 0xc2, 0x21, 0x0e, 0xa8, 0x0f,
-	0xc4, 0x01, 0xf5, 0x41, 0xaf, 0x7e, 0xdc, 0x67, 0x4b, 0xe3, 0x64, 0xcc, 0xc0, 0x2b, 0x28, 0x97,
+	0x7a, 0xf5, 0x83, 0x3e, 0xeb, 0x1a, 0x27, 0x03, 0x06, 0x5e, 0x42, 0x99, 0x84, 0x35, 0xf5, 0xea,
-	0xb0, 0x8e, 0x5e, 0x7d, 0x45, 0x13, 0x73, 0xad, 0xed, 0xc7, 0x44, 0xe2, 0xb8, 0x8e, 0x0a, 0x5e,
+	0x4b, 0x9a, 0x98, 0xa9, 0x6f, 0x3d, 0x27, 0x12, 0xc7, 0x55, 0x94, 0xf3, 0xe2, 0x30, 0x89, 0x78,
-	0x1c, 0x26, 0x11, 0xaf, 0xe6, 0x57, 0x73, 0x6b, 0x65, 0x07, 0xc9, 0x0b, 0x7a, 0xa2, 0x10, 0xa2,
+	0x39, 0xbb, 0x9c, 0x59, 0x29, 0x3a, 0x48, 0x5e, 0xd0, 0x0b, 0x85, 0x10, 0x1d, 0xc1, 0xeb, 0xa8,
-	0x23, 0xb8, 0x89, 0x4a, 0x5d, 0xe8, 0xb5, 0xd4, 0x09, 0xcd, 0x29, 0xd6, 0x92, 0x64, 0x29, 0x80,
+	0xd0, 0x82, 0x76, 0x5d, 0x9d, 0xd0, 0x8c, 0x62, 0x2d, 0x48, 0x96, 0x02, 0xf8, 0x79, 0xa7, 0x52,
-	0x5f, 0xf4, 0x6b, 0xa5, 0x67, 0x3a, 0x4a, 0xc6, 0xbc, 0x7a, 0xdf, 0x40, 0xb5, 0x6b, 0x3e, 0x1d,
+	0x78, 0xa5, 0xa3, 0x64, 0xc0, 0xab, 0x76, 0x0c, 0x54, 0xb9, 0xe2, 0xd3, 0xc1, 0x5f, 0x0c, 0x84,
-	0xfc, 0xc1, 0x40, 0xc8, 0x1d, 0x5d, 0x36, 0xaf, 0x1a, 0x6a, 0x11, 0x7b, 0xb7, 0xb7, 0x88, 0xf1,
+	0xdc, 0xfe, 0x65, 0xf3, 0xb2, 0xa1, 0x16, 0xb1, 0x7b, 0x73, 0x8b, 0x18, 0x7c, 0x35, 0xc3, 0xbf,
-	0x57, 0x33, 0xf9, 0x5b, 0x1a, 0x43, 0x9c, 0xa4, 0xac, 0x71, 0x03, 0x55, 0x52, 0xd2, 0x6a, 0xaa,
+	0xa5, 0x01, 0xc4, 0xc9, 0x88, 0x35, 0xae, 0xa1, 0xd2, 0x88, 0xb4, 0x9a, 0xea, 0xac, 0x33, 0xdf,
-	0xf3, 0xce, 0xe2, 0xa0, 0x5f, 0xab, 0xa4, 0xc4, 0x49, 0x9a, 0xe3, 0xac, 0x9f, 0x9e, 0x9b, 0x99,
+	0xed, 0x54, 0x4a, 0x23, 0xe2, 0x64, 0x94, 0xe3, 0xac, 0x9e, 0x9c, 0x99, 0xa9, 0xd3, 0x33, 0x33,
-	0xb3, 0x73, 0x33, 0xf3, 0xf9, 0xdc, 0xcc, 0xbc, 0x1f, 0x98, 0xc6, 0xe9, 0xc0, 0x34, 0xce, 0x06,
+	0xf5, 0xfd, 0xcc, 0x4c, 0x7d, 0xee, 0x9a, 0xc6, 0x49, 0xd7, 0x34, 0x4e, 0xbb, 0xa6, 0xf1, 0xa3,
-	0xa6, 0xf1, 0x65, 0x60, 0x1a, 0x1f, 0xbf, 0x9a, 0x99, 0x57, 0x45, 0x5d, 0xe0, 0xcf, 0x00, 0x00,
+	0x6b, 0x1a, 0x5f, 0x7f, 0x9a, 0xa9, 0x77, 0x79, 0x5d, 0xe0, 0xdf, 0x00, 0x00, 0x00, 0xff, 0xff,
-	0x00, 0xff, 0xff, 0xa8, 0x84, 0xfa, 0xbc, 0x4c, 0x07, 0x00, 0x00,
+	0x09, 0x98, 0xa9, 0xa0, 0x4e, 0x07, 0x00, 0x00,
 }

pkg/apis/certificates/v1beta1/generated.proto

@@ -21,10 +21,10 @@ syntax = 'proto2';
 
 package k8s.io.kubernetes.pkg.apis.certificates.v1beta1;
 
+import "k8s.io/apimachinery/pkg/api/resource/generated.proto";
 import "k8s.io/apimachinery/pkg/apis/meta/v1/generated.proto";
 import "k8s.io/apimachinery/pkg/runtime/generated.proto";
 import "k8s.io/apimachinery/pkg/runtime/schema/generated.proto";
-import "k8s.io/apimachinery/pkg/api/resource/generated.proto";
 import "k8s.io/kubernetes/pkg/api/v1/generated.proto";
 import "k8s.io/kubernetes/pkg/util/intstr/generated.proto";
 

pkg/apis/extensions/BUILD

@@ -20,9 +20,9 @@ go_library(
     tags = ["automanaged"],
     deps = [
         "//pkg/api:go_default_library",
-        "//pkg/api/resource:go_default_library",
         "//pkg/apis/autoscaling:go_default_library",
         "//pkg/util/intstr:go_default_library",
+        "//vendor:k8s.io/apimachinery/pkg/api/resource",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/conversion",
         "//vendor:k8s.io/apimachinery/pkg/runtime",

pkg/apis/extensions/v1beta1/BUILD

@@ -26,7 +26,6 @@ go_library(
     tags = ["automanaged"],
     deps = [
         "//pkg/api:go_default_library",
-        "//pkg/api/resource:go_default_library",
         "//pkg/api/v1:go_default_library",
         "//pkg/apis/autoscaling:go_default_library",
         "//pkg/apis/extensions:go_default_library",
@@ -34,6 +33,7 @@ go_library(
         "//vendor:github.com/gogo/protobuf/proto",
         "//vendor:github.com/gogo/protobuf/sortkeys",
         "//vendor:github.com/ugorji/go/codec",
+        "//vendor:k8s.io/apimachinery/pkg/api/resource",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/conversion",
         "//vendor:k8s.io/apimachinery/pkg/runtime",
@@ -49,11 +49,11 @@ go_test(
     deps = [
         "//pkg/api:go_default_library",
         "//pkg/api/install:go_default_library",
-        "//pkg/api/resource:go_default_library",
         "//pkg/api/v1:go_default_library",
         "//pkg/apis/extensions/install:go_default_library",
         "//pkg/apis/extensions/v1beta1:go_default_library",
         "//pkg/util/intstr:go_default_library",
+        "//vendor:k8s.io/apimachinery/pkg/api/resource",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/runtime",
     ],

pkg/apis/extensions/v1beta1/generated.pb.go

@@ -3739,7 +3739,7 @@ func (this *CustomMetricCurrentStatus) String() string {
 	}
 	s := strings.Join([]string{`&CustomMetricCurrentStatus{`,
 		`Name:` + fmt.Sprintf("%v", this.Name) + `,`,
-		`CurrentValue:` + strings.Replace(strings.Replace(this.CurrentValue.String(), "Quantity", "k8s_io_kubernetes_pkg_api_resource.Quantity", 1), `&`, ``, 1) + `,`,
+		`CurrentValue:` + strings.Replace(strings.Replace(this.CurrentValue.String(), "Quantity", "k8s_io_apimachinery_pkg_api_resource.Quantity", 1), `&`, ``, 1) + `,`,
 		`}`,
 	}, "")
 	return s
@@ -3760,7 +3760,7 @@ func (this *CustomMetricTarget) String() string {
 	}
 	s := strings.Join([]string{`&CustomMetricTarget{`,
 		`Name:` + fmt.Sprintf("%v", this.Name) + `,`,
-		`TargetValue:` + strings.Replace(strings.Replace(this.TargetValue.String(), "Quantity", "k8s_io_kubernetes_pkg_api_resource.Quantity", 1), `&`, ``, 1) + `,`,
+		`TargetValue:` + strings.Replace(strings.Replace(this.TargetValue.String(), "Quantity", "k8s_io_apimachinery_pkg_api_resource.Quantity", 1), `&`, ``, 1) + `,`,
 		`}`,
 	}, "")
 	return s
@@ -12526,229 +12526,229 @@ var (
 )
 
 var fileDescriptorGenerated = []byte{
-	// 3580 bytes of a gzipped FileDescriptorProto
+	// 3581 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xe4, 0x5b, 0x4f, 0x6c, 0x1b, 0xc7,
 	0xd5, 0xf7, 0x92, 0xa2, 0x45, 0x3d, 0x59, 0x92, 0x35, 0x52, 0x64, 0x46, 0x49, 0x44, 0x67, 0x83,
 	0x2f, 0x71, 0x3e, 0x24, 0xd4, 0x67, 0xe7, 0x73, 0xbe, 0xc4, 0x49, 0x9c, 0x88, 0x92, 0x65, 0x2b,
-	0x9f, 0x64, 0x33, 0x43, 0xc9, 0x4d, 0xf3, 0xb7, 0x2b, 0x72, 0x44, 0xad, 0xb5, 0xff, 0xb2, 0x3b,
+	0x9f, 0x64, 0x33, 0x43, 0xc9, 0xc8, 0xff, 0x74, 0x45, 0x8e, 0xa8, 0xb5, 0xf6, 0x5f, 0x76, 0x67,
-	0xab, 0x88, 0x09, 0x8a, 0x04, 0x28, 0x7a, 0x6d, 0x73, 0x6a, 0x73, 0x48, 0x8f, 0x3d, 0xf4, 0x92,
+	0x15, 0x31, 0x41, 0x91, 0x00, 0x45, 0xaf, 0x45, 0x7a, 0x29, 0x52, 0x20, 0x3d, 0xf6, 0xd0, 0x4b,
-	0x36, 0x40, 0x8b, 0xb4, 0xc7, 0x1e, 0x8a, 0x1a, 0x68, 0x51, 0xa4, 0x40, 0x0b, 0xf4, 0x90, 0x2a,
+	0xda, 0x00, 0x2d, 0xd2, 0x1e, 0x7b, 0x28, 0x6a, 0xa0, 0x45, 0x91, 0x02, 0x2d, 0xd0, 0x43, 0xaa,
-	0xb5, 0x8a, 0x06, 0xbd, 0x17, 0xb9, 0xb8, 0x97, 0x62, 0x66, 0x67, 0xff, 0x72, 0x57, 0x16, 0x29,
+	0xd4, 0x2a, 0x1a, 0xf4, 0x5e, 0xe4, 0xe2, 0x5e, 0x8a, 0x99, 0x9d, 0xfd, 0xcb, 0x5d, 0x59, 0xa4,
-	0x99, 0x28, 0xd0, 0x1b, 0x77, 0xe6, 0xbd, 0xdf, 0xfb, 0x33, 0x33, 0x6f, 0xde, 0xcc, 0x3c, 0xc2,
+	0x64, 0xa2, 0x40, 0x6f, 0xe2, 0xcc, 0x7b, 0xbf, 0xf7, 0x67, 0x66, 0xdf, 0x7b, 0x33, 0xf3, 0x04,
-	0x73, 0x5b, 0x4f, 0x39, 0x15, 0xd5, 0x9c, 0xdd, 0x72, 0xd7, 0x89, 0x6d, 0x10, 0x4a, 0x9c, 0x59,
+	0xcf, 0x6d, 0x3d, 0xe5, 0x54, 0x54, 0x73, 0x76, 0xcb, 0x5d, 0x27, 0xb6, 0x41, 0x28, 0x71, 0x66,
-	0x6b, 0xab, 0x35, 0xab, 0x58, 0xaa, 0x33, 0x4b, 0x76, 0x28, 0x31, 0x1c, 0xd5, 0x34, 0x9c, 0xd9,
+	0xad, 0xad, 0xd6, 0xac, 0x62, 0xa9, 0xce, 0x2c, 0xd9, 0xa1, 0xc4, 0x70, 0x54, 0xd3, 0x70, 0x66,
-	0xed, 0xb3, 0xeb, 0x84, 0x2a, 0x67, 0x67, 0x5b, 0xc4, 0x20, 0xb6, 0x42, 0x49, 0xb3, 0x62, 0xd9,
+	0xb7, 0xcf, 0xae, 0x13, 0xaa, 0x9c, 0x9d, 0x6d, 0x11, 0x83, 0xd8, 0x0a, 0x25, 0xcd, 0x8a, 0x65,
-	0x26, 0x35, 0xd1, 0xe3, 0x1e, 0x7b, 0x25, 0x64, 0xaf, 0x58, 0x5b, 0xad, 0x0a, 0x63, 0xaf, 0x84,
+	0x9b, 0xd4, 0x44, 0x8f, 0x7b, 0xec, 0x95, 0x90, 0xbd, 0x62, 0x6d, 0xb5, 0x2a, 0x8c, 0xbd, 0x12,
-	0xec, 0x15, 0xc1, 0x3e, 0xfd, 0x78, 0x4b, 0xa5, 0x9b, 0xee, 0x7a, 0xa5, 0x61, 0xea, 0xb3, 0x2d,
+	0xb2, 0x57, 0x04, 0xfb, 0xf4, 0xe3, 0x2d, 0x95, 0x6e, 0xba, 0xeb, 0x95, 0x86, 0xa9, 0xcf, 0xb6,
-	0xb3, 0x65, 0xce, 0x72, 0x94, 0x75, 0x77, 0x83, 0x7f, 0xf1, 0x0f, 0xfe, 0xcb, 0x43, 0x9f, 0xfe,
+	0xcc, 0x96, 0x39, 0xcb, 0x51, 0xd6, 0xdd, 0x0d, 0xfe, 0x8b, 0xff, 0xe0, 0x7f, 0x79, 0xe8, 0xd3,
-	0x5f, 0xa1, 0x9c, 0x62, 0xa9, 0xba, 0xd2, 0xd8, 0x54, 0x0d, 0x62, 0xb7, 0x43, 0xf5, 0x74, 0x42,
+	0xff, 0x2b, 0x94, 0x53, 0x2c, 0x55, 0x57, 0x1a, 0x9b, 0xaa, 0x41, 0xec, 0xb6, 0xaf, 0xde, 0xac,
-	0x95, 0xd9, 0xed, 0x0e, 0x9d, 0xa6, 0x67, 0xb3, 0xb8, 0x6c, 0xd7, 0xa0, 0xaa, 0x4e, 0x3a, 0x18,
+	0x4d, 0x1c, 0xd3, 0xb5, 0x1b, 0x24, 0xa9, 0xd3, 0xbe, 0x5c, 0xce, 0xac, 0x4e, 0xa8, 0x32, 0xbb,
-	0x9e, 0xbc, 0x13, 0x83, 0xd3, 0xd8, 0x24, 0xba, 0xd2, 0xc1, 0x77, 0x2e, 0xd3, 0x77, 0xb3, 0x36,
+	0xdd, 0x61, 0xc9, 0xf4, 0x6c, 0x16, 0x97, 0xed, 0x1a, 0x54, 0xd5, 0x3b, 0xc5, 0x3c, 0x79, 0x27,
-	0x71, 0x4c, 0xd7, 0x6e, 0x74, 0xca, 0x7a, 0x2c, 0x9b, 0x27, 0xc5, 0x94, 0xb3, 0xe9, 0xd4, 0x2e,
+	0x06, 0xa7, 0xb1, 0x49, 0x74, 0xa5, 0x83, 0xef, 0xb1, 0x4c, 0x8f, 0xa7, 0xa9, 0x75, 0x36, 0x9d,
-	0x55, 0xb5, 0x59, 0xd5, 0xa0, 0x0e, 0xb5, 0x93, 0x2c, 0x72, 0x05, 0x60, 0xae, 0xb6, 0x74, 0x9d,
+	0xda, 0xa5, 0xaa, 0x36, 0xab, 0x1a, 0xd4, 0xa1, 0x76, 0x92, 0x45, 0xae, 0x00, 0xcc, 0xd5, 0x96,
-	0xd8, 0xcc, 0xf3, 0xe8, 0x34, 0x0c, 0x18, 0x8a, 0x4e, 0x4a, 0xd2, 0x69, 0xe9, 0xcc, 0x50, 0xf5,
+	0xae, 0x13, 0x9b, 0xf9, 0x1e, 0x9d, 0x86, 0x01, 0x43, 0xd1, 0x49, 0x49, 0x3a, 0x2d, 0x9d, 0x19,
-	0xc4, 0xcd, 0xdd, 0xf2, 0xb1, 0xbd, 0xdd, 0xf2, 0xc0, 0x55, 0x45, 0x27, 0x98, 0xf7, 0xc8, 0xaf,
+	0xaa, 0x9e, 0xb8, 0xb9, 0x5b, 0x3e, 0xb6, 0xb7, 0x5b, 0x1e, 0xb8, 0xaa, 0xe8, 0x04, 0xf3, 0x19,
-	0xc1, 0xe4, 0x7c, 0x6d, 0x6d, 0x55, 0xb1, 0x5b, 0x84, 0xae, 0x51, 0x55, 0x53, 0xdf, 0x51, 0x28,
+	0xf9, 0x75, 0x98, 0x9c, 0xaf, 0xad, 0xad, 0x2a, 0x76, 0x8b, 0xd0, 0x35, 0xaa, 0x6a, 0xea, 0xbb,
-	0xe3, 0x5c, 0x80, 0x93, 0x94, 0x37, 0xd6, 0x88, 0xdd, 0x20, 0x06, 0x55, 0x5a, 0x1e, 0x4a, 0xa1,
+	0x0a, 0x65, 0x9c, 0x0b, 0x70, 0x92, 0xf2, 0xc1, 0x1a, 0xb1, 0x1b, 0xc4, 0xa0, 0x4a, 0xcb, 0x43,
-	0x5a, 0x12, 0x28, 0x27, 0x57, 0x13, 0xfd, 0xb8, 0x83, 0x43, 0xfe, 0xbe, 0x04, 0xf7, 0xce, 0xbb,
+	0x29, 0x54, 0x4b, 0x02, 0xe5, 0xe4, 0x6a, 0x62, 0x1e, 0x77, 0x70, 0xc8, 0xdf, 0x97, 0xe0, 0xde,
-	0x0e, 0x35, 0xf5, 0x15, 0x42, 0x6d, 0xb5, 0x31, 0xef, 0xda, 0x36, 0x31, 0x68, 0x9d, 0x2a, 0xd4,
+	0x79, 0xd7, 0xa1, 0xa6, 0xbe, 0x42, 0xa8, 0xad, 0x36, 0xe6, 0x5d, 0xdb, 0x26, 0x06, 0xad, 0x53,
-	0x75, 0xee, 0xac, 0x1d, 0x7a, 0x19, 0x0a, 0xdb, 0x8a, 0xe6, 0x92, 0x52, 0xee, 0xb4, 0x74, 0x66,
+	0x85, 0xba, 0xce, 0x9d, 0xb5, 0x43, 0xaf, 0x42, 0x61, 0x5b, 0xd1, 0x5c, 0x52, 0xca, 0x9d, 0x96,
-	0xf8, 0xdc, 0x63, 0x95, 0xcc, 0xf9, 0x56, 0xf1, 0x5d, 0x5e, 0x79, 0xc9, 0x55, 0x0c, 0xaa, 0xd2,
+	0xce, 0x0c, 0x9f, 0xab, 0x54, 0xc4, 0x8e, 0x8b, 0xba, 0xdd, 0xdf, 0x73, 0x15, 0x7f, 0x4f, 0x54,
-	0x76, 0x75, 0x52, 0x00, 0x9e, 0x10, 0x52, 0xaf, 0x33, 0x24, 0xec, 0x01, 0xca, 0xdf, 0x91, 0xe0,
+	0x5e, 0x72, 0x15, 0x83, 0xaa, 0xb4, 0x5d, 0x9d, 0x14, 0x90, 0x27, 0x84, 0xdc, 0xeb, 0x0c, 0x0b,
-	0x81, 0x4c, 0xcd, 0x96, 0x55, 0x87, 0x22, 0x1d, 0x0a, 0x2a, 0x25, 0xba, 0x53, 0x92, 0x4e, 0xe7,
+	0x7b, 0x90, 0xf2, 0x77, 0x24, 0x78, 0x20, 0x53, 0xb7, 0x65, 0xd5, 0xa1, 0x48, 0x87, 0x82, 0x4a,
-	0xcf, 0x0c, 0x9f, 0xbb, 0x52, 0xe9, 0x6a, 0xae, 0x57, 0x32, 0xc1, 0xab, 0x23, 0x42, 0xaf, 0xc2,
+	0x89, 0xee, 0x94, 0xa4, 0xd3, 0xf9, 0x33, 0xc3, 0xe7, 0xae, 0x54, 0xba, 0xda, 0xef, 0x95, 0x4c,
-	0x12, 0x83, 0xc7, 0x9e, 0x14, 0xf9, 0xbb, 0x12, 0xa0, 0x28, 0x8f, 0xe7, 0xdd, 0x03, 0xf8, 0xe8,
+	0xf0, 0xea, 0x88, 0xd0, 0xab, 0xb0, 0xc4, 0xe0, 0xb1, 0x27, 0x45, 0xfe, 0xae, 0x04, 0x28, 0xca,
-	0x6b, 0x87, 0xf1, 0xd1, 0x84, 0x00, 0x1c, 0xf6, 0xc4, 0xc5, 0x5c, 0xf4, 0xbe, 0x04, 0x53, 0x9d,
+	0xe3, 0xf9, 0xf7, 0x00, 0x5e, 0x7a, 0xe5, 0x70, 0x5e, 0x9a, 0x10, 0x90, 0xc3, 0x9e, 0xc0, 0x98,
-	0x1a, 0x71, 0xdf, 0x6c, 0xc4, 0x7d, 0x33, 0x77, 0x08, 0xdf, 0x78, 0xa8, 0x19, 0x4e, 0xf9, 0x59,
+	0x93, 0x3e, 0x90, 0x60, 0xaa, 0x53, 0x27, 0xee, 0x9d, 0x8d, 0xb8, 0x77, 0xe6, 0x0e, 0xe1, 0x1d,
-	0x0e, 0x86, 0x16, 0x14, 0xa2, 0x9b, 0x46, 0x9d, 0x50, 0xf4, 0x0d, 0x28, 0xb2, 0x45, 0xdf, 0x54,
+	0x0f, 0x35, 0xc3, 0x2d, 0x3f, 0xcb, 0xc1, 0xd0, 0x82, 0x42, 0x74, 0xd3, 0xa8, 0x13, 0x8a, 0xbe,
-	0xa8, 0xc2, 0xfd, 0x31, 0x7c, 0xee, 0x7f, 0x7c, 0xc1, 0xd1, 0xb5, 0x1b, 0x8a, 0x66, 0xd4, 0x95,
+	0x01, 0x45, 0xf6, 0x11, 0x37, 0x15, 0xaa, 0x70, 0x8f, 0x0c, 0x9f, 0xfb, 0x9f, 0xfd, 0xcc, 0x75,
-	0xed, 0xb3, 0x95, 0x6b, 0xeb, 0x37, 0x48, 0x83, 0xae, 0x10, 0xaa, 0x54, 0x91, 0x90, 0x03, 0x61,
+	0x2a, 0x8c, 0xba, 0xb2, 0x7d, 0xb6, 0x72, 0x6d, 0xfd, 0x06, 0x69, 0xd0, 0x15, 0x42, 0x95, 0x2a,
-	0x1b, 0x0e, 0x50, 0xd1, 0x1b, 0x30, 0xe0, 0x58, 0xa4, 0x21, 0x5c, 0xf9, 0x6c, 0x97, 0x66, 0x05,
+	0x12, 0x72, 0x20, 0x1c, 0xc3, 0x01, 0x2a, 0x7a, 0x13, 0x06, 0x1c, 0x8b, 0x34, 0x84, 0x33, 0x9f,
-	0x9a, 0xd6, 0x2d, 0xd2, 0x08, 0xc7, 0x8a, 0x7d, 0x61, 0x8e, 0x8b, 0x36, 0xe0, 0xb8, 0xc3, 0x27,
+	0xed, 0xd2, 0xac, 0x40, 0xd3, 0xba, 0x45, 0x1a, 0xe1, 0x6a, 0xb1, 0x5f, 0x98, 0xe3, 0xa2, 0x0d,
-	0x41, 0x29, 0xcf, 0x25, 0x5c, 0xec, 0x59, 0x82, 0x37, 0x95, 0x46, 0x85, 0x8c, 0xe3, 0xde, 0x37,
+	0x38, 0xee, 0xf0, 0x6d, 0x50, 0xca, 0x73, 0x09, 0x17, 0x7b, 0x96, 0xe0, 0x6d, 0xa6, 0x51, 0x21,
-	0x16, 0xe8, 0xf2, 0x6f, 0x25, 0x18, 0x09, 0x68, 0xf9, 0x88, 0xbd, 0xd6, 0xe1, 0xbb, 0xca, 0xc1,
+	0xe3, 0xb8, 0xf7, 0x1b, 0x0b, 0x74, 0xf9, 0xb7, 0x12, 0x8c, 0x04, 0xb4, 0x7c, 0xc5, 0x5e, 0xef,
-	0x7c, 0xc7, 0xb8, 0xb9, 0xe7, 0x4e, 0x0a, 0x59, 0x45, 0xbf, 0x25, 0xe2, 0xb7, 0xd7, 0xfd, 0xf9,
+	0xf0, 0x5d, 0xe5, 0x60, 0xbe, 0x63, 0xdc, 0xdc, 0x73, 0x27, 0x85, 0xac, 0xa2, 0x3f, 0x12, 0xf1,
-	0x90, 0xe3, 0xf3, 0xe1, 0xa9, 0x5e, 0xcd, 0xca, 0x98, 0x06, 0xbf, 0x89, 0x9a, 0xc3, 0xdc, 0x89,
+	0xdb, 0x1b, 0xfe, 0x7e, 0xc8, 0xf1, 0xfd, 0xf0, 0x54, 0xaf, 0x66, 0x65, 0x6c, 0x83, 0xdf, 0x44,
-	0x5e, 0x87, 0xa2, 0x43, 0x34, 0xd2, 0xa0, 0xa6, 0x2d, 0xcc, 0x79, 0xe2, 0x80, 0xe6, 0x28, 0xeb,
+	0xcd, 0x61, 0xee, 0x44, 0x6f, 0x40, 0xd1, 0x21, 0x1a, 0x69, 0x50, 0xd3, 0x16, 0xe6, 0x3c, 0x71,
-	0x44, 0xab, 0x0b, 0xd6, 0xea, 0x09, 0x66, 0x8f, 0xff, 0x85, 0x03, 0x48, 0xf4, 0x2a, 0x14, 0x29,
+	0x40, 0x73, 0x94, 0x75, 0xa2, 0xd5, 0x05, 0x6b, 0xf5, 0x04, 0xb3, 0xc7, 0xff, 0x85, 0x03, 0x48,
-	0xd1, 0x2d, 0x4d, 0xa1, 0xfe, 0xb2, 0x7a, 0x7c, 0x9f, 0x65, 0xb5, 0x7d, 0xb6, 0x52, 0x33, 0x9b,
+	0xf4, 0x1a, 0x14, 0x29, 0xd1, 0x2d, 0x4d, 0xa1, 0xfe, 0x87, 0xf5, 0x78, 0xb6, 0x49, 0x0c, 0xb6,
-	0xab, 0x82, 0x81, 0x0f, 0x7e, 0xe0, 0x2c, 0xbf, 0x15, 0x07, 0x80, 0xf2, 0x07, 0x79, 0x18, 0x4b,
+	0x66, 0x36, 0x57, 0x05, 0x03, 0x5f, 0xfc, 0xc0, 0x59, 0xfe, 0x28, 0x0e, 0x00, 0xe5, 0x0f, 0xf3,
-	0x0c, 0x24, 0xba, 0x0e, 0x53, 0x0d, 0x2f, 0x48, 0x5c, 0x75, 0xf5, 0x75, 0x62, 0xd7, 0x1b, 0x9b,
+	0x30, 0x96, 0x58, 0x48, 0x74, 0x1d, 0xa6, 0x1a, 0x5e, 0x98, 0xb8, 0xea, 0xea, 0xeb, 0xc4, 0xae,
-	0xa4, 0xe9, 0x6a, 0xa4, 0x29, 0x82, 0xee, 0x8c, 0xc0, 0x9b, 0x9a, 0x4f, 0xa5, 0xc2, 0x19, 0xdc,
+	0x37, 0x36, 0x49, 0xd3, 0xd5, 0x48, 0x53, 0x04, 0xde, 0x19, 0x81, 0x37, 0x35, 0x9f, 0x4a, 0x85,
-	0xe8, 0x45, 0x40, 0x06, 0x6f, 0x5a, 0x51, 0x1d, 0x27, 0xc0, 0xcc, 0x71, 0xcc, 0x69, 0x81, 0x89,
+	0x33, 0xb8, 0xd1, 0x8b, 0x80, 0x0c, 0x3e, 0xb4, 0xa2, 0x3a, 0x4e, 0x80, 0x99, 0xe3, 0x98, 0xd3,
-	0xae, 0x76, 0x50, 0xe0, 0x14, 0x2e, 0xa6, 0x63, 0x93, 0x38, 0xaa, 0x4d, 0x9a, 0x49, 0x1d, 0xf3,
+	0x02, 0x13, 0x5d, 0xed, 0xa0, 0xc0, 0x29, 0x5c, 0x4c, 0xc7, 0x26, 0x71, 0x54, 0x9b, 0x34, 0x93,
-	0x71, 0x1d, 0x17, 0x52, 0xa9, 0x70, 0x06, 0x37, 0x3a, 0x0f, 0xc3, 0x9e, 0x34, 0x4c, 0x94, 0x66,
+	0x3a, 0xe6, 0xe3, 0x3a, 0x2e, 0xa4, 0x52, 0xe1, 0x0c, 0x6e, 0x74, 0x1e, 0x86, 0x3d, 0x69, 0x98,
-	0xbb, 0x34, 0xc0, 0xc1, 0x82, 0xc0, 0x74, 0x35, 0xec, 0xc2, 0x51, 0x3a, 0x66, 0x9a, 0xb9, 0xee,
+	0x28, 0xcd, 0x76, 0x69, 0x80, 0x83, 0x05, 0x81, 0xe9, 0x6a, 0x38, 0x85, 0xa3, 0x74, 0xcc, 0x34,
-	0x10, 0x7b, 0x9b, 0x34, 0x2f, 0x7b, 0x9b, 0xa0, 0x6a, 0x1a, 0xa5, 0xc2, 0x69, 0xe9, 0x4c, 0x3e,
+	0x73, 0xdd, 0x21, 0xf6, 0x36, 0x69, 0x5e, 0xf6, 0x12, 0xa1, 0x6a, 0x1a, 0xa5, 0xc2, 0x69, 0xe9,
-	0x34, 0xed, 0x5a, 0x07, 0x05, 0x4e, 0xe1, 0x92, 0x7f, 0x9e, 0x03, 0x58, 0x20, 0x96, 0x66, 0xb6,
+	0x4c, 0x3e, 0x34, 0xed, 0x5a, 0x07, 0x05, 0x4e, 0xe1, 0x92, 0x7f, 0x9e, 0x03, 0x58, 0x20, 0x96,
-	0x75, 0x62, 0xf4, 0x23, 0xd0, 0xbc, 0x19, 0x0b, 0x34, 0xcf, 0x75, 0xbb, 0x5e, 0x02, 0x55, 0x33,
+	0x66, 0xb6, 0x75, 0x62, 0xf4, 0x23, 0xd0, 0xbc, 0x15, 0x0b, 0x34, 0xcf, 0x75, 0xfb, 0xbd, 0x04,
-	0x23, 0x4d, 0x2b, 0x11, 0x69, 0x9e, 0xef, 0x5d, 0xc4, 0xfe, 0xa1, 0xe6, 0x56, 0x1e, 0x26, 0x42,
+	0xaa, 0x66, 0x46, 0x9a, 0x56, 0x22, 0xd2, 0x3c, 0xdf, 0xbb, 0x88, 0xfd, 0x43, 0xcd, 0xad, 0x3c,
-	0xe2, 0x79, 0xd3, 0x68, 0xaa, 0x3c, 0x81, 0x78, 0x06, 0x06, 0x68, 0xdb, 0xf2, 0x37, 0xae, 0x47,
+	0x4c, 0x84, 0xc4, 0xf3, 0xa6, 0xd1, 0x54, 0x79, 0x11, 0xf1, 0x0c, 0x0c, 0xd0, 0xb6, 0xe5, 0xa7,
-	0x7c, 0x15, 0x57, 0xdb, 0x16, 0xb9, 0xbd, 0x5b, 0x3e, 0x95, 0xc2, 0xc2, 0xba, 0x30, 0x67, 0x42,
+	0xae, 0x47, 0x7c, 0x15, 0x57, 0xdb, 0x16, 0xb9, 0xbd, 0x5b, 0x3e, 0x95, 0xc2, 0xc2, 0xa6, 0x30,
-	0xd7, 0x03, 0xed, 0x73, 0x9c, 0xfd, 0x62, 0x5c, 0xf8, 0xed, 0xdd, 0xf2, 0xbe, 0x89, 0x54, 0x25,
+	0x67, 0x42, 0xd7, 0x03, 0xed, 0x73, 0x9c, 0xfd, 0x62, 0x5c, 0xf8, 0xed, 0xdd, 0xf2, 0xbe, 0xc5,
-	0xc0, 0x8c, 0x2b, 0x8b, 0x1e, 0x86, 0xe3, 0x36, 0x51, 0x1c, 0xd3, 0xe0, 0xb3, 0x6c, 0x28, 0x34,
+	0x54, 0x25, 0xc0, 0x8c, 0x2b, 0x8b, 0x1e, 0x86, 0xe3, 0x36, 0x51, 0x1c, 0xd3, 0xe0, 0xbb, 0x6c,
-	0x0a, 0xf3, 0x56, 0x2c, 0x7a, 0xd1, 0xa3, 0x30, 0xa8, 0x13, 0xc7, 0x61, 0x49, 0x4f, 0x81, 0x13,
+	0x28, 0x34, 0x0a, 0xf3, 0x51, 0x2c, 0x66, 0xd1, 0xa3, 0x30, 0xa8, 0x13, 0xc7, 0x61, 0x85, 0x4f,
-	0x8e, 0x09, 0xc2, 0xc1, 0x15, 0xaf, 0x19, 0xfb, 0xfd, 0xe8, 0x06, 0x8c, 0x6a, 0x8a, 0x43, 0xd7,
+	0x81, 0x13, 0x8e, 0x09, 0xc2, 0xc1, 0x15, 0x6f, 0x18, 0xfb, 0xf3, 0xe8, 0x06, 0x8c, 0x6a, 0x8a,
-	0xac, 0xa6, 0x42, 0xc9, 0xaa, 0xaa, 0x93, 0xd2, 0x71, 0xee, 0xf0, 0xff, 0x3e, 0xd8, 0x8c, 0x61,
+	0x43, 0xd7, 0xac, 0xa6, 0x42, 0xc9, 0xaa, 0xaa, 0x93, 0xd2, 0x71, 0xee, 0xf0, 0xff, 0x3e, 0xd8,
-	0x1c, 0xd5, 0x29, 0x81, 0x3e, 0xba, 0x1c, 0x43, 0xc2, 0x09, 0x64, 0xb4, 0x0d, 0x88, 0xb5, 0xac,
+	0x8e, 0x61, 0x1c, 0xd5, 0x29, 0x81, 0x3e, 0xba, 0x1c, 0x43, 0xc2, 0x09, 0x64, 0xb4, 0x0d, 0x88,
-	0xda, 0x8a, 0xe1, 0x78, 0x2e, 0x63, 0xf2, 0x06, 0xbb, 0x96, 0x17, 0x2c, 0x8f, 0xe5, 0x0e, 0x34,
+	0x8d, 0xac, 0xda, 0x8a, 0xe1, 0x78, 0x2e, 0x63, 0xf2, 0x06, 0xbb, 0x96, 0x17, 0x7c, 0x1e, 0xcb,
-	0x9c, 0x22, 0x41, 0xfe, 0x9d, 0x04, 0xa3, 0xe1, 0x80, 0xf5, 0x61, 0x3f, 0x79, 0x23, 0xbe, 0x9f,
+	0x1d, 0x68, 0x38, 0x45, 0x82, 0xfc, 0x3b, 0x09, 0x46, 0xc3, 0x05, 0xeb, 0x43, 0x3e, 0x79, 0x33,
-	0x3c, 0xdd, 0xf3, 0xe4, 0xcd, 0xd8, 0x50, 0x3e, 0xcc, 0x03, 0x0a, 0x89, 0xb0, 0xa9, 0x69, 0xeb,
+	0x9e, 0x4f, 0x9e, 0xee, 0x79, 0xf3, 0x66, 0x24, 0x94, 0x8f, 0xf2, 0x80, 0x42, 0x22, 0x6c, 0x6a,
-	0x4a, 0x63, 0xeb, 0x00, 0xc9, 0xd6, 0x0f, 0x25, 0x40, 0x2e, 0x1f, 0x90, 0xe6, 0x9c, 0x61, 0x98,
+	0xda, 0xba, 0xd2, 0xd8, 0x3a, 0x40, 0xb9, 0xf5, 0x43, 0x09, 0x90, 0xcb, 0x17, 0xa4, 0x39, 0x67,
-	0x94, 0x87, 0x0f, 0x5f, 0xcd, 0xaf, 0xf7, 0xac, 0xa6, 0xaf, 0x41, 0x65, 0xad, 0x03, 0xfb, 0x92,
+	0x18, 0x26, 0xe5, 0xe1, 0xc3, 0x57, 0xf3, 0x95, 0x9e, 0xd5, 0xf4, 0x35, 0xa8, 0xac, 0x75, 0x60,
-	0x41, 0xed, 0x76, 0x38, 0x62, 0x9d, 0x04, 0x38, 0x45, 0x21, 0xf4, 0x16, 0x80, 0x2d, 0x30, 0x57,
+	0x5f, 0x32, 0xa8, 0xdd, 0x0e, 0x57, 0xac, 0x93, 0x00, 0xa7, 0x28, 0x84, 0xde, 0x06, 0xb0, 0x05,
-	0x4d, 0x11, 0x02, 0xba, 0x8d, 0x32, 0xbe, 0x52, 0xf3, 0xa6, 0xb1, 0xa1, 0xb6, 0xc2, 0x80, 0x86,
+	0xe6, 0xaa, 0x29, 0x42, 0x40, 0xb7, 0x51, 0xc6, 0x57, 0x6a, 0xde, 0x34, 0x36, 0xd4, 0x56, 0x18,
-	0x03, 0x60, 0x1c, 0x11, 0x32, 0x7d, 0x09, 0x4e, 0x65, 0x68, 0x8f, 0x4e, 0x42, 0x7e, 0x8b, 0xb4,
+	0xd0, 0x70, 0x00, 0x8c, 0x23, 0x42, 0xa6, 0x2f, 0xc1, 0xa9, 0x0c, 0xed, 0xd1, 0x49, 0xc8, 0x6f,
-	0x3d, 0xb7, 0x62, 0xf6, 0x13, 0x4d, 0x46, 0x93, 0xd6, 0x21, 0x91, 0x71, 0x5e, 0xc8, 0x3d, 0x25,
+	0x91, 0xb6, 0xe7, 0x56, 0xcc, 0xfe, 0x44, 0x93, 0xd1, 0xb2, 0x75, 0x48, 0x54, 0x9c, 0x17, 0x72,
-	0xc9, 0x5f, 0x16, 0xa2, 0x73, 0x8d, 0x6f, 0xf6, 0x67, 0xa0, 0x68, 0x13, 0x4b, 0x53, 0x1b, 0x8a,
+	0x4f, 0x49, 0xf2, 0x57, 0x85, 0xe8, 0x5e, 0xe3, 0xc9, 0xfe, 0x0c, 0x14, 0x6d, 0x62, 0x69, 0x6a,
-	0x23, 0xb6, 0x43, 0xbe, 0x6f, 0x63, 0xd1, 0x86, 0x83, 0xde, 0x58, 0x5a, 0x90, 0xbb, 0xbb, 0x69,
+	0x43, 0x71, 0x44, 0x3a, 0xe4, 0x79, 0x1b, 0x8b, 0x31, 0x1c, 0xcc, 0xc6, 0xca, 0x82, 0xdc, 0xdd,
-	0x41, 0xfe, 0x88, 0xd3, 0x02, 0x64, 0x42, 0xd1, 0xa1, 0xec, 0x28, 0xd7, 0xf2, 0xf6, 0xc0, 0xee,
+	0x2d, 0x0b, 0xf2, 0x47, 0x5c, 0x16, 0x20, 0x13, 0x8a, 0x0e, 0x65, 0xc7, 0xb9, 0x96, 0x97, 0x03,
-	0xd3, 0xea, 0x68, 0xcc, 0xf6, 0x80, 0x42, 0x81, 0x7e, 0x0b, 0x0e, 0x84, 0xa0, 0x39, 0x18, 0xd3,
+	0xbb, 0x2f, 0xab, 0xa3, 0x31, 0xdb, 0x03, 0x0a, 0x05, 0xfa, 0x23, 0x38, 0x10, 0x82, 0xe6, 0x60,
-	0x55, 0x83, 0x6f, 0xa6, 0x75, 0xd2, 0x30, 0x8d, 0xa6, 0xc3, 0x83, 0x5d, 0xa1, 0x7a, 0x4a, 0x30,
+	0x4c, 0x57, 0x0d, 0x9e, 0x4c, 0xeb, 0xa4, 0x61, 0x1a, 0x4d, 0x87, 0x07, 0xbb, 0x42, 0xf5, 0x94,
-	0x8d, 0xad, 0xc4, 0xbb, 0x71, 0x92, 0x1e, 0x2d, 0xc3, 0xa4, 0x4d, 0xb6, 0x55, 0xa6, 0xc6, 0x15,
+	0x60, 0x1a, 0x5b, 0x89, 0x4f, 0xe3, 0x24, 0x3d, 0x5a, 0x86, 0x49, 0x9b, 0x6c, 0xab, 0x4c, 0x8d,
-	0xd5, 0xa1, 0xa6, 0xdd, 0x5e, 0x56, 0x75, 0x95, 0xf2, 0x10, 0x58, 0xa8, 0x96, 0xf6, 0x76, 0xcb,
+	0x2b, 0xaa, 0x43, 0x4d, 0xbb, 0xbd, 0xac, 0xea, 0x2a, 0xe5, 0x21, 0xb0, 0x50, 0x2d, 0xed, 0xed,
-	0x93, 0x38, 0xa5, 0x1f, 0xa7, 0x72, 0xb1, 0xe8, 0x6c, 0x29, 0xae, 0x43, 0x9a, 0x3c, 0xa4, 0x15,
+	0x96, 0x27, 0x71, 0xca, 0x3c, 0x4e, 0xe5, 0x62, 0xd1, 0xd9, 0x52, 0x5c, 0x87, 0x34, 0x79, 0x48,
-	0xc3, 0xe8, 0x5c, 0xe3, 0xad, 0x58, 0xf4, 0x22, 0x3d, 0x36, 0xb9, 0x8b, 0x47, 0x31, 0xb9, 0x47,
+	0x2b, 0x86, 0xd1, 0xb9, 0xc6, 0x47, 0xb1, 0x98, 0x45, 0x7a, 0x6c, 0x73, 0x17, 0x8f, 0x62, 0x73,
-	0xb3, 0x27, 0x36, 0x5a, 0x83, 0x53, 0x96, 0x6d, 0xb6, 0x6c, 0xe2, 0x38, 0x0b, 0x44, 0x69, 0x6a,
+	0x8f, 0x66, 0x6f, 0x6c, 0xb4, 0x06, 0xa7, 0x2c, 0xdb, 0x6c, 0xd9, 0xc4, 0x71, 0x16, 0x88, 0xd2,
-	0xaa, 0x41, 0x7c, 0x7f, 0x0d, 0x71, 0x3b, 0xef, 0xdb, 0xdb, 0x2d, 0x9f, 0xaa, 0xa5, 0x93, 0xe0,
+	0xd4, 0x54, 0x83, 0xf8, 0xfe, 0x1a, 0xe2, 0x76, 0xde, 0xb7, 0xb7, 0x5b, 0x3e, 0x55, 0x4b, 0x27,
-	0x2c, 0x5e, 0xf9, 0xa3, 0x01, 0x38, 0x99, 0xdc, 0x65, 0x33, 0x92, 0x1a, 0xa9, 0x97, 0xa4, 0x06,
+	0xc1, 0x59, 0xbc, 0xf2, 0xc7, 0x03, 0x70, 0x32, 0x99, 0x65, 0x33, 0x8a, 0x1a, 0xa9, 0x97, 0xa2,
-	0x3d, 0x16, 0x59, 0x36, 0x5e, 0xc6, 0x17, 0xcc, 0x86, 0x94, 0xa5, 0x33, 0x07, 0x63, 0x22, 0x8e,
+	0x06, 0x3d, 0x16, 0xf9, 0x6c, 0xbc, 0x8a, 0x2f, 0xd8, 0x0d, 0x29, 0x9f, 0xce, 0x1c, 0x8c, 0x89,
-	0xf8, 0x9d, 0x22, 0xad, 0x0b, 0x66, 0xc3, 0x5a, 0xbc, 0x1b, 0x27, 0xe9, 0xd1, 0x65, 0x18, 0x57,
+	0x38, 0xe2, 0x4f, 0x8a, 0xb2, 0x2e, 0xd8, 0x0d, 0x6b, 0xf1, 0x69, 0x9c, 0xa4, 0x47, 0x97, 0x61,
-	0xb6, 0x15, 0x55, 0x53, 0xd6, 0x35, 0x12, 0x80, 0x78, 0xe9, 0xdc, 0xbd, 0x02, 0x64, 0x7c, 0x2e,
+	0x5c, 0xd9, 0x56, 0x54, 0x4d, 0x59, 0xd7, 0x48, 0x00, 0xe2, 0x95, 0x73, 0xf7, 0x0a, 0x90, 0xf1,
-	0x49, 0x80, 0x3b, 0x79, 0xd0, 0x0a, 0x4c, 0xb8, 0x46, 0x27, 0x94, 0x37, 0x3b, 0xef, 0x13, 0x50,
+	0xb9, 0x24, 0x01, 0xee, 0xe4, 0x41, 0x2b, 0x30, 0xe1, 0x1a, 0x9d, 0x50, 0xde, 0xee, 0xbc, 0x4f,
-	0x13, 0x6b, 0x9d, 0x24, 0x38, 0x8d, 0x0f, 0x6d, 0x03, 0x34, 0xfc, 0x84, 0xc0, 0x29, 0x1d, 0xe7,
+	0x40, 0x4d, 0xac, 0x75, 0x92, 0xe0, 0x34, 0x3e, 0xb4, 0x0d, 0xd0, 0xf0, 0x0b, 0x02, 0xa7, 0x74,
-	0xb1, 0xba, 0xda, 0xf3, 0xda, 0x0a, 0x72, 0x8b, 0x30, 0x22, 0x06, 0x4d, 0x0e, 0x8e, 0x48, 0x42,
+	0x9c, 0xc7, 0xea, 0x6a, 0xcf, 0xdf, 0x56, 0x50, 0x5b, 0x84, 0x11, 0x31, 0x18, 0x72, 0x70, 0x44,
-	0xcf, 0xc0, 0x88, 0xcd, 0xf3, 0x56, 0xdf, 0x80, 0x41, 0x6e, 0xc0, 0x3d, 0x82, 0x6d, 0x04, 0x47,
+	0x12, 0x7a, 0x06, 0x46, 0x6c, 0x5e, 0xb7, 0xfa, 0x06, 0x0c, 0x72, 0x03, 0xee, 0x11, 0x6c, 0x23,
-	0x3b, 0x71, 0x9c, 0x56, 0xfe, 0xbd, 0x14, 0xdd, 0xa2, 0xfc, 0xe5, 0x8b, 0x2e, 0xc4, 0xd2, 0xaa,
+	0x38, 0x3a, 0x89, 0xe3, 0xb4, 0xf2, 0xef, 0xa5, 0x68, 0x8a, 0xf2, 0x3f, 0x5f, 0x74, 0x21, 0x56,
-	0x87, 0x13, 0x69, 0xd5, 0x54, 0x27, 0x47, 0x24, 0xab, 0x7a, 0x0f, 0x46, 0xd8, 0xb4, 0x56, 0x8d,
+	0x56, 0x3d, 0x9c, 0x28, 0xab, 0xa6, 0x3a, 0x39, 0x22, 0x55, 0xd5, 0xfb, 0x30, 0xc2, 0xb6, 0xb5,
-	0x96, 0x37, 0x94, 0x22, 0x44, 0x2e, 0xf6, 0xb0, 0x74, 0x02, 0x8c, 0xc8, 0x56, 0x3b, 0xce, 0x6d,
+	0x6a, 0xb4, 0xbc, 0xa5, 0x14, 0x21, 0x72, 0xb1, 0x87, 0x4f, 0x27, 0xc0, 0x88, 0xa4, 0xda, 0x71,
-	0x8a, 0x76, 0xe2, 0xb8, 0x3c, 0xf9, 0x13, 0x09, 0xa6, 0x16, 0xeb, 0x97, 0x6d, 0xd3, 0xb5, 0x7c,
+	0x6e, 0x53, 0x74, 0x12, 0xc7, 0xe5, 0xc9, 0x9f, 0x4a, 0x30, 0xb5, 0x58, 0xbf, 0x6c, 0x9b, 0xae,
-	0xf5, 0xae, 0x59, 0x9e, 0xaf, 0xfe, 0x0f, 0x06, 0x6c, 0x57, 0xf3, 0xed, 0x7a, 0xc8, 0xb7, 0x0b,
+	0xe5, 0xab, 0x77, 0xcd, 0xf2, 0x7c, 0xf5, 0x7f, 0x30, 0x60, 0xbb, 0x9a, 0x6f, 0xd7, 0x43, 0xbe,
-	0xbb, 0x1a, 0xb3, 0x6b, 0x22, 0xc1, 0xe5, 0x19, 0xc5, 0x18, 0xd0, 0x1b, 0x70, 0xdc, 0x56, 0x8c,
+	0x5d, 0xd8, 0xd5, 0x98, 0x5d, 0x13, 0x09, 0x2e, 0xcf, 0x28, 0xc6, 0x80, 0xde, 0x84, 0xe3, 0xb6,
-	0x16, 0xf1, 0x37, 0xe1, 0x27, 0xbb, 0xb4, 0x66, 0x69, 0x01, 0x33, 0xf6, 0x48, 0x2a, 0xc8, 0xd1,
+	0x62, 0xb4, 0x88, 0x9f, 0x84, 0x9f, 0xec, 0xd2, 0x9a, 0xa5, 0x05, 0xcc, 0xd8, 0x23, 0xa5, 0x20,
-	0xb0, 0x40, 0x95, 0x7f, 0x20, 0xc1, 0xd8, 0x95, 0xd5, 0xd5, 0xda, 0x92, 0xc1, 0x57, 0x71, 0x4d,
+	0x47, 0xc3, 0x02, 0x55, 0xfe, 0x81, 0x04, 0x63, 0x57, 0x56, 0x57, 0x6b, 0x4b, 0x06, 0xff, 0x8a,
-	0xa1, 0x9b, 0x2c, 0x4f, 0xb0, 0x14, 0xba, 0x99, 0xcc, 0x13, 0x58, 0x1f, 0xe6, 0x3d, 0x68, 0x13,
+	0x6b, 0x0a, 0xdd, 0x64, 0x75, 0x82, 0xa5, 0xd0, 0xcd, 0x64, 0x9d, 0xc0, 0xe6, 0x30, 0x9f, 0x41,
-	0x06, 0x59, 0xf4, 0x20, 0x46, 0xb3, 0xc7, 0x14, 0x5f, 0x88, 0xab, 0x7a, 0x20, 0x61, 0xfe, 0x29,
+	0x9b, 0x30, 0xc8, 0xa2, 0x07, 0x31, 0x9a, 0x3d, 0x96, 0xf8, 0x42, 0x5c, 0xd5, 0x03, 0x09, 0xeb,
-	0x1a, 0xb0, 0x0f, 0x2f, 0xbf, 0x0b, 0x93, 0x11, 0xf5, 0x98, 0xbf, 0xf8, 0x25, 0x0e, 0x6a, 0x40,
+	0x4f, 0x31, 0x80, 0x7d, 0x78, 0xf9, 0x3d, 0x98, 0x8c, 0xa8, 0xc7, 0xfc, 0xc5, 0x2f, 0x71, 0x50,
-	0x81, 0x69, 0xe2, 0x5f, 0xd1, 0x74, 0x7b, 0xd3, 0x90, 0x30, 0x39, 0xcc, 0xa3, 0xd8, 0x97, 0x83,
+	0x03, 0x0a, 0x4c, 0x13, 0xff, 0x8a, 0xa6, 0xdb, 0x9b, 0x86, 0x84, 0xc9, 0x61, 0x1d, 0xc5, 0x7e,
-	0x3d, 0x6c, 0xf9, 0x8b, 0x1c, 0x9c, 0xba, 0x62, 0xda, 0xea, 0x3b, 0xa6, 0x41, 0x15, 0xad, 0x66,
+	0x39, 0xd8, 0xc3, 0x96, 0xbf, 0xcc, 0xc1, 0xa9, 0x2b, 0xa6, 0xad, 0xbe, 0x6b, 0x1a, 0x54, 0xd1,
-	0x36, 0xe7, 0x5c, 0x6a, 0x3a, 0x0d, 0x45, 0x23, 0x76, 0x1f, 0x0e, 0x51, 0x5a, 0xec, 0x10, 0xf5,
+	0x6a, 0x66, 0x73, 0xce, 0xa5, 0xa6, 0xd3, 0x50, 0x34, 0x62, 0xf7, 0xe1, 0x10, 0xa5, 0xc5, 0x0e,
-	0x62, 0xb7, 0x16, 0xa6, 0xeb, 0x9d, 0x79, 0xa2, 0xa2, 0x89, 0x13, 0xd5, 0xf2, 0x11, 0xc9, 0xdb,
+	0x51, 0x2f, 0x76, 0x6b, 0x61, 0xba, 0xde, 0x99, 0x27, 0x2a, 0x9a, 0x38, 0x51, 0x2d, 0x1f, 0x91,
-	0xff, 0x78, 0xf5, 0x77, 0x09, 0xee, 0xcb, 0xe0, 0xec, 0x43, 0x1e, 0xbe, 0x15, 0xcf, 0xc3, 0x17,
+	0xbc, 0xfd, 0x8f, 0x57, 0x7f, 0x97, 0xe0, 0xbe, 0x0c, 0xce, 0x3e, 0xd4, 0xe1, 0x5b, 0xf1, 0x3a,
-	0x8f, 0xc6, 0xe4, 0x8c, 0xa4, 0xfc, 0x9f, 0xb9, 0x4c, 0x53, 0x79, 0x1a, 0xf8, 0x16, 0x14, 0xf9,
+	0x7c, 0xf1, 0x68, 0x4c, 0xce, 0x28, 0xca, 0xff, 0x99, 0xcb, 0x34, 0x95, 0x97, 0x81, 0x6f, 0x43,
-	0x17, 0x26, 0x1b, 0xc2, 0xd4, 0xf9, 0x2e, 0xf5, 0xa9, 0xbb, 0xeb, 0xfe, 0x15, 0x28, 0x26, 0x1b,
+	0x91, 0xff, 0xc2, 0x64, 0x43, 0x98, 0x3a, 0xdf, 0xa5, 0x3e, 0x75, 0x77, 0xdd, 0xbf, 0x02, 0xc5,
-	0xc4, 0x26, 0x46, 0x83, 0x44, 0x52, 0x24, 0x01, 0x8e, 0x03, 0x31, 0xe8, 0x2c, 0x0c, 0xf3, 0x94,
+	0x64, 0x83, 0xd8, 0xc4, 0x68, 0x90, 0x48, 0x89, 0x24, 0xc0, 0x71, 0x20, 0x06, 0x9d, 0x85, 0x61,
-	0x27, 0xb6, 0x8b, 0x8e, 0xed, 0xed, 0x96, 0x87, 0x57, 0xc2, 0x66, 0x1c, 0xa5, 0x41, 0xe7, 0x61,
+	0x5e, 0xf2, 0xc4, 0xb2, 0xe8, 0xd8, 0xde, 0x6e, 0x79, 0x78, 0x25, 0x1c, 0xc6, 0x51, 0x1a, 0x74,
-	0x58, 0x57, 0x76, 0x12, 0x7b, 0x68, 0x70, 0x9b, 0xb1, 0x12, 0x76, 0xe1, 0x28, 0x1d, 0x7a, 0x0f,
+	0x1e, 0x86, 0x75, 0x65, 0x27, 0x91, 0x43, 0x83, 0xdb, 0x8c, 0x95, 0x70, 0x0a, 0x47, 0xe9, 0xd0,
-	0x46, 0x1b, 0x96, 0x1b, 0xb9, 0x81, 0x17, 0x39, 0x60, 0xb7, 0x26, 0xa6, 0x5d, 0xe6, 0x57, 0x11,
+	0xfb, 0x30, 0xda, 0xb0, 0xdc, 0xc8, 0x2d, 0xbc, 0xa8, 0x01, 0xbb, 0x35, 0x31, 0xed, 0x42, 0xbf,
-	0x3b, 0x5b, 0xce, 0xd7, 0xd6, 0x22, 0x6d, 0x38, 0x21, 0x4e, 0xfe, 0x65, 0x1e, 0x1e, 0xd8, 0x77,
+	0x8a, 0xd8, 0xd9, 0x72, 0xbe, 0xb6, 0x16, 0x19, 0xc3, 0x09, 0x71, 0xf2, 0x2f, 0xf3, 0xf0, 0xc0,
-	0x8a, 0xa2, 0xc5, 0x7d, 0x72, 0x93, 0xa9, 0x2e, 0xf2, 0x92, 0x06, 0x8c, 0xb0, 0x33, 0x26, 0x77,
+	0xbe, 0x5b, 0x14, 0x2d, 0xee, 0x53, 0x9b, 0x4c, 0x75, 0x51, 0x97, 0x34, 0x60, 0x84, 0x9d, 0x31,
-	0x37, 0x3f, 0xc0, 0xe6, 0xba, 0x3e, 0xc0, 0xf2, 0xad, 0x66, 0x39, 0x0a, 0x82, 0xe3, 0x98, 0x2c,
+	0xb9, 0xbb, 0xf9, 0x01, 0x36, 0xd7, 0xf5, 0x01, 0x96, 0xa7, 0x9a, 0xe5, 0x28, 0x08, 0x8e, 0x63,
-	0x9d, 0x11, 0x57, 0x62, 0x59, 0xe9, 0xcc, 0x7c, 0xbc, 0x1b, 0x27, 0xe9, 0x19, 0x84, 0xb8, 0xb1,
+	0xb2, 0x72, 0x46, 0x5c, 0x89, 0x65, 0x95, 0x33, 0xf3, 0xf1, 0x69, 0x9c, 0xa4, 0x67, 0x10, 0xe2,
-	0x4a, 0x24, 0x33, 0x01, 0xc4, 0x42, 0xbc, 0x1b, 0x27, 0xe9, 0x91, 0x0e, 0x65, 0x81, 0x1a, 0xf7,
+	0xc6, 0x2a, 0x51, 0xcc, 0x04, 0x10, 0x0b, 0xf1, 0x69, 0x9c, 0xa4, 0x47, 0x3a, 0x94, 0x05, 0x6a,
-	0x7e, 0xe4, 0x51, 0xc5, 0x4b, 0x6a, 0x1e, 0xda, 0xdb, 0x2d, 0x97, 0xe7, 0xf7, 0x27, 0xc5, 0x77,
+	0xdc, 0xfb, 0x91, 0x87, 0x15, 0xaf, 0xa8, 0x79, 0x68, 0x6f, 0xb7, 0x5c, 0x9e, 0xdf, 0x9f, 0x14,
-	0xc2, 0x92, 0x57, 0x60, 0xe4, 0x8a, 0xe9, 0xd0, 0x9a, 0x69, 0x53, 0xbe, 0x8b, 0xa1, 0x07, 0x20,
+	0xdf, 0x09, 0x4b, 0x5e, 0x81, 0x91, 0x2b, 0xa6, 0x43, 0x6b, 0xa6, 0x4d, 0x79, 0x16, 0x43, 0x0f,
-	0xaf, 0xab, 0x86, 0x38, 0x34, 0x0d, 0x0b, 0xb5, 0xf3, 0x6c, 0xee, 0xb2, 0x76, 0xde, 0xad, 0xec,
+	0x40, 0x5e, 0x57, 0x0d, 0x71, 0x68, 0x1a, 0x16, 0x6a, 0xe7, 0xd9, 0xde, 0x65, 0xe3, 0x7c, 0x5a,
-	0x88, 0x69, 0x1d, 0x76, 0x2b, 0x3b, 0x98, 0xb5, 0xcb, 0x97, 0x61, 0x50, 0xec, 0x8e, 0x51, 0xa0,
+	0xd9, 0x11, 0xdb, 0x3a, 0x9c, 0x56, 0x76, 0x30, 0x1b, 0x97, 0x2f, 0xc3, 0xa0, 0xc8, 0x8e, 0x51,
-	0xfc, 0xfe, 0x40, 0xf9, 0x14, 0xa0, 0x1f, 0xe7, 0x60, 0x50, 0x6c, 0x26, 0x7d, 0xd8, 0x16, 0x5e,
+	0xa0, 0xfc, 0xfe, 0x40, 0xf9, 0x14, 0xa0, 0x1f, 0xe7, 0x60, 0x50, 0x24, 0x93, 0x3e, 0xa4, 0x85,
-	0x8b, 0x6d, 0x0b, 0x17, 0x7a, 0xdb, 0x78, 0x33, 0xb7, 0x81, 0x66, 0x62, 0x1b, 0x78, 0xb6, 0x47,
+	0xd7, 0x63, 0x69, 0xe1, 0x42, 0x6f, 0x89, 0x37, 0x33, 0x0d, 0x34, 0x13, 0x69, 0xe0, 0xd9, 0x1e,
-	0xfc, 0xfd, 0xc3, 0xfe, 0xc7, 0x12, 0x8c, 0xc6, 0x53, 0x00, 0x16, 0x58, 0xd8, 0x52, 0x52, 0x1b,
+	0xf1, 0xf7, 0x0f, 0xfb, 0x9f, 0x48, 0x30, 0x1a, 0x2f, 0x01, 0x58, 0x60, 0x61, 0x9f, 0x92, 0xda,
-	0xe4, 0x6a, 0x78, 0x47, 0x11, 0x04, 0x96, 0x7a, 0xd8, 0x85, 0xa3, 0x74, 0x88, 0x04, 0x6c, 0x6c,
+	0x20, 0x57, 0xc3, 0x3b, 0x8a, 0x20, 0xb0, 0xd4, 0xc3, 0x29, 0x1c, 0xa5, 0x43, 0x24, 0x60, 0x63,
-	0x5a, 0x08, 0xa7, 0x54, 0x32, 0x94, 0x76, 0xa9, 0xaa, 0x55, 0xbc, 0x97, 0xc5, 0xca, 0x92, 0x41,
+	0xdb, 0x22, 0xf9, 0x4c, 0x94, 0x50, 0xda, 0xa5, 0xaa, 0x56, 0xf1, 0x5e, 0x17, 0x2b, 0x4b, 0x06,
-	0xaf, 0xd9, 0x75, 0x6a, 0xab, 0x46, 0xab, 0x43, 0x0c, 0x9f, 0x61, 0x51, 0x5c, 0xf9, 0xa6, 0x04,
+	0xbd, 0x66, 0xd7, 0xa9, 0xad, 0x1a, 0xad, 0x0e, 0x31, 0x7c, 0x87, 0x45, 0x71, 0xe5, 0x9b, 0x12,
-	0xc3, 0x42, 0xe1, 0x3e, 0xec, 0x4b, 0xaf, 0xc6, 0xf7, 0xa5, 0x27, 0x7b, 0x4c, 0xae, 0xd2, 0xf7,
+	0x0c, 0x0b, 0x85, 0xfb, 0x90, 0x97, 0x5e, 0x8b, 0xe7, 0xa5, 0x27, 0x7b, 0x2c, 0xae, 0xd2, 0xf3,
-	0xa1, 0x4f, 0x43, 0x53, 0x58, 0x3a, 0xc5, 0xb2, 0xbd, 0x4d, 0xd3, 0xa1, 0xc9, 0x6c, 0x8f, 0xad,
+	0xd0, 0x67, 0xa1, 0x29, 0xac, 0x9c, 0x62, 0xd5, 0xde, 0xa6, 0xe9, 0xd0, 0x64, 0xb5, 0xc7, 0xbe,
-	0x34, 0xcc, 0x7b, 0xd0, 0xb7, 0x25, 0x38, 0xa9, 0x26, 0x12, 0x30, 0xe1, 0xe9, 0xe7, 0x7b, 0x53,
+	0x34, 0xcc, 0x67, 0xd0, 0xb7, 0x25, 0x38, 0xa9, 0x26, 0x0a, 0x30, 0xe1, 0xe9, 0xe7, 0x7b, 0x53,
-	0x2d, 0x80, 0x09, 0x9f, 0x5b, 0x93, 0x3d, 0xb8, 0x43, 0xa4, 0xec, 0x42, 0x07, 0x15, 0x52, 0x60,
+	0x2d, 0x80, 0x09, 0x9f, 0x5c, 0x93, 0x33, 0xb8, 0x43, 0xa4, 0xec, 0x42, 0x07, 0x15, 0x52, 0x60,
-	0x60, 0x93, 0x52, 0xab, 0xc7, 0x1d, 0x33, 0x2d, 0xb5, 0xac, 0x16, 0xb9, 0xf9, 0xab, 0xab, 0x35,
+	0x60, 0x93, 0x52, 0xab, 0xc7, 0x8c, 0x99, 0x56, 0x5a, 0x56, 0x8b, 0xdc, 0xfc, 0xd5, 0xd5, 0x1a,
-	0xcc, 0xa1, 0xe5, 0x8f, 0x73, 0x81, 0xc3, 0xea, 0xde, 0x12, 0x09, 0x92, 0x5f, 0xe9, 0x28, 0x92,
+	0xe6, 0xd0, 0xf2, 0x27, 0xb9, 0xc0, 0x61, 0x75, 0xef, 0x13, 0x09, 0x8a, 0x5f, 0xe9, 0x28, 0x8a,
-	0xdf, 0xe1, 0xb4, 0xc4, 0x17, 0xbd, 0x0c, 0x79, 0xaa, 0xf5, 0x7a, 0x43, 0x28, 0x24, 0xac, 0x2e,
+	0xdf, 0xe1, 0xb4, 0xc2, 0x17, 0xbd, 0x0c, 0x79, 0xaa, 0xf5, 0x7a, 0x43, 0x28, 0x24, 0xac, 0x2e,
-	0xd7, 0xc3, 0x70, 0xb5, 0xba, 0x5c, 0xc7, 0x0c, 0x12, 0xbd, 0x09, 0x05, 0x76, 0xb4, 0x60, 0x2b,
+	0xd7, 0xc3, 0x70, 0xb5, 0xba, 0x5c, 0xc7, 0x0c, 0x12, 0xbd, 0x05, 0x05, 0x76, 0xb4, 0x60, 0x5f,
-	0x3c, 0xdf, 0x7b, 0x04, 0x61, 0xfe, 0x0a, 0x67, 0x18, 0xfb, 0x72, 0xb0, 0x87, 0x2b, 0xbf, 0x0b,
+	0x78, 0xbe, 0xf7, 0x08, 0xc2, 0xfc, 0x15, 0xee, 0x30, 0xf6, 0xcb, 0xc1, 0x1e, 0xae, 0xfc, 0x1e,
-	0x23, 0xb1, 0x30, 0x80, 0x6e, 0xc0, 0x09, 0xcd, 0x54, 0x9a, 0x55, 0x45, 0x53, 0x8c, 0x06, 0xb1,
+	0x8c, 0xc4, 0xc2, 0x00, 0xba, 0x01, 0x27, 0x34, 0x53, 0x69, 0x56, 0x15, 0x4d, 0x31, 0x1a, 0xc4,
-	0x93, 0x81, 0x31, 0xfd, 0x72, 0x69, 0x39, 0xc2, 0x21, 0xc2, 0x49, 0xf0, 0xe4, 0x1d, 0xed, 0xc3,
+	0x4e, 0x06, 0xc6, 0xf4, 0xcb, 0xa5, 0xe5, 0x08, 0x87, 0x08, 0x27, 0xc1, 0xa3, 0x77, 0x74, 0x0e,
-	0x31, 0x6c, 0x59, 0x01, 0x08, 0xad, 0x47, 0x65, 0x28, 0xb0, 0x29, 0xec, 0x1d, 0x13, 0x86, 0xaa,
+	0xc7, 0xb0, 0x65, 0x05, 0x20, 0xb4, 0x1e, 0x95, 0xa1, 0xc0, 0xb6, 0xb0, 0x77, 0x4c, 0x18, 0xaa,
-	0x43, 0x4c, 0x57, 0x36, 0xb3, 0x1d, 0xec, 0xb5, 0xa3, 0x73, 0x00, 0x0e, 0x69, 0xd8, 0x84, 0xf2,
+	0x0e, 0x31, 0x5d, 0xd9, 0xce, 0x76, 0xb0, 0x37, 0x8e, 0xce, 0x01, 0x38, 0xa4, 0x61, 0x13, 0xca,
-	0xa8, 0xe3, 0x5d, 0xc7, 0x07, 0xf1, 0xb7, 0x1e, 0xf4, 0xe0, 0x08, 0x95, 0xfc, 0x47, 0x09, 0x46,
+	0xa3, 0x8e, 0x77, 0x1d, 0x1f, 0xc4, 0xdf, 0x7a, 0x30, 0x83, 0x23, 0x54, 0xf2, 0x1f, 0x25, 0x18,
-	0xae, 0x12, 0xfa, 0xb6, 0x69, 0x6f, 0xd5, 0x4c, 0x4d, 0x6d, 0xb4, 0xfb, 0x10, 0xf5, 0xd7, 0x63,
+	0xb9, 0x4a, 0xe8, 0x3b, 0xa6, 0xbd, 0x55, 0x33, 0x35, 0xb5, 0xd1, 0xee, 0x43, 0xd4, 0x5f, 0x8f,
-	0x51, 0xff, 0x85, 0x2e, 0xc7, 0x2c, 0xa6, 0x6d, 0x56, 0xec, 0x97, 0xff, 0x26, 0x41, 0x29, 0x46,
+	0x45, 0xfd, 0x17, 0xba, 0x5c, 0xb3, 0x98, 0xb6, 0x59, 0xb1, 0x5f, 0xfe, 0x9b, 0x04, 0xa5, 0x18,
-	0x19, 0x0d, 0x13, 0x04, 0x0a, 0x96, 0x69, 0x53, 0xff, 0xc0, 0x75, 0x28, 0x0d, 0x58, 0x48, 0x8d,
+	0x65, 0x34, 0x4c, 0x10, 0x28, 0x58, 0xa6, 0x4d, 0xfd, 0x03, 0xd7, 0xa1, 0x34, 0x60, 0x21, 0x35,
-	0x1c, 0xb9, 0x18, 0x2c, 0xf6, 0xd0, 0x99, 0x9d, 0x1b, 0xb6, 0xa9, 0x8b, 0x79, 0x7f, 0x38, 0x29,
+	0x72, 0xe4, 0x62, 0xb0, 0xd8, 0x43, 0x67, 0x76, 0x6e, 0xd8, 0xa6, 0x2e, 0xf6, 0xfd, 0xe1, 0xa4,
-	0x84, 0xd8, 0xa1, 0x9d, 0x8b, 0xb6, 0xa9, 0x63, 0x8e, 0x2d, 0xff, 0x41, 0x82, 0xf1, 0x18, 0x65,
+	0x10, 0x62, 0x87, 0x76, 0x2e, 0xda, 0xa6, 0x8e, 0x39, 0xb6, 0xfc, 0x07, 0x09, 0xc6, 0x63, 0x94,
-	0x1f, 0x42, 0xba, 0x12, 0x0f, 0xe9, 0xcf, 0x1e, 0xc6, 0xb0, 0x8c, 0xc0, 0xfe, 0x55, 0xd2, 0x2c,
+	0x7d, 0x08, 0xe9, 0x4a, 0x3c, 0xa4, 0x3f, 0x7b, 0x18, 0xc3, 0x32, 0x02, 0xfb, 0xd7, 0x49, 0xb3,
-	0xe6, 0x00, 0xb4, 0x01, 0xc3, 0x96, 0xd9, 0xac, 0x1f, 0xc1, 0x6b, 0x32, 0x3f, 0x18, 0xd4, 0x42,
+	0x98, 0x03, 0xd0, 0x06, 0x0c, 0x5b, 0x66, 0xb3, 0x7e, 0x04, 0xaf, 0xc9, 0xfc, 0x60, 0x50, 0x0b,
-	0x2c, 0x1c, 0x05, 0x46, 0x3b, 0x30, 0x6e, 0x28, 0x3a, 0x71, 0x2c, 0xa5, 0x41, 0xea, 0x47, 0x70,
+	0xb1, 0x70, 0x14, 0x18, 0xed, 0xc0, 0xb8, 0xa1, 0xe8, 0xc4, 0xb1, 0x94, 0x06, 0xa9, 0x1f, 0xc1,
-	0x49, 0x7d, 0xcf, 0xde, 0x6e, 0x79, 0xfc, 0x6a, 0x12, 0x11, 0x77, 0x0a, 0x91, 0x7f, 0xda, 0x61,
+	0x25, 0xf5, 0x3d, 0x7b, 0xbb, 0xe5, 0xf1, 0xab, 0x49, 0x44, 0xdc, 0x29, 0x44, 0xfe, 0x69, 0x87,
-	0xb7, 0x69, 0x53, 0xf4, 0x12, 0x14, 0x79, 0xc9, 0x50, 0xc3, 0xd4, 0xc4, 0xd6, 0x76, 0x9e, 0x0d,
+	0xdd, 0xa6, 0x4d, 0xd1, 0x4b, 0x50, 0xe4, 0x6d, 0x43, 0x0d, 0x53, 0x13, 0xa9, 0xed, 0x3c, 0x5b,
-	0x4d, 0x4d, 0xb4, 0xdd, 0xde, 0x2d, 0xff, 0xd7, 0xbe, 0x6f, 0x6c, 0x3e, 0x21, 0x0e, 0x60, 0xd0,
+	0x9a, 0x9a, 0x18, 0xbb, 0xbd, 0x5b, 0xfe, 0xaf, 0x7d, 0xdf, 0xd8, 0x7c, 0x42, 0x1c, 0xc0, 0xa0,
-	0x32, 0x0c, 0x58, 0xbd, 0x27, 0x19, 0x7c, 0x5b, 0xe1, 0x99, 0x05, 0x47, 0x91, 0xff, 0x91, 0x54,
+	0x65, 0x18, 0xb0, 0x7a, 0x2f, 0x32, 0x78, 0x5a, 0xe1, 0x95, 0x05, 0x47, 0x91, 0xff, 0x91, 0x54,
-	0x9b, 0x6f, 0x2e, 0x37, 0x8e, 0x6c, 0xb8, 0x82, 0xa4, 0x26, 0x73, 0xc8, 0x6c, 0x18, 0x14, 0x7b,
+	0x9b, 0x27, 0x97, 0x1b, 0x47, 0xb6, 0x5c, 0x41, 0x51, 0x93, 0xb9, 0x64, 0x36, 0x0c, 0x8a, 0x1c,
-	0xac, 0x98, 0x95, 0x97, 0x0f, 0x33, 0x2b, 0xa3, 0xfb, 0x42, 0x70, 0x9f, 0xe3, 0x37, 0xfa, 0x82,
+	0x2b, 0x76, 0xe5, 0xe5, 0xc3, 0xec, 0xca, 0x68, 0x5e, 0x08, 0xee, 0x73, 0xfc, 0x41, 0x5f, 0x90,
-	0xe4, 0x3f, 0x4b, 0x30, 0xce, 0x15, 0x6a, 0xb8, 0xb6, 0x4a, 0xdb, 0x7d, 0x8b, 0x9f, 0x1b, 0xb1,
+	0xfc, 0x67, 0x09, 0xc6, 0xb9, 0x42, 0x0d, 0xd7, 0x56, 0x69, 0xbb, 0x6f, 0xf1, 0x73, 0x23, 0x16,
-	0xf8, 0xb9, 0xd0, 0xa5, 0xa1, 0x1d, 0x1a, 0x67, 0xc6, 0xd0, 0xcf, 0x25, 0xb8, 0xa7, 0x83, 0xba,
+	0x3f, 0x17, 0xba, 0x34, 0xb4, 0x43, 0xe3, 0xcc, 0x18, 0xfa, 0x85, 0x04, 0xf7, 0x74, 0x50, 0xf7,
-	0x0f, 0xf1, 0x85, 0xc4, 0xe3, 0xcb, 0x0b, 0x87, 0x35, 0x30, 0x23, 0xc6, 0xdc, 0x84, 0x14, 0xf3,
+	0x21, 0xbe, 0x90, 0x78, 0x7c, 0x79, 0xe1, 0xb0, 0x06, 0x66, 0xc4, 0x98, 0x9b, 0x90, 0x62, 0x1e,
-	0xf8, 0xc4, 0x3d, 0x07, 0x60, 0xd9, 0xea, 0xb6, 0xaa, 0x91, 0x96, 0x28, 0xeb, 0x28, 0x86, 0x43,
+	0xdf, 0xb8, 0xe7, 0x00, 0x2c, 0x5b, 0xdd, 0x56, 0x35, 0xd2, 0x12, 0x6d, 0x1d, 0xc5, 0x70, 0x49,
-	0x52, 0x0b, 0x7a, 0x70, 0x84, 0x0a, 0x7d, 0x13, 0xa6, 0x9a, 0x64, 0x43, 0x71, 0x35, 0x3a, 0xd7,
+	0x6a, 0xc1, 0x0c, 0x8e, 0x50, 0xa1, 0x6f, 0xc2, 0x54, 0x93, 0x6c, 0x28, 0xae, 0x46, 0xe7, 0x9a,
-	0x6c, 0xce, 0x2b, 0x96, 0xb2, 0xae, 0x6a, 0x2a, 0x55, 0xc5, 0x65, 0xe7, 0x50, 0xf5, 0x92, 0x57,
+	0xcd, 0x79, 0xc5, 0x52, 0xd6, 0x55, 0x4d, 0xa5, 0xaa, 0xb8, 0xec, 0x1c, 0xaa, 0x5e, 0xf2, 0xda,
-	0x6e, 0x91, 0x46, 0x71, 0x7b, 0xb7, 0xfc, 0xc8, 0xfe, 0x6f, 0xe4, 0x3e, 0x71, 0x1b, 0x67, 0x08,
+	0x2d, 0xd2, 0x28, 0x6e, 0xef, 0x96, 0x1f, 0xd9, 0xff, 0x8d, 0xdc, 0x27, 0x6e, 0xe3, 0x0c, 0x21,
-	0x41, 0xdf, 0x92, 0xa0, 0x64, 0x93, 0xb7, 0x5c, 0x76, 0xa6, 0x5d, 0xb0, 0x4d, 0x2b, 0xa6, 0x41,
+	0xe8, 0x5b, 0x12, 0x94, 0x6c, 0xf2, 0xb6, 0xcb, 0xce, 0xb4, 0x0b, 0xb6, 0x69, 0xc5, 0x34, 0xc8,
-	0x9e, 0x6b, 0x70, 0x79, 0x6f, 0xb7, 0x5c, 0xc2, 0x19, 0x34, 0xdd, 0xe8, 0x90, 0x29, 0x08, 0x51,
+	0x73, 0x0d, 0x2e, 0xef, 0xed, 0x96, 0x4b, 0x38, 0x83, 0xa6, 0x1b, 0x1d, 0x32, 0x05, 0x21, 0x0a,
-	0x98, 0x50, 0x34, 0xcd, 0x7c, 0x9b, 0xc4, 0x3d, 0x30, 0xc0, 0xe5, 0x57, 0xf7, 0x76, 0xcb, 0x13,
+	0x13, 0x8a, 0xa6, 0x99, 0xef, 0x90, 0xb8, 0x07, 0x06, 0xb8, 0xfc, 0xea, 0xde, 0x6e, 0x79, 0x62,
-	0x73, 0x9d, 0xdd, 0xdd, 0x88, 0x4e, 0x83, 0x47, 0xb3, 0x30, 0xb8, 0x6d, 0x6a, 0xae, 0x4e, 0x9c,
+	0xae, 0x73, 0xba, 0x1b, 0xd1, 0x69, 0xf0, 0x68, 0x16, 0x06, 0xb7, 0x4d, 0xcd, 0xd5, 0x89, 0x53,
-	0x52, 0x81, 0x4b, 0x62, 0xf1, 0x76, 0xf0, 0xba, 0xd7, 0x74, 0x7b, 0xb7, 0x7c, 0x7c, 0xb1, 0xce,
+	0x2a, 0x70, 0x49, 0x2c, 0xde, 0x0e, 0x5e, 0xf7, 0x86, 0x6e, 0xef, 0x96, 0x8f, 0x2f, 0xd6, 0xf9,
-	0x6f, 0xa1, 0x7d, 0x2a, 0x76, 0x3e, 0x63, 0x19, 0x93, 0x58, 0xf2, 0xfc, 0x09, 0xac, 0x18, 0xc6,
+	0x2d, 0xb4, 0x4f, 0xc5, 0xce, 0x67, 0xac, 0x62, 0x12, 0x9f, 0x3c, 0x7f, 0x02, 0x2b, 0x86, 0x31,
-	0x98, 0x2b, 0x61, 0x17, 0x8e, 0xd2, 0x21, 0x1d, 0x86, 0x36, 0xc5, 0x99, 0xdd, 0x29, 0x0d, 0xf6,
+	0xe6, 0x4a, 0x38, 0x85, 0xa3, 0x74, 0x48, 0x87, 0xa1, 0x4d, 0x71, 0x66, 0x77, 0x4a, 0x83, 0x3d,
-	0xb4, 0xf7, 0xc5, 0xce, 0xfc, 0xd5, 0x71, 0x21, 0x72, 0xc8, 0x6f, 0x76, 0x70, 0x28, 0x01, 0x3d,
+	0xe5, 0xbe, 0xd8, 0x99, 0xbf, 0x3a, 0x2e, 0x44, 0x0e, 0xf9, 0xc3, 0x0e, 0x0e, 0x25, 0xa0, 0x47,
-	0x0a, 0x83, 0xfc, 0x63, 0x69, 0x81, 0x3f, 0x9c, 0x15, 0xc3, 0x48, 0x74, 0xc5, 0x6b, 0xc6, 0x7e,
+	0x61, 0x90, 0xff, 0x58, 0x5a, 0xe0, 0x0f, 0x67, 0xc5, 0x30, 0x12, 0x5d, 0xf1, 0x86, 0xb1, 0x3f,
-	0xbf, 0x4f, 0xba, 0x54, 0x9b, 0xe7, 0xef, 0x5c, 0x09, 0xd2, 0xa5, 0xda, 0x3c, 0xf6, 0xfb, 0x91,
+	0xef, 0x93, 0x2e, 0xd5, 0xe6, 0xf9, 0x3b, 0x57, 0x82, 0x74, 0xa9, 0x36, 0x8f, 0xfd, 0x79, 0x64,
-	0x05, 0x83, 0x0e, 0x59, 0x56, 0x0d, 0x77, 0xa7, 0x04, 0x7c, 0xe5, 0x5e, 0xea, 0xf6, 0x66, 0xee,
+	0xc1, 0xa0, 0x43, 0x96, 0x55, 0xc3, 0xdd, 0x29, 0x01, 0xff, 0x72, 0x2f, 0x75, 0x7b, 0x33, 0x77,
-	0x12, 0xe7, 0x4e, 0xbc, 0x0a, 0x84, 0x12, 0x45, 0x3f, 0xf6, 0xc5, 0xa0, 0x1d, 0x18, 0xb2, 0x5d,
+	0x89, 0x73, 0x27, 0x5e, 0x05, 0x42, 0x89, 0x62, 0x1e, 0xfb, 0x62, 0xd0, 0x0e, 0x0c, 0xd9, 0xae,
-	0x63, 0xce, 0x59, 0x73, 0x88, 0x5d, 0x1a, 0xe6, 0x32, 0xbb, 0x0d, 0xce, 0xd8, 0xe7, 0x4f, 0x4a,
+	0x31, 0xe7, 0xac, 0x39, 0xc4, 0x2e, 0x0d, 0x73, 0x99, 0xdd, 0x06, 0x67, 0xec, 0xf3, 0x27, 0xa5,
-	0x0d, 0x3c, 0x18, 0x50, 0xe0, 0x50, 0x18, 0xfa, 0x48, 0x02, 0xe4, 0xb8, 0x96, 0xa5, 0x11, 0x9d,
+	0x06, 0x1e, 0x0c, 0x28, 0x70, 0x28, 0x0c, 0x7d, 0x2c, 0x01, 0x72, 0x5c, 0xcb, 0xd2, 0x88, 0x4e,
-	0x18, 0x54, 0xd1, 0xf8, 0xc3, 0x84, 0x53, 0x3a, 0xc1, 0x75, 0xa8, 0x75, 0x7d, 0x23, 0x99, 0x04,
+	0x0c, 0xaa, 0x68, 0xfc, 0x61, 0xc2, 0x29, 0x9d, 0xe0, 0x3a, 0xd4, 0xba, 0xbe, 0x91, 0x4c, 0x02,
-	0x4a, 0x2a, 0x13, 0xbc, 0xfa, 0x75, 0x92, 0xe2, 0x14, 0x3d, 0xd8, 0x50, 0x6c, 0x38, 0xfc, 0x77,
+	0x25, 0x95, 0x09, 0x5e, 0xfd, 0x3a, 0x49, 0x71, 0x8a, 0x1e, 0x6c, 0x29, 0x36, 0x1c, 0xfe, 0x77,
-	0x69, 0xa4, 0xa7, 0xa1, 0x48, 0x7f, 0xa0, 0x09, 0x87, 0x42, 0xf4, 0x63, 0x5f, 0x0c, 0xba, 0x0e,
+	0x69, 0xa4, 0xa7, 0xa5, 0x48, 0x7f, 0xa0, 0x09, 0x97, 0x42, 0xcc, 0x63, 0x5f, 0x0c, 0xba, 0x0e,
 	0x53, 0x36, 0x51, 0x9a, 0xd7, 0x0c, 0xad, 0x8d, 0x4d, 0x93, 0x2e, 0xaa, 0x1a, 0x71, 0xda, 0x0e,
-	0x25, 0x7a, 0x69, 0x94, 0x4f, 0x9b, 0xa0, 0x2e, 0x0c, 0xa7, 0x52, 0xe1, 0x0c, 0x6e, 0x5e, 0x94,
+	0x25, 0x7a, 0x69, 0x94, 0x6f, 0x9b, 0xa0, 0x2f, 0x0c, 0xa7, 0x52, 0xe1, 0x0c, 0x6e, 0xde, 0x94,
-	0x25, 0x6e, 0xd2, 0xfa, 0x53, 0xfd, 0x79, 0xb8, 0xa2, 0xac, 0x50, 0xd5, 0xbb, 0x56, 0x94, 0x15,
+	0x25, 0x6e, 0xd2, 0xfa, 0xd3, 0xfd, 0x79, 0xb8, 0xa6, 0xac, 0x50, 0xd5, 0xbb, 0xd6, 0x94, 0x15,
-	0x11, 0xb1, 0xff, 0xf5, 0xd1, 0x57, 0x39, 0x98, 0x08, 0x89, 0x0f, 0x5c, 0x94, 0x95, 0xc2, 0xd2,
+	0x11, 0xb1, 0xff, 0xf5, 0xd1, 0xd7, 0x39, 0x98, 0x08, 0x89, 0x0f, 0xdc, 0x94, 0x95, 0xc2, 0xd2,
-	0x87, 0xa2, 0xac, 0xf4, 0xaa, 0xa6, 0xfc, 0xdd, 0xae, 0x6a, 0xba, 0x0b, 0xc5, 0x60, 0xbc, 0x50,
+	0x87, 0xa6, 0xac, 0xf4, 0xae, 0xa6, 0xfc, 0xdd, 0xee, 0x6a, 0xba, 0x0b, 0xcd, 0x60, 0xbc, 0x51,
-	0x2a, 0x74, 0xe2, 0xbf, 0x7f, 0xa1, 0x54, 0xa8, 0x6b, 0x46, 0x3a, 0xf3, 0x8b, 0x5c, 0xd4, 0xa0,
+	0x2a, 0x74, 0xe2, 0xbf, 0x7f, 0xa3, 0x54, 0xa8, 0x6b, 0x46, 0x39, 0xf3, 0x8b, 0x5c, 0xd4, 0xa0,
-	0xff, 0xa0, 0x6a, 0x9c, 0x94, 0xe2, 0x98, 0x81, 0xee, 0x8a, 0x63, 0xe4, 0xcf, 0xf3, 0x70, 0x32,
+	0xff, 0xa0, 0x6e, 0x9c, 0x94, 0xe6, 0x98, 0x81, 0xee, 0x9a, 0x63, 0xe4, 0x2f, 0xf2, 0x70, 0x32,
-	0xb9, 0x62, 0x63, 0x45, 0x19, 0xd2, 0x1d, 0x8b, 0x32, 0x6a, 0x30, 0xb9, 0xe1, 0x6a, 0x5a, 0x9b,
+	0xf9, 0xc5, 0xc6, 0x9a, 0x32, 0xa4, 0x3b, 0x36, 0x65, 0xd4, 0x60, 0x72, 0xc3, 0xd5, 0xb4, 0x36,
-	0x3b, 0x24, 0xf2, 0x0e, 0xe1, 0xdd, 0xd8, 0xdf, 0x2f, 0x38, 0x27, 0x17, 0x53, 0x68, 0x70, 0x2a,
+	0x77, 0x48, 0xe4, 0x1d, 0xc2, 0xbb, 0xb1, 0xbf, 0x5f, 0x70, 0x4e, 0x2e, 0xa6, 0xd0, 0xe0, 0x54,
-	0x67, 0x46, 0x81, 0x49, 0xbe, 0xa7, 0x02, 0x93, 0x8e, 0xfa, 0x86, 0x81, 0x83, 0xd7, 0x37, 0xa4,
+	0xce, 0x8c, 0x06, 0x93, 0x7c, 0x4f, 0x0d, 0x26, 0x1d, 0xfd, 0x0d, 0x03, 0x07, 0xef, 0x6f, 0x48,
-	0x17, 0x8b, 0x14, 0x7a, 0x28, 0x16, 0x39, 0x8a, 0xea, 0x8e, 0x94, 0xc0, 0x77, 0xa7, 0xea, 0x0e,
+	0x6f, 0x16, 0x29, 0xf4, 0xd0, 0x2c, 0x72, 0x14, 0xdd, 0x1d, 0x29, 0x81, 0xef, 0x4e, 0xdd, 0x1d,
-	0xf9, 0x7e, 0x98, 0x16, 0x6c, 0xec, 0x7b, 0xde, 0x34, 0xa8, 0x6d, 0x6a, 0x1a, 0xb1, 0x17, 0x5c,
+	0xf2, 0xfd, 0x30, 0x2d, 0xd8, 0xd8, 0xef, 0x79, 0xd3, 0xa0, 0xb6, 0xa9, 0x69, 0xc4, 0x5e, 0x70,
-	0x5d, 0x6f, 0xcb, 0x17, 0x61, 0x34, 0x5e, 0x62, 0xe4, 0x8d, 0xbc, 0x57, 0xf5, 0x24, 0xde, 0x51,
+	0x75, 0xbd, 0x2d, 0x5f, 0x84, 0xd1, 0x78, 0x8b, 0x91, 0xb7, 0xf2, 0x5e, 0xd7, 0x93, 0x78, 0x47,
-	0x22, 0x23, 0xef, 0xb5, 0xe3, 0x80, 0x42, 0xfe, 0x42, 0x82, 0x53, 0x19, 0x85, 0x16, 0xe8, 0x06,
+	0x89, 0xac, 0xbc, 0x37, 0x8e, 0x03, 0x0a, 0xf9, 0x4b, 0x09, 0x4e, 0x65, 0x34, 0x5a, 0xa0, 0x1b,
-	0x8c, 0xea, 0xca, 0x4e, 0xa4, 0xfc, 0x25, 0x19, 0x58, 0x0e, 0x78, 0xe0, 0xe6, 0xcf, 0x82, 0x2b,
+	0x30, 0xaa, 0x2b, 0x3b, 0x91, 0xf6, 0x97, 0x64, 0x60, 0x39, 0xe0, 0x81, 0x9b, 0x3f, 0x0b, 0xae,
-	0x31, 0x24, 0x9c, 0x40, 0x46, 0x2f, 0x43, 0x51, 0x57, 0x76, 0xea, 0xae, 0xdd, 0x22, 0x3d, 0x1e,
+	0xc4, 0x90, 0x70, 0x02, 0x19, 0xbd, 0x0c, 0x45, 0x5d, 0xd9, 0xa9, 0xbb, 0x76, 0x8b, 0xf4, 0x78,
-	0xeb, 0xf9, 0xf2, 0x5d, 0x11, 0x18, 0x38, 0x40, 0x93, 0x3f, 0x91, 0xa0, 0x94, 0x95, 0x82, 0xa1,
+	0xac, 0xe7, 0x9f, 0xef, 0x8a, 0xc0, 0xc0, 0x01, 0x9a, 0xfc, 0xa9, 0x04, 0xa5, 0xac, 0x12, 0x0c,
-	0xf3, 0xb1, 0x72, 0x90, 0x07, 0x13, 0xe5, 0x20, 0xe3, 0x1d, 0x7c, 0x7d, 0x2a, 0x06, 0xf9, 0x54,
+	0x9d, 0x8f, 0xb5, 0x83, 0x3c, 0x98, 0x68, 0x07, 0x19, 0xef, 0xe0, 0xeb, 0x53, 0x33, 0xc8, 0x67,
-	0x82, 0xa9, 0xf4, 0x54, 0x15, 0x3d, 0x11, 0xd3, 0xb8, 0x9c, 0xd0, 0x78, 0x2c, 0xc1, 0x25, 0xf4,
+	0x12, 0x4c, 0xa5, 0x97, 0xaa, 0xe8, 0x89, 0x98, 0xc6, 0xe5, 0x84, 0xc6, 0x63, 0x09, 0x2e, 0xa1,
-	0xdd, 0x84, 0x51, 0x91, 0xd0, 0x0a, 0x98, 0x03, 0xfc, 0x89, 0x67, 0x3b, 0xc8, 0x96, 0xfd, 0xd4,
+	0xef, 0x26, 0x8c, 0x8a, 0x82, 0x56, 0xc0, 0x08, 0x1f, 0x3f, 0xb6, 0x7f, 0x20, 0x13, 0x60, 0x7e,
-	0x8c, 0x8f, 0x63, 0xbc, 0x0d, 0x27, 0x70, 0xe5, 0x1f, 0xe5, 0xa0, 0xc0, 0x5f, 0x47, 0xfb, 0x90,
+	0x69, 0xc6, 0xd7, 0x31, 0x3e, 0x86, 0x13, 0xb8, 0xf2, 0x8f, 0x72, 0x50, 0xe0, 0xaf, 0xa3, 0x7d,
-	0x47, 0xbd, 0x12, 0xcb, 0xa3, 0xba, 0xfd, 0x33, 0x08, 0xd7, 0x32, 0x33, 0x85, 0x5a, 0x4f, 0xa4,
+	0xa8, 0xa3, 0x5e, 0x8d, 0xd5, 0x51, 0xdd, 0xfe, 0x33, 0x08, 0xd7, 0x32, 0xb3, 0x84, 0x5a, 0x4f,
-	0x50, 0x17, 0x7a, 0x42, 0xdf, 0x3f, 0x7b, 0x7a, 0x1a, 0x86, 0x02, 0x25, 0xba, 0x0b, 0xd8, 0xf2,
+	0x94, 0x50, 0x17, 0x7a, 0x42, 0xdf, 0xbf, 0x7a, 0x7a, 0x1a, 0x86, 0x02, 0x25, 0xba, 0x0b, 0xd8,
-	0x4f, 0x72, 0x30, 0x1c, 0x11, 0xd1, 0x65, 0xb8, 0xdf, 0x8e, 0x6d, 0x98, 0xbd, 0xfc, 0xeb, 0x2c,
+	0xf2, 0x4f, 0x72, 0x30, 0x1c, 0x11, 0xd1, 0x65, 0xb8, 0xdf, 0x8e, 0x25, 0xcc, 0x5e, 0xfe, 0xef,
-	0x22, 0xbb, 0xe2, 0x6f, 0x99, 0x5e, 0x05, 0x71, 0x58, 0xe6, 0xd0, 0xb9, 0x93, 0x5e, 0x84, 0x51,
+	0x2c, 0x22, 0xbb, 0xe2, 0xa7, 0x4c, 0xaf, 0x83, 0x38, 0x6c, 0x73, 0xe8, 0xcc, 0xa4, 0x17, 0x61,
-	0xef, 0xaf, 0x7b, 0xc1, 0xb5, 0x5a, 0x9e, 0xcf, 0xe2, 0xa0, 0x2e, 0x7d, 0x35, 0xd6, 0x8b, 0x13,
+	0xd4, 0xfb, 0xf7, 0xbd, 0xe0, 0x5a, 0x2d, 0xcf, 0x77, 0x71, 0xd0, 0x97, 0xbe, 0x1a, 0x9b, 0xc5,
-	0xd4, 0xd3, 0xcf, 0xc0, 0x48, 0x4c, 0x58, 0x57, 0x05, 0xbf, 0xbf, 0x92, 0x60, 0x32, 0xad, 0x30,
+	0x09, 0xea, 0xe9, 0x67, 0x60, 0x24, 0x26, 0xac, 0xab, 0x86, 0xdf, 0x5f, 0x49, 0x30, 0x99, 0xd6,
-	0x03, 0x9d, 0x86, 0x81, 0x2d, 0x55, 0xbc, 0x21, 0x45, 0xde, 0xdd, 0xfe, 0x5f, 0x35, 0x9a, 0x98,
+	0x98, 0x81, 0x4e, 0xc3, 0xc0, 0x96, 0x2a, 0xde, 0x90, 0x22, 0xef, 0x6e, 0xff, 0xaf, 0x1a, 0x4d,
-	0xf7, 0x04, 0xf5, 0xda, 0xb9, 0xcc, 0x7a, 0xed, 0x73, 0x00, 0x8a, 0xa5, 0x8a, 0xbf, 0x43, 0x0a,
+	0xcc, 0x67, 0x82, 0x7e, 0xed, 0x5c, 0x66, 0xbf, 0xf6, 0x39, 0x00, 0xc5, 0x52, 0xc5, 0xbf, 0x44,
-	0xab, 0x82, 0xc9, 0x1b, 0xfe, 0x51, 0x12, 0x47, 0xa8, 0xf8, 0x43, 0x6b, 0xa8, 0x8f, 0x48, 0x0e,
+	0x0a, 0xab, 0x82, 0xcd, 0x1b, 0xfe, 0xb3, 0x24, 0x8e, 0x50, 0xf1, 0x87, 0xd6, 0x50, 0x1f, 0x51,
-	0xc3, 0x17, 0xd0, 0x88, 0xaa, 0x51, 0x3a, 0xf9, 0xd7, 0x12, 0x3c, 0x78, 0xc7, 0xe3, 0x1c, 0xaa,
+	0x1c, 0x86, 0x2f, 0xa0, 0x11, 0x55, 0xa3, 0x74, 0xf2, 0xaf, 0x25, 0x78, 0xf0, 0x8e, 0xc7, 0x39,
-	0xc6, 0xc2, 0x44, 0x25, 0x11, 0x26, 0x66, 0xb2, 0x01, 0xfa, 0x58, 0xf2, 0xf6, 0xbd, 0x1c, 0xa0,
+	0x54, 0x8d, 0x85, 0x89, 0x4a, 0x22, 0x4c, 0xcc, 0x64, 0x03, 0xf4, 0xb1, 0xe5, 0xed, 0x7b, 0x39,
-	0xd5, 0x4d, 0xd5, 0x6e, 0xd6, 0x14, 0x9b, 0xb6, 0xb1, 0x30, 0xb0, 0x0f, 0x81, 0xe3, 0x3c, 0x0c,
+	0x40, 0xab, 0x9b, 0xaa, 0xdd, 0xac, 0x29, 0x36, 0x6d, 0x63, 0x61, 0x60, 0x1f, 0x02, 0xc7, 0x79,
-	0x37, 0x89, 0xd3, 0xb0, 0x55, 0xee, 0x2c, 0x31, 0xac, 0x81, 0xe7, 0x17, 0xc2, 0x2e, 0x1c, 0xa5,
+	0x18, 0x6e, 0x12, 0xa7, 0x61, 0xab, 0xdc, 0x59, 0x62, 0x59, 0x03, 0xcf, 0x2f, 0x84, 0x53, 0x38,
-	0x43, 0x2d, 0x28, 0x6e, 0x7b, 0x63, 0xe7, 0x3f, 0xd9, 0x75, 0x9b, 0x07, 0x87, 0x33, 0x21, 0x5c,
+	0x4a, 0x87, 0x5a, 0x50, 0xdc, 0xf6, 0xd6, 0xce, 0x7f, 0xb2, 0xeb, 0xb6, 0x0e, 0x0e, 0x77, 0x42,
-	0x27, 0xa2, 0xc1, 0xc1, 0x01, 0xb8, 0xfc, 0xa1, 0x04, 0x53, 0x9d, 0x8e, 0x59, 0x60, 0xaa, 0xdf,
+	0xf8, 0x9d, 0x88, 0x01, 0x07, 0x07, 0xe0, 0xf2, 0x47, 0x12, 0x4c, 0x75, 0x3a, 0x66, 0x81, 0xa9,
-	0x7d, 0xe7, 0xdc, 0x0f, 0x03, 0x1c, 0x9d, 0x79, 0xe5, 0x84, 0x77, 0x59, 0xce, 0x24, 0x63, 0xde,
+	0x7e, 0xf7, 0x9d, 0x73, 0x3f, 0x0c, 0x70, 0x74, 0xe6, 0x95, 0x13, 0xde, 0x65, 0x39, 0x93, 0x8c,
-	0x2a, 0x7f, 0x29, 0xc1, 0x74, 0xba, 0x6a, 0x7d, 0x38, 0x85, 0xdc, 0x88, 0x9f, 0x42, 0xba, 0xbd,
+	0xf9, 0xa8, 0xfc, 0x95, 0x04, 0xd3, 0xe9, 0xaa, 0xf5, 0xe1, 0x14, 0x72, 0x23, 0x7e, 0x0a, 0xe9,
-	0x71, 0x48, 0xd7, 0x3b, 0xe3, 0x44, 0xb2, 0x9b, 0x3a, 0x06, 0x7d, 0x30, 0x72, 0x23, 0x6e, 0xe4,
+	0xf6, 0xc6, 0x21, 0x5d, 0xef, 0x8c, 0x13, 0xc9, 0x6e, 0xea, 0x1a, 0xf4, 0xc1, 0xc8, 0x8d, 0xb8,
-	0xdc, 0xa1, 0x8d, 0x4c, 0x37, 0xb0, 0xfa, 0xe8, 0xcd, 0x5b, 0x33, 0xc7, 0x3e, 0xbb, 0x35, 0x73,
+	0x91, 0x73, 0x87, 0x36, 0x32, 0xdd, 0xc0, 0xea, 0xa3, 0x37, 0x6f, 0xcd, 0x1c, 0xfb, 0xfc, 0xd6,
-	0xec, 0x4f, 0xb7, 0x66, 0x8e, 0xbd, 0xbf, 0x37, 0x23, 0xdd, 0xdc, 0x9b, 0x91, 0x3e, 0xdb, 0x9b,
+	0xcc, 0xb1, 0x3f, 0xdd, 0x9a, 0x39, 0xf6, 0xc1, 0xde, 0x8c, 0x74, 0x73, 0x6f, 0x46, 0xfa, 0x7c,
-	0x91, 0xfe, 0xb2, 0x37, 0x23, 0x7d, 0xf0, 0xd7, 0x99, 0x63, 0xaf, 0x0c, 0x0a, 0xcc, 0x7f, 0x05,
+	0x6f, 0x46, 0xfa, 0xcb, 0xde, 0x8c, 0xf4, 0xe1, 0x5f, 0x67, 0x8e, 0xbd, 0x3a, 0x28, 0x30, 0xff,
-	0x00, 0x00, 0xff, 0xff, 0x15, 0x10, 0x78, 0x1f, 0xbe, 0x3f, 0x00, 0x00,
+	0x15, 0x00, 0x00, 0xff, 0xff, 0xd0, 0x37, 0x36, 0xbc, 0xc4, 0x3f, 0x00, 0x00,
 }

pkg/apis/extensions/v1beta1/generated.proto

@@ -21,10 +21,10 @@ syntax = 'proto2';
 
 package k8s.io.kubernetes.pkg.apis.extensions.v1beta1;
 
+import "k8s.io/apimachinery/pkg/api/resource/generated.proto";
 import "k8s.io/apimachinery/pkg/apis/meta/v1/generated.proto";
 import "k8s.io/apimachinery/pkg/runtime/generated.proto";
 import "k8s.io/apimachinery/pkg/runtime/schema/generated.proto";
-import "k8s.io/apimachinery/pkg/api/resource/generated.proto";
 import "k8s.io/kubernetes/pkg/api/v1/generated.proto";
 import "k8s.io/kubernetes/pkg/util/intstr/generated.proto";
 
@@ -49,7 +49,7 @@ message CustomMetricCurrentStatus {
   optional string name = 1;
 
   // Custom Metric value (average).
-  optional k8s.io.kubernetes.pkg.api.resource.Quantity value = 2;
+  optional k8s.io.apimachinery.pkg.api.resource.Quantity value = 2;
 }
 
 message CustomMetricCurrentStatusList {
@@ -62,7 +62,7 @@ message CustomMetricTarget {
   optional string name = 1;
 
   // Custom Metric value (average).
-  optional k8s.io.kubernetes.pkg.api.resource.Quantity value = 2;
+  optional k8s.io.apimachinery.pkg.api.resource.Quantity value = 2;
 }
 
 message CustomMetricTargetList {

pkg/apis/extensions/v1beta1/types.generated.go

@@ -65,9 +65,9 @@ func init() {
 		panic(err)
 	}
 	if false { // reference the types, but skip this branch at build/run time
-		var v0 pkg1_v1.TypeMeta
+		var v0 pkg3_resource.Quantity
-		var v1 pkg2_types.UID
+		var v1 pkg1_v1.TypeMeta
-		var v2 pkg3_resource.Quantity
+		var v2 pkg2_types.UID
 		var v3 pkg4_v1.PodTemplateSpec
 		var v4 pkg5_intstr.IntOrString
 		var v5 time.Time

pkg/apis/imagepolicy/v1alpha1/generated.pb.go

@@ -1019,43 +1019,43 @@ var (
 )
 
 var fileDescriptorGenerated = []byte{
-	// 594 bytes of a gzipped FileDescriptorProto
+	// 593 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xa4, 0x92, 0x3f, 0x6f, 0x13, 0x4d,
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xa4, 0x92, 0xbf, 0x6f, 0x13, 0x31,
-	0x10, 0xc6, 0x7d, 0x76, 0xfe, 0x79, 0xfd, 0xbe, 0x24, 0x59, 0x28, 0x4e, 0x2e, 0x2e, 0x91, 0x91,
+	0x14, 0xc7, 0x73, 0x49, 0x7f, 0xc5, 0x01, 0xda, 0x1a, 0x86, 0x28, 0xc3, 0xb5, 0x0a, 0x12, 0x2a,
-	0x50, 0x40, 0xb0, 0x8b, 0x23, 0x84, 0x22, 0x0a, 0x42, 0x0e, 0x51, 0xa4, 0x00, 0xc4, 0xd2, 0x51,
+	0x08, 0x6c, 0x52, 0x21, 0x54, 0x31, 0x50, 0x7a, 0x88, 0xa1, 0x03, 0x20, 0xcc, 0xc6, 0x84, 0x73,
-	0xb1, 0xbe, 0x4c, 0xce, 0x1b, 0xdf, 0xed, 0x9e, 0x6e, 0xf7, 0x1c, 0xb9, 0x40, 0xa2, 0xa4, 0xa0,
+	0x7d, 0xbd, 0xb8, 0xc9, 0xd9, 0xa7, 0xb3, 0x2f, 0x55, 0x06, 0x24, 0x46, 0x06, 0x06, 0xfe, 0x23,
-	0xe0, 0x1b, 0xd1, 0xa6, 0x4c, 0x49, 0x15, 0x11, 0xf3, 0x45, 0xd0, 0xed, 0x9d, 0x73, 0x47, 0x9c,
+	0xd6, 0x8e, 0x1d, 0x99, 0x2a, 0x1a, 0xfe, 0x11, 0x74, 0xbe, 0xbb, 0xde, 0x91, 0xb4, 0x20, 0xd4,
-	0x08, 0xa1, 0x74, 0x3b, 0x3b, 0x3b, 0xbf, 0xe7, 0x99, 0x99, 0x45, 0xbb, 0xa3, 0x1d, 0x4d, 0x84,
+	0xcd, 0xcf, 0xcf, 0xef, 0xf3, 0xfd, 0xbe, 0xf7, 0x8c, 0x76, 0x87, 0x3b, 0x9a, 0x08, 0x45, 0x87,
-	0xa2, 0xa3, 0x6c, 0x00, 0xa9, 0x04, 0x03, 0x9a, 0x26, 0xa3, 0x90, 0xf2, 0x44, 0x68, 0x2a, 0x62,
+	0x49, 0x1f, 0x62, 0x09, 0x06, 0x34, 0x8d, 0x86, 0x01, 0xe5, 0x91, 0xd0, 0x54, 0x84, 0x3c, 0x80,
-	0x1e, 0x42, 0xa2, 0x22, 0x11, 0x4c, 0xe8, 0xb8, 0xcf, 0xa3, 0x64, 0xc8, 0xfb, 0x34, 0x04, 0x09,
+	0x48, 0x8d, 0x84, 0x3f, 0xa1, 0xe3, 0x1e, 0x1f, 0x45, 0x03, 0xde, 0xa3, 0x01, 0x48, 0x88, 0xb9,
-	0x29, 0x37, 0x70, 0x40, 0x92, 0x54, 0x19, 0x85, 0x69, 0x01, 0x20, 0x15, 0x80, 0x24, 0xa3, 0x90,
+	0x81, 0x03, 0x12, 0xc5, 0xca, 0x28, 0x4c, 0x33, 0x00, 0x29, 0x01, 0x24, 0x1a, 0x06, 0x24, 0x05,
-	0xe4, 0x00, 0x52, 0x03, 0x90, 0x19, 0xa0, 0xfb, 0x28, 0x14, 0x66, 0x98, 0x0d, 0x48, 0xa0, 0x62,
+	0x90, 0x0a, 0x80, 0x14, 0x80, 0xce, 0xa3, 0x40, 0x98, 0x41, 0xd2, 0x27, 0xbe, 0x0a, 0x69, 0xa0,
-	0x1a, 0xaa, 0x50, 0x51, 0xcb, 0x19, 0x64, 0x87, 0x36, 0xb2, 0x81, 0x3d, 0x15, 0xfc, 0xee, 0x93,
+	0x02, 0x45, 0x2d, 0xa7, 0x9f, 0x1c, 0xda, 0xc8, 0x06, 0xf6, 0x94, 0xf1, 0x3b, 0x4f, 0x72, 0x83,
-	0xd2, 0x20, 0x4f, 0x44, 0xcc, 0x83, 0xa1, 0x90, 0x90, 0x4e, 0x2a, 0x8b, 0x31, 0x18, 0x4e, 0xc7,
+	0x3c, 0x12, 0x21, 0xf7, 0x07, 0x42, 0x42, 0x3c, 0x29, 0x2c, 0xd2, 0x18, 0xb4, 0x4a, 0x62, 0x1f,
-	0x73, 0xae, 0xba, 0xf4, 0xba, 0xaa, 0x34, 0x93, 0x46, 0xc4, 0x30, 0x57, 0xf0, 0xf4, 0x6f, 0x05,
+	0x66, 0x5d, 0xfd, 0xb5, 0x4a, 0xd3, 0x10, 0x0c, 0xa7, 0xe3, 0xb9, 0x5e, 0x3a, 0xf4, 0xaa, 0xaa,
-	0x3a, 0x18, 0x42, 0xcc, 0xe7, 0xea, 0xb6, 0xaf, 0x9d, 0x1f, 0x4d, 0x41, 0xab, 0x2c, 0x0d, 0xe6,
+	0x38, 0x91, 0x46, 0x84, 0xf3, 0x32, 0x4f, 0xff, 0x55, 0xa0, 0xfd, 0x01, 0x84, 0x7c, 0xae, 0xee,
-	0xb5, 0x1e, 0x5e, 0x5f, 0x73, 0x45, 0x2b, 0xfd, 0xab, 0x5f, 0x67, 0x46, 0x44, 0x54, 0x48, 0xa3,
+	0xe1, 0x95, 0x53, 0xbf, 0xcc, 0x56, 0xef, 0xf2, 0xd7, 0x89, 0x11, 0x23, 0x2a, 0xa4, 0xd1, 0x26,
-	0x4d, 0x7a, 0xb9, 0xa4, 0xf7, 0xbd, 0x89, 0x3a, 0xfb, 0xf9, 0xec, 0x19, 0x8c, 0x05, 0x1c, 0xe3,
+	0x9e, 0x2d, 0xe9, 0x7e, 0xaf, 0xa3, 0xd6, 0x7e, 0x3a, 0x7d, 0x06, 0x63, 0x01, 0xc7, 0xf8, 0x23,
-	0x8f, 0x68, 0x25, 0x1f, 0xd4, 0x01, 0x37, 0xdc, 0x75, 0x36, 0x9d, 0xad, 0xce, 0xf6, 0x63, 0x52,
+	0x5a, 0x49, 0x9b, 0x3e, 0xe0, 0x86, 0xb7, 0x9d, 0x4d, 0x67, 0xab, 0xb5, 0xfd, 0x98, 0xe4, 0x8b,
-	0xae, 0xad, 0xde, 0x6f, 0xb5, 0xb8, 0xfc, 0x35, 0x19, 0xf7, 0xc9, 0xdb, 0xc1, 0x11, 0x04, 0xe6,
+	0xab, 0x7a, 0x2f, 0x57, 0x97, 0xbe, 0x26, 0xe3, 0x1e, 0x79, 0xdb, 0x3f, 0x02, 0xdf, 0xbc, 0x06,
-	0x35, 0x18, 0xee, 0xe3, 0x93, 0xb3, 0x8d, 0xc6, 0xf4, 0x6c, 0x03, 0x55, 0x77, 0xec, 0x82, 0x8a,
+	0xc3, 0x3d, 0x7c, 0x72, 0xb6, 0x51, 0x9b, 0x9e, 0x6d, 0xa0, 0xf2, 0x8e, 0x5d, 0x50, 0x71, 0x1f,
-	0x07, 0x68, 0x41, 0x27, 0x10, 0xb8, 0x4d, 0x4b, 0x7f, 0x41, 0xfe, 0xf1, 0x53, 0x90, 0x9a, 0xdb,
+	0x2d, 0xe8, 0x08, 0xfc, 0x76, 0xdd, 0xd2, 0x5f, 0x90, 0xff, 0xfc, 0x16, 0xa4, 0xe2, 0xf6, 0x7d,
-	0xf7, 0x09, 0x04, 0xfe, 0x7f, 0xa5, 0xda, 0x42, 0x1e, 0x31, 0xcb, 0xc6, 0x47, 0x68, 0x49, 0x1b,
+	0x04, 0xbe, 0x77, 0x23, 0x57, 0x5b, 0x48, 0x23, 0x66, 0xd9, 0xf8, 0x08, 0x2d, 0x69, 0xc3, 0x4d,
-	0x6e, 0x32, 0xed, 0xb6, 0xac, 0x8a, 0x7f, 0x23, 0x15, 0x4b, 0xf2, 0x6f, 0x95, 0x3a, 0x4b, 0x45,
+	0xa2, 0xdb, 0x0d, 0xab, 0xe2, 0x5d, 0x4b, 0xc5, 0x92, 0xbc, 0x5b, 0xb9, 0xce, 0x52, 0x16, 0xb3,
-	0xcc, 0x4a, 0x85, 0xde, 0x2e, 0x72, 0x6b, 0x8f, 0x5f, 0x2a, 0x69, 0x78, 0x3e, 0xa2, 0xdc, 0x0d,
+	0x5c, 0xa1, 0xbb, 0x8b, 0xda, 0x95, 0xc7, 0x2f, 0x95, 0x34, 0x3c, 0x1d, 0x51, 0xea, 0x06, 0xdf,
-	0xbe, 0x8b, 0x16, 0x2d, 0xdd, 0x8e, 0xb2, 0xed, 0xff, 0x5f, 0x22, 0x16, 0x8b, 0x82, 0x22, 0xd7,
+	0x45, 0x8b, 0x96, 0x6e, 0x47, 0xd9, 0xf4, 0x6e, 0xe6, 0x88, 0xc5, 0xac, 0x20, 0xcb, 0x75, 0xbf,
-	0xfb, 0xda, 0x42, 0xab, 0x97, 0x9a, 0xc2, 0x9f, 0x10, 0x0a, 0x66, 0x24, 0xed, 0x3a, 0x9b, 0xad,
+	0x36, 0xd0, 0xea, 0x4c, 0x53, 0xf8, 0x13, 0x42, 0x7e, 0x41, 0xd2, 0x6d, 0x67, 0xb3, 0xb1, 0xd5,
-	0xad, 0xce, 0xf6, 0xfe, 0x4d, 0x9a, 0xf8, 0xc3, 0x57, 0xb5, 0xa1, 0x8b, 0x6b, 0xcd, 0x6a, 0x82,
+	0xda, 0xde, 0xbf, 0x4e, 0x13, 0x7f, 0xf8, 0x2a, 0x37, 0x74, 0x71, 0xad, 0x59, 0x45, 0x10, 0x7f,
-	0xf8, 0x8b, 0x83, 0x3a, 0x5c, 0x4a, 0x65, 0xb8, 0x11, 0x4a, 0x6a, 0xb7, 0x69, 0x0d, 0xbc, 0xbb,
+	0x71, 0x50, 0x8b, 0x4b, 0xa9, 0x0c, 0x37, 0x42, 0x49, 0xdd, 0xae, 0x5b, 0x03, 0xef, 0xae, 0xbb,
-	0xe9, 0xae, 0xc8, 0x5e, 0xc5, 0x7c, 0x25, 0x4d, 0x3a, 0xf1, 0x6f, 0x97, 0x46, 0x3a, 0xb5, 0x0c,
+	0x2b, 0xb2, 0x57, 0x32, 0x5f, 0x49, 0x13, 0x4f, 0xbc, 0xdb, 0xb9, 0x91, 0x56, 0x25, 0xc3, 0xaa,
-	0xab, 0x4b, 0x63, 0x8a, 0xda, 0x92, 0xc7, 0xa0, 0x13, 0x1e, 0x80, 0xdd, 0x66, 0xdb, 0x5f, 0x2f,
+	0xd2, 0x98, 0xa2, 0xa6, 0xe4, 0x21, 0xe8, 0x88, 0xfb, 0x60, 0xb7, 0xd9, 0xf4, 0xd6, 0xf3, 0xa2,
-	0x8b, 0xda, 0x6f, 0x66, 0x09, 0x56, 0xbd, 0xe9, 0x3e, 0x47, 0x6b, 0x97, 0x65, 0xf0, 0x1a, 0x6a,
+	0xe6, 0x9b, 0x22, 0xc1, 0xca, 0x37, 0x9d, 0xe7, 0x68, 0x6d, 0x56, 0x06, 0xaf, 0xa1, 0xc6, 0x10,
-	0x8d, 0x60, 0x52, 0x6c, 0x81, 0xe5, 0x47, 0x7c, 0x07, 0x2d, 0x8e, 0x79, 0x94, 0x81, 0xfd, 0x86,
+	0x26, 0xd9, 0x16, 0x58, 0x7a, 0xc4, 0x77, 0xd0, 0xe2, 0x98, 0x8f, 0x12, 0xb0, 0xdf, 0xb0, 0xc9,
-	0x6d, 0x56, 0x04, 0xcf, 0x9a, 0x3b, 0x4e, 0xef, 0x10, 0xad, 0xcf, 0x2d, 0x1f, 0xdf, 0x47, 0xcb,
+	0xb2, 0xe0, 0x59, 0x7d, 0xc7, 0xe9, 0x1e, 0xa2, 0xf5, 0xb9, 0xe5, 0xe3, 0xfb, 0x68, 0x99, 0x8f,
-	0x3c, 0x8a, 0xd4, 0x31, 0x1c, 0x58, 0xc8, 0x8a, 0xbf, 0x5a, 0x7a, 0x58, 0xde, 0x2b, 0xae, 0xd9,
+	0x46, 0xea, 0x18, 0x0e, 0x2c, 0x64, 0xc5, 0x5b, 0xcd, 0x3d, 0x2c, 0xef, 0x65, 0xd7, 0xac, 0xc8,
-	0x2c, 0x8f, 0xef, 0xa1, 0xa5, 0x14, 0xb8, 0x56, 0xb2, 0x40, 0x57, 0xff, 0x86, 0xd9, 0x5b, 0x56,
+	0xe3, 0x7b, 0x68, 0x29, 0x06, 0xae, 0x95, 0xcc, 0xd0, 0xe5, 0xbf, 0x61, 0xf6, 0x96, 0xe5, 0x59,
-	0x66, 0xfd, 0x07, 0x27, 0xe7, 0x5e, 0xe3, 0xf4, 0xdc, 0x6b, 0xfc, 0x38, 0xf7, 0x1a, 0x9f, 0xa7,
+	0xef, 0xc1, 0xc9, 0xb9, 0x5b, 0x3b, 0x3d, 0x77, 0x6b, 0x3f, 0xce, 0xdd, 0xda, 0xe7, 0xa9, 0xeb,
-	0x9e, 0x73, 0x32, 0xf5, 0x9c, 0xd3, 0xa9, 0xe7, 0xfc, 0x9c, 0x7a, 0xce, 0xb7, 0x5f, 0x5e, 0xe3,
+	0x9c, 0x4c, 0x5d, 0xe7, 0x74, 0xea, 0x3a, 0x3f, 0xa7, 0xae, 0xf3, 0xed, 0x97, 0x5b, 0xfb, 0xb0,
-	0xc3, 0xca, 0x6c, 0x8e, 0xbf, 0x03, 0x00, 0x00, 0xff, 0xff, 0x3f, 0x81, 0x72, 0x5a, 0x7b, 0x05,
+	0x52, 0xcc, 0xf1, 0x77, 0x00, 0x00, 0x00, 0xff, 0xff, 0x34, 0x6f, 0x01, 0x3b, 0x7d, 0x05, 0x00,
-	0x00, 0x00,
+	0x00,
 }

pkg/apis/imagepolicy/v1alpha1/generated.proto

@@ -21,10 +21,10 @@ syntax = 'proto2';
 
 package k8s.io.kubernetes.pkg.apis.imagepolicy.v1alpha1;
 
+import "k8s.io/apimachinery/pkg/api/resource/generated.proto";
 import "k8s.io/apimachinery/pkg/apis/meta/v1/generated.proto";
 import "k8s.io/apimachinery/pkg/runtime/generated.proto";
 import "k8s.io/apimachinery/pkg/runtime/schema/generated.proto";
-import "k8s.io/apimachinery/pkg/api/resource/generated.proto";
 import "k8s.io/kubernetes/pkg/api/v1/generated.proto";
 import "k8s.io/kubernetes/pkg/util/intstr/generated.proto";
 

pkg/apis/policy/v1beta1/generated.pb.go

@@ -1322,54 +1322,54 @@ var (
 )
 
 var fileDescriptorGenerated = []byte{
-	// 773 bytes of a gzipped FileDescriptorProto
+	// 776 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xbc, 0x94, 0xcd, 0x6e, 0xeb, 0x44,
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xbc, 0x94, 0xcf, 0x6f, 0xe3, 0x44,
-	0x14, 0xc7, 0xe3, 0x26, 0x29, 0x61, 0x9a, 0x54, 0x65, 0xa0, 0x10, 0x22, 0xe1, 0xa2, 0xac, 0x5a,
+	0x14, 0xc7, 0xe3, 0x26, 0x29, 0x61, 0x9a, 0x54, 0x65, 0xa0, 0x10, 0x22, 0xe1, 0xa2, 0x9c, 0x5a,
-	0x04, 0x63, 0x52, 0x10, 0x2a, 0x2c, 0x2a, 0x6a, 0x52, 0x41, 0x51, 0xab, 0x54, 0x2e, 0x12, 0x12,
+	0x04, 0x63, 0x52, 0x10, 0x2a, 0x1c, 0x2a, 0x6a, 0x52, 0x41, 0x51, 0xab, 0x54, 0x2e, 0x12, 0x12,
-	0x02, 0x89, 0xb1, 0x7d, 0x70, 0x86, 0xf8, 0x4b, 0x33, 0xe3, 0x40, 0x76, 0x3c, 0x02, 0x0b, 0x1e,
+	0x02, 0x89, 0xb1, 0xfd, 0x70, 0x86, 0xf8, 0x97, 0x66, 0xc6, 0x81, 0xdc, 0xf8, 0x13, 0x38, 0xec,
-	0xaa, 0x12, 0x9b, 0x2e, 0x11, 0x42, 0x15, 0xcd, 0x7d, 0x86, 0xbb, 0xbf, 0xb2, 0x3d, 0xf9, 0x70,
+	0x1f, 0x55, 0x69, 0x2f, 0x3d, 0xae, 0x56, 0xab, 0x6a, 0x9b, 0xfd, 0x1b, 0xf6, 0xbe, 0xb2, 0x3d,
-	0x3e, 0x74, 0x73, 0xd5, 0xab, 0xbb, 0xf3, 0xcc, 0x9c, 0xdf, 0xff, 0x7f, 0xce, 0x99, 0x33, 0x46,
+	0x49, 0xe3, 0x24, 0xdd, 0xcd, 0xaa, 0xab, 0xbd, 0x79, 0x66, 0xde, 0xe7, 0xfb, 0x7d, 0xef, 0xcd,
-	0x9f, 0x0f, 0x4e, 0x04, 0x61, 0x91, 0x31, 0x48, 0x6c, 0xe0, 0x21, 0x48, 0x10, 0x46, 0x3c, 0xf0,
+	0x1b, 0xa3, 0x6f, 0x07, 0x07, 0x82, 0xb0, 0xc8, 0x18, 0x24, 0x36, 0xf0, 0x10, 0x24, 0x08, 0x23,
-	0x0c, 0x1a, 0x33, 0x61, 0xc4, 0x91, 0xcf, 0x9c, 0x91, 0x31, 0xec, 0xd8, 0x20, 0x69, 0xc7, 0xf0,
+	0x1e, 0x78, 0x06, 0x8d, 0x99, 0x30, 0xe2, 0xc8, 0x67, 0xce, 0xc8, 0x18, 0x76, 0x6c, 0x90, 0xb4,
-	0x20, 0x04, 0x4e, 0x25, 0xb8, 0x24, 0xe6, 0x91, 0x8c, 0xf0, 0x51, 0x8e, 0x92, 0x19, 0x4a, 0xe2,
+	0x63, 0x78, 0x10, 0x02, 0xa7, 0x12, 0x5c, 0x12, 0xf3, 0x48, 0x46, 0x78, 0x2f, 0x47, 0xc9, 0x2d,
-	0x81, 0x47, 0x52, 0x94, 0xe4, 0x28, 0x51, 0x68, 0xeb, 0x23, 0x8f, 0xc9, 0x7e, 0x62, 0x13, 0x27,
+	0x4a, 0xe2, 0x81, 0x47, 0x52, 0x94, 0xe4, 0x28, 0x51, 0x68, 0xeb, 0x0b, 0x8f, 0xc9, 0x7e, 0x62,
-	0x0a, 0x0c, 0x2f, 0xf2, 0x22, 0x23, 0x53, 0xb0, 0x93, 0x5f, 0xb2, 0x55, 0xb6, 0xc8, 0xbe, 0x72,
+	0x13, 0x27, 0x0a, 0x0c, 0x2f, 0xf2, 0x22, 0x23, 0x53, 0xb0, 0x93, 0xbf, 0xb2, 0x55, 0xb6, 0xc8,
-	0xe5, 0xd6, 0xa7, 0x2a, 0x29, 0x1a, 0xb3, 0x80, 0x3a, 0x7d, 0x16, 0x02, 0x1f, 0xcd, 0xd2, 0x0a,
+	0xbe, 0x72, 0xe5, 0xd6, 0xd7, 0x2a, 0x29, 0x1a, 0xb3, 0x80, 0x3a, 0x7d, 0x16, 0x02, 0x1f, 0x4d,
-	0x40, 0x52, 0x63, 0xb8, 0x94, 0x4f, 0xcb, 0x58, 0x47, 0xf1, 0x24, 0x94, 0x2c, 0x80, 0x25, 0xe0,
+	0xd2, 0x32, 0x38, 0x88, 0x28, 0xe1, 0x0e, 0xcc, 0xe7, 0xf3, 0x52, 0x4a, 0x18, 0x01, 0x48, 0x6a,
-	0xb3, 0xe7, 0x01, 0xc2, 0xe9, 0x43, 0x40, 0x97, 0xb8, 0xe3, 0xb5, 0x3d, 0x33, 0x38, 0x88, 0x28,
+	0x0c, 0x17, 0xaa, 0x68, 0x19, 0x77, 0x51, 0x3c, 0x09, 0x25, 0x0b, 0x16, 0x6d, 0xbe, 0x79, 0x15,
-	0xe1, 0xce, 0xb2, 0xd7, 0x87, 0xeb, 0x99, 0x15, 0xa5, 0x74, 0x56, 0x47, 0x27, 0x92, 0xf9, 0x06,
+	0x20, 0x9c, 0x3e, 0x04, 0x74, 0x81, 0xfb, 0xfc, 0xce, 0x4e, 0x2f, 0x4b, 0xab, 0xb3, 0x3c, 0x3a,
-	0x0b, 0xa5, 0x90, 0x7c, 0x11, 0x69, 0xff, 0xab, 0xa1, 0xda, 0xf9, 0x90, 0x39, 0x92, 0x45, 0x21,
+	0x91, 0xcc, 0x37, 0x58, 0x28, 0x85, 0xe4, 0xf3, 0x48, 0xfb, 0xb1, 0x86, 0x6a, 0xc7, 0x43, 0xe6,
-	0xfe, 0x19, 0xd5, 0xd2, 0x2e, 0xb9, 0x54, 0xd2, 0xa6, 0xf6, 0xbe, 0x76, 0xb8, 0x73, 0xfc, 0x31,
+	0x48, 0x16, 0x85, 0xf8, 0x4f, 0x54, 0x4b, 0x2b, 0x76, 0xa9, 0xa4, 0x4d, 0xed, 0x53, 0x6d, 0x77,
-	0x51, 0xb7, 0x35, 0x5f, 0xec, 0xec, 0xbe, 0xd2, 0x68, 0x32, 0xec, 0x90, 0x9e, 0xfd, 0x2b, 0x38,
+	0x63, 0xff, 0x4b, 0xa2, 0xee, 0x6b, 0x36, 0xf1, 0xdb, 0x1b, 0x4b, 0xa3, 0xc9, 0xb0, 0x43, 0x7a,
-	0xf2, 0x0a, 0x24, 0x35, 0xf1, 0xed, 0xfd, 0x41, 0x69, 0x7c, 0x7f, 0x80, 0x66, 0x7b, 0xd6, 0x54,
+	0xf6, 0xdf, 0xe0, 0xc8, 0x33, 0x90, 0xd4, 0xc4, 0x97, 0xd7, 0x3b, 0xa5, 0xf1, 0xf5, 0x0e, 0xba,
-	0x15, 0xfb, 0xa8, 0xe1, 0x82, 0x0f, 0x12, 0x7a, 0x71, 0xea, 0x28, 0x9a, 0x5b, 0x99, 0xcd, 0x27,
+	0xdd, 0xb3, 0xa6, 0xaa, 0xd8, 0x47, 0x0d, 0x17, 0x7c, 0x90, 0xd0, 0x8b, 0x53, 0x47, 0xd1, 0x5c,
-	0x9b, 0xd9, 0x74, 0xe7, 0x51, 0xf3, 0x8d, 0xf1, 0xfd, 0x41, 0xa3, 0xb0, 0x65, 0x15, 0xc5, 0xdb,
+	0xcb, 0x6c, 0xbe, 0x5a, 0xcd, 0xa6, 0x3b, 0x8b, 0x9a, 0xef, 0x8d, 0xaf, 0x77, 0x1a, 0x85, 0x2d,
-	0x7f, 0x6f, 0xa1, 0x37, 0xaf, 0x23, 0xb7, 0xcb, 0x04, 0x4f, 0xb2, 0x2d, 0x33, 0x71, 0x3d, 0x90,
+	0xab, 0x28, 0xde, 0x7e, 0xb8, 0x86, 0xde, 0x3f, 0x8f, 0xdc, 0x2e, 0x13, 0x3c, 0xc9, 0xb6, 0xcc,
-	0xaf, 0xa0, 0x4e, 0x17, 0x55, 0x44, 0x0c, 0x8e, 0x2a, 0xcf, 0x24, 0x1b, 0xcf, 0x3c, 0x59, 0x91,
+	0xc4, 0xf5, 0x40, 0xbe, 0x85, 0x3a, 0x5d, 0x54, 0x11, 0x31, 0x38, 0xaa, 0x3c, 0x93, 0xac, 0x3c,
-	0xef, 0x4d, 0x0c, 0x8e, 0x59, 0x57, 0x7e, 0x95, 0x74, 0x65, 0x65, 0xea, 0xd8, 0x47, 0xdb, 0x42,
+	0xf5, 0x64, 0x49, 0xbe, 0x17, 0x31, 0x38, 0x66, 0x5d, 0xf9, 0x55, 0xd2, 0x95, 0x95, 0xa9, 0x63,
-	0x52, 0x99, 0x88, 0x66, 0x39, 0xf3, 0xe9, 0x3e, 0xd2, 0x27, 0xd3, 0x32, 0x77, 0x95, 0xd3, 0x76,
+	0x1f, 0xad, 0x0b, 0x49, 0x65, 0x22, 0x9a, 0xe5, 0xcc, 0xa7, 0x7b, 0x4f, 0x9f, 0x4c, 0xcb, 0xdc,
-	0xbe, 0xb6, 0x94, 0x47, 0xfb, 0x3f, 0x0d, 0xbd, 0xb3, 0x82, 0xba, 0x64, 0x42, 0xe2, 0x1f, 0x97,
+	0x54, 0x4e, 0xeb, 0xf9, 0xda, 0x52, 0x1e, 0xed, 0x27, 0x1a, 0xfa, 0x68, 0x09, 0x75, 0xca, 0x84,
-	0x3a, 0x4a, 0x36, 0xeb, 0x68, 0x4a, 0x67, 0xfd, 0xdc, 0x53, 0xae, 0xb5, 0xc9, 0xce, 0x5c, 0x37,
+	0xc4, 0xbf, 0x2f, 0x74, 0x94, 0xac, 0xd6, 0xd1, 0x94, 0xce, 0xfa, 0xb9, 0xa5, 0x5c, 0x6b, 0x93,
-	0x1d, 0x54, 0x65, 0x12, 0x82, 0x74, 0x5a, 0xca, 0x87, 0x3b, 0xc7, 0xa7, 0x8f, 0x2b, 0xd3, 0x6c,
+	0x9d, 0x99, 0x6e, 0x3a, 0xa8, 0xca, 0x24, 0x04, 0xe9, 0xb4, 0x94, 0x77, 0x37, 0xf6, 0x0f, 0xef,
-	0x28, 0xab, 0xea, 0x45, 0x2a, 0x6a, 0xe5, 0xda, 0xed, 0xf1, 0xea, 0xf2, 0xd2, 0x76, 0xe3, 0x3e,
+	0x57, 0xa6, 0xd9, 0x50, 0x56, 0xd5, 0x93, 0x54, 0xd4, 0xca, 0xb5, 0xdb, 0xe3, 0xe5, 0xe5, 0xa5,
-	0xaa, 0x07, 0x2c, 0x3c, 0x1b, 0x52, 0xe6, 0x53, 0xdb, 0x87, 0xc5, 0x12, 0x17, 0xf2, 0x48, 0xdf,
+	0xed, 0xc6, 0x7d, 0x54, 0x0f, 0x58, 0x78, 0x34, 0xa4, 0xcc, 0xa7, 0xb6, 0x0f, 0xf3, 0x25, 0xce,
-	0x1b, 0xc9, 0xdf, 0x1b, 0xb9, 0x08, 0x65, 0x8f, 0xdf, 0x48, 0xce, 0x42, 0xcf, 0x7c, 0x4b, 0xf9,
+	0xe5, 0x91, 0xbe, 0x37, 0x92, 0xbf, 0x37, 0x72, 0x12, 0xca, 0x1e, 0xbf, 0x90, 0x9c, 0x85, 0x9e,
-	0xd6, 0xaf, 0xe6, 0xb4, 0xac, 0x82, 0x32, 0xfe, 0x09, 0xd5, 0x04, 0xf8, 0xe0, 0xc8, 0x88, 0xbf,
+	0xf9, 0x81, 0xf2, 0xad, 0x9f, 0xcd, 0x68, 0x59, 0x05, 0x65, 0xfc, 0x07, 0xaa, 0x09, 0xf0, 0xc1,
-	0xd8, 0xdb, 0xb8, 0xa4, 0x36, 0xf8, 0x37, 0x0a, 0x35, 0xeb, 0x69, 0x27, 0x27, 0x2b, 0x6b, 0x2a,
+	0x91, 0x11, 0x7f, 0xbd, 0xb7, 0x71, 0x4a, 0x6d, 0xf0, 0x2f, 0x14, 0x6a, 0xd6, 0xd3, 0x4e, 0x4e,
-	0xd9, 0x7e, 0x5a, 0x41, 0xef, 0xae, 0xbd, 0x79, 0xfc, 0x2d, 0xc2, 0x91, 0x2d, 0x80, 0x0f, 0xc1,
+	0x56, 0xd6, 0x54, 0xb2, 0xfd, 0xbc, 0x82, 0x3e, 0xbe, 0xf3, 0xe6, 0xf1, 0xcf, 0x08, 0x47, 0xb6,
-	0xfd, 0x3a, 0xff, 0x4f, 0xb0, 0x28, 0xcc, 0x8a, 0x2d, 0x9b, 0x2d, 0x95, 0x3c, 0xee, 0x2d, 0x45,
+	0x00, 0x3e, 0x04, 0xf7, 0xc7, 0xfc, 0x3f, 0xc1, 0xa2, 0x30, 0x2b, 0xb6, 0x6c, 0xb6, 0x54, 0xf2,
-	0x58, 0x2b, 0x28, 0xfc, 0x97, 0x86, 0x1a, 0x6e, 0x6e, 0x03, 0xee, 0x75, 0xe4, 0x4e, 0x2e, 0xef,
+	0xb8, 0xb7, 0x10, 0x61, 0x2d, 0xa1, 0xf0, 0x03, 0x0d, 0x35, 0xdc, 0xdc, 0x06, 0xdc, 0xf3, 0xc8,
-	0xfb, 0x97, 0x31, 0xa3, 0xa4, 0x3b, 0xaf, 0x7c, 0x1e, 0x4a, 0x3e, 0x32, 0xf7, 0x55, 0x82, 0x8d,
+	0x9d, 0x5c, 0xde, 0xaf, 0x6f, 0x62, 0x46, 0x49, 0x77, 0x56, 0xf9, 0x38, 0x94, 0x7c, 0x64, 0x6e,
-	0xc2, 0x99, 0x55, 0x4c, 0x02, 0x5f, 0x21, 0xec, 0x4e, 0x25, 0xc5, 0x99, 0xef, 0x47, 0xbf, 0x81,
+	0xab, 0x04, 0x1b, 0x85, 0x33, 0xab, 0x98, 0x04, 0x3e, 0x43, 0xd8, 0x9d, 0x4a, 0x8a, 0x23, 0xdf,
-	0x9b, 0x3d, 0x9f, 0xaa, 0xf9, 0x9e, 0x52, 0xd8, 0x2f, 0xf8, 0x4e, 0x82, 0xac, 0x15, 0x20, 0x3e,
+	0x8f, 0xfe, 0x01, 0x37, 0x7b, 0x3e, 0x55, 0xf3, 0x13, 0xa5, 0xb0, 0x5d, 0xf0, 0x9d, 0x04, 0x59,
-	0x45, 0xbb, 0x4e, 0xc2, 0x39, 0x84, 0xf2, 0x1b, 0xa0, 0xbe, 0xec, 0x8f, 0x9a, 0x95, 0x4c, 0xea,
+	0x4b, 0x40, 0x7c, 0x88, 0x36, 0x9d, 0x84, 0x73, 0x08, 0xe5, 0x4f, 0x40, 0x7d, 0xd9, 0x1f, 0x35,
-	0x6d, 0x25, 0xb5, 0xfb, 0x55, 0xe1, 0xd4, 0x5a, 0x88, 0x4e, 0x79, 0x17, 0x04, 0xe3, 0xe0, 0x4e,
+	0x2b, 0x99, 0xd4, 0x87, 0x4a, 0x6a, 0xf3, 0x87, 0xc2, 0xa9, 0x35, 0x17, 0x9d, 0xf2, 0x2e, 0x08,
-	0xf8, 0x6a, 0x91, 0xef, 0x16, 0x4e, 0xad, 0x85, 0x68, 0x7c, 0x82, 0xea, 0xf0, 0x7b, 0x0c, 0xce,
+	0xc6, 0xc1, 0x9d, 0xf0, 0xd5, 0x22, 0xdf, 0x2d, 0x9c, 0x5a, 0x73, 0xd1, 0xf8, 0x00, 0xd5, 0xe1,
-	0xa4, 0xc7, 0xdb, 0x19, 0x3d, 0x1d, 0xb4, 0xf3, 0xb9, 0x33, 0xab, 0x10, 0xd9, 0xf2, 0x11, 0x5e,
+	0xdf, 0x18, 0x9c, 0x49, 0x8f, 0xd7, 0x33, 0x7a, 0x3a, 0x68, 0xc7, 0x33, 0x67, 0x56, 0x21, 0xb2,
-	0x6e, 0x22, 0xde, 0x43, 0xe5, 0x01, 0x8c, 0xb2, 0x2b, 0x7f, 0xdd, 0x4a, 0x3f, 0xf1, 0x97, 0xa8,
+	0xe5, 0x23, 0xbc, 0xd8, 0x44, 0xbc, 0x85, 0xca, 0x03, 0x18, 0x65, 0x57, 0xfe, 0xae, 0x95, 0x7e,
-	0x3a, 0xa4, 0x7e, 0x02, 0x6a, 0x1a, 0x3f, 0xd8, 0x6c, 0x1a, 0xbf, 0x63, 0x01, 0x58, 0x39, 0xf8,
+	0xe2, 0xef, 0x51, 0x75, 0x48, 0xfd, 0x04, 0xd4, 0x34, 0x7e, 0xb6, 0xda, 0x34, 0xfe, 0xc2, 0x02,
-	0xc5, 0xd6, 0x89, 0x66, 0x1e, 0xdd, 0x3e, 0xe8, 0xa5, 0xbb, 0x07, 0xbd, 0xf4, 0xcf, 0x83, 0x5e,
+	0xb0, 0x72, 0xf0, 0xbb, 0xb5, 0x03, 0xcd, 0xdc, 0xbb, 0xbc, 0xd1, 0x4b, 0x57, 0x37, 0x7a, 0xe9,
-	0xfa, 0x63, 0xac, 0x6b, 0xb7, 0x63, 0x5d, 0xbb, 0x1b, 0xeb, 0xda, 0xff, 0x63, 0x5d, 0xfb, 0xf3,
+	0xd1, 0x8d, 0x5e, 0xfa, 0x6f, 0xac, 0x6b, 0x97, 0x63, 0x5d, 0xbb, 0x1a, 0xeb, 0xda, 0xd3, 0xb1,
-	0x89, 0x5e, 0xfa, 0xe1, 0x35, 0x75, 0xe9, 0xcf, 0x02, 0x00, 0x00, 0xff, 0xff, 0xca, 0xf1, 0x55,
+	0xae, 0xfd, 0xff, 0x4c, 0x2f, 0xfd, 0xf6, 0x8e, 0xba, 0xf4, 0x17, 0x01, 0x00, 0x00, 0xff, 0xff,
-	0x25, 0x5b, 0x08, 0x00, 0x00,
+	0x02, 0xd3, 0x1e, 0x38, 0x5d, 0x08, 0x00, 0x00,
 }

pkg/apis/policy/v1beta1/generated.proto

@@ -21,10 +21,10 @@ syntax = 'proto2';
 
 package k8s.io.kubernetes.pkg.apis.policy.v1beta1;
 
+import "k8s.io/apimachinery/pkg/api/resource/generated.proto";
 import "k8s.io/apimachinery/pkg/apis/meta/v1/generated.proto";
 import "k8s.io/apimachinery/pkg/runtime/generated.proto";
 import "k8s.io/apimachinery/pkg/runtime/schema/generated.proto";
-import "k8s.io/apimachinery/pkg/api/resource/generated.proto";
 import "k8s.io/kubernetes/pkg/api/v1/generated.proto";
 import "k8s.io/kubernetes/pkg/util/intstr/generated.proto";
 

pkg/apis/rbac/v1alpha1/generated.pb.go

@@ -2760,58 +2760,58 @@ var (
 )
 
 var fileDescriptorGenerated = []byte{
-	// 840 bytes of a gzipped FileDescriptorProto
+	// 841 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xec, 0x54, 0xcf, 0x6b, 0x24, 0x45,
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xec, 0x54, 0xbf, 0x6f, 0x23, 0x45,
-	0x14, 0x9e, 0x4a, 0x66, 0xcc, 0xcc, 0x8b, 0x21, 0xa6, 0x04, 0x69, 0x73, 0xe8, 0x09, 0x7d, 0x0a,
+	0x14, 0xf6, 0x24, 0x36, 0xb1, 0x5f, 0x88, 0x42, 0x06, 0x09, 0x2d, 0x29, 0xd6, 0xd1, 0x56, 0x11,
-	0xba, 0x76, 0x3b, 0x61, 0xd5, 0x3d, 0xe8, 0x61, 0xdb, 0x83, 0x04, 0xd7, 0x18, 0x6a, 0x71, 0xc1,
+	0x1c, 0xbb, 0x38, 0x3a, 0xe0, 0x0a, 0x28, 0x6e, 0x29, 0x50, 0xc4, 0x11, 0xa2, 0x39, 0x71, 0x12,
-	0x65, 0x41, 0x6b, 0x7a, 0x6a, 0x67, 0xca, 0xe9, 0x5f, 0x54, 0x75, 0x07, 0x16, 0x11, 0x3c, 0x7a,
+	0xa7, 0x93, 0x60, 0xbc, 0x9e, 0xb3, 0x07, 0xef, 0x2f, 0xcd, 0xec, 0x46, 0x3a, 0x21, 0x24, 0x4a,
-	0xf4, 0xaf, 0xf0, 0xe8, 0x41, 0xf0, 0xe8, 0xc9, 0x4b, 0xd0, 0xcb, 0x1e, 0xf5, 0x32, 0x98, 0xf6,
+	0x4a, 0xfe, 0x0a, 0x4a, 0x0a, 0x24, 0x4a, 0x2a, 0x9a, 0x08, 0x9a, 0x2b, 0xa1, 0xb1, 0xc8, 0xf2,
-	0x0f, 0x51, 0xba, 0xba, 0xfa, 0x47, 0xd2, 0x13, 0xf2, 0x43, 0x18, 0x10, 0xf6, 0x34, 0x53, 0xef,
+	0x87, 0x80, 0x76, 0x76, 0xf6, 0x87, 0x63, 0x87, 0x38, 0x41, 0xb2, 0x84, 0x44, 0x65, 0xcf, 0x7b,
-	0x7d, 0xdf, 0xab, 0xf7, 0xbd, 0x57, 0xfd, 0xc1, 0xbd, 0xf9, 0x3d, 0x69, 0xf3, 0xc8, 0x99, 0xa7,
+	0xdf, 0xf7, 0xde, 0xfb, 0xe6, 0xcd, 0x7e, 0x70, 0x6f, 0x7a, 0x4f, 0xda, 0x3c, 0x72, 0xa6, 0xe9,
-	0x63, 0x26, 0x42, 0x96, 0x30, 0xe9, 0xc4, 0xf3, 0xa9, 0x43, 0x63, 0x2e, 0x1d, 0x31, 0xa6, 0x9e,
+	0x90, 0x89, 0x90, 0x25, 0x4c, 0x3a, 0xf1, 0x74, 0xec, 0xd0, 0x98, 0x4b, 0x47, 0x0c, 0xa9, 0xe7,
-	0x73, 0x32, 0xa2, 0x7e, 0x3c, 0xa3, 0x23, 0x67, 0xca, 0x42, 0x26, 0x68, 0xc2, 0x26, 0x76, 0x2c,
+	0x9c, 0x0d, 0xa8, 0x1f, 0x4f, 0xe8, 0xc0, 0x19, 0xb3, 0x90, 0x09, 0x9a, 0xb0, 0x91, 0x1d, 0x8b,
-	0xa2, 0x24, 0xc2, 0xfb, 0x05, 0xd3, 0xae, 0x99, 0x76, 0x3c, 0x9f, 0xda, 0x39, 0xd3, 0xce, 0x99,
+	0x28, 0x89, 0xf0, 0x61, 0xc1, 0xb4, 0x6b, 0xa6, 0x1d, 0x4f, 0xc7, 0x76, 0xce, 0xb4, 0x73, 0xa6,
-	0x76, 0xc9, 0xdc, 0x7d, 0x6b, 0xca, 0x93, 0x59, 0x3a, 0xb6, 0xbd, 0x28, 0x70, 0xa6, 0xd1, 0x34,
+	0x5d, 0x32, 0xf7, 0xdf, 0x18, 0xf3, 0x64, 0x92, 0x0e, 0x6d, 0x2f, 0x0a, 0x9c, 0x71, 0x34, 0x8e,
-	0x72, 0x54, 0x81, 0x71, 0xfa, 0x54, 0x9d, 0xd4, 0x41, 0xfd, 0x2b, 0x0a, 0xef, 0xde, 0xd5, 0x2d,
+	0x1c, 0x55, 0x60, 0x98, 0x3e, 0x55, 0x27, 0x75, 0x50, 0xff, 0x8a, 0xc2, 0xfb, 0x77, 0xf5, 0x48,
-	0xd1, 0x98, 0x07, 0xd4, 0x9b, 0xf1, 0x90, 0x89, 0x67, 0x75, 0x53, 0x01, 0x4b, 0xa8, 0x73, 0xd2,
+	0x34, 0xe6, 0x01, 0xf5, 0x26, 0x3c, 0x64, 0xe2, 0x59, 0x39, 0x94, 0x23, 0x98, 0x8c, 0x52, 0xe1,
-	0x6a, 0x67, 0xd7, 0xb9, 0x8c, 0x25, 0xd2, 0x30, 0xe1, 0x01, 0x6b, 0x11, 0xde, 0xbd, 0x8a, 0x20,
+	0xb1, 0xcb, 0xe3, 0xfc, 0x23, 0x4b, 0x3a, 0x01, 0x4b, 0xa8, 0x73, 0xb6, 0x20, 0x62, 0xdf, 0xb9,
-	0xbd, 0x19, 0x0b, 0x68, 0x8b, 0x77, 0x70, 0xe9, 0xc4, 0x1c, 0xc1, 0x64, 0x94, 0x0a, 0xaf, 0x7d,
+	0x8a, 0x25, 0xd2, 0x30, 0xe1, 0xc1, 0x62, 0x9b, 0xb7, 0xaf, 0x23, 0x48, 0x6f, 0xc2, 0x02, 0xba,
-	0xd7, 0x9d, 0xcb, 0x39, 0x4b, 0xa4, 0x8c, 0x96, 0xa3, 0xd3, 0x84, 0xfb, 0x0e, 0x0f, 0x13, 0x99,
+	0xc0, 0xbb, 0x73, 0xe5, 0x3d, 0x2f, 0x1b, 0x6b, 0xb0, 0x1c, 0x9d, 0x26, 0xdc, 0x77, 0x78, 0x98,
-	0x88, 0x8b, 0x14, 0xeb, 0x37, 0x04, 0x9b, 0x1f, 0xfa, 0xa9, 0x4c, 0x98, 0x20, 0x91, 0xcf, 0xf0,
+	0xc8, 0x44, 0x5c, 0xa6, 0x58, 0xbf, 0x20, 0xd8, 0x7e, 0xdf, 0x4f, 0x65, 0xc2, 0x04, 0x89, 0x7c,
-	0x97, 0xd0, 0xcf, 0x07, 0x35, 0xa1, 0x09, 0x35, 0xd0, 0x1e, 0xda, 0xdf, 0x3c, 0x78, 0xdb, 0xd6,
+	0x86, 0x3f, 0x87, 0x6e, 0x2e, 0x7a, 0x44, 0x13, 0x6a, 0xa0, 0x03, 0x74, 0xb8, 0x7d, 0xf4, 0xa6,
-	0xfb, 0x6a, 0xea, 0xad, 0x37, 0x96, 0xa3, 0xed, 0x93, 0x91, 0xfd, 0xe9, 0xf8, 0x2b, 0xe6, 0x25,
+	0xad, 0x37, 0xd6, 0x9c, 0xbd, 0xde, 0x59, 0x8e, 0xb6, 0xcf, 0x06, 0xf6, 0xc7, 0xc3, 0x2f, 0x98,
-	0x9f, 0xb0, 0x84, 0xba, 0xf8, 0x74, 0x31, 0xec, 0x64, 0x8b, 0x21, 0xd4, 0x31, 0x52, 0x55, 0xc5,
+	0x97, 0x7c, 0xc4, 0x12, 0xea, 0xe2, 0xf3, 0x59, 0xbf, 0x95, 0xcd, 0xfa, 0x50, 0xc7, 0x48, 0x55,
-	0x9f, 0x43, 0x4f, 0xa4, 0x3e, 0x93, 0xc6, 0xda, 0xde, 0xfa, 0xfe, 0xe6, 0xc1, 0x5d, 0xfb, 0xba,
+	0x15, 0x7f, 0x0a, 0x1d, 0x91, 0xfa, 0x4c, 0x1a, 0x1b, 0x07, 0x9b, 0x87, 0xdb, 0x47, 0x77, 0xed,
-	0xcf, 0xc1, 0x3e, 0x8e, 0x7c, 0xee, 0x3d, 0x23, 0xa9, 0xcf, 0xdc, 0x2d, 0x7d, 0x45, 0x2f, 0x3f,
+	0x55, 0x1f, 0x84, 0x7d, 0x1a, 0xf9, 0xdc, 0x7b, 0x46, 0x52, 0x9f, 0xb9, 0x3b, 0xba, 0x45, 0x27,
-	0x49, 0x52, 0x54, 0xb4, 0x7e, 0x5e, 0x03, 0xdc, 0x10, 0xe3, 0xf2, 0x70, 0xc2, 0xc3, 0xe9, 0x0a,
+	0x3f, 0x49, 0x52, 0x54, 0xb4, 0x7e, 0xdc, 0x00, 0xdc, 0x10, 0xe3, 0xf2, 0x70, 0xc4, 0xc3, 0xf1,
-	0x34, 0x7d, 0x01, 0x7d, 0x99, 0xaa, 0x44, 0x29, 0x6b, 0x74, 0x7d, 0x59, 0x0f, 0x0b, 0xa6, 0xfb,
+	0x1a, 0x34, 0x7d, 0x06, 0x5d, 0x99, 0xaa, 0x44, 0x29, 0x6b, 0xb0, 0xba, 0xac, 0x87, 0x05, 0xd3,
-	0x8a, 0xbe, 0xa2, 0xaf, 0x03, 0x92, 0x54, 0x45, 0xf1, 0x13, 0xd8, 0x10, 0x91, 0xcf, 0x08, 0x7b,
+	0x7d, 0x49, 0xb7, 0xe8, 0xea, 0x80, 0x24, 0x55, 0x51, 0xfc, 0x04, 0xb6, 0x44, 0xe4, 0x33, 0xc2,
-	0x6a, 0xac, 0x2b, 0x05, 0x37, 0xa8, 0x4f, 0x0a, 0xa2, 0xbb, 0xad, 0xeb, 0x6f, 0xe8, 0x00, 0x29,
+	0x9e, 0x1a, 0x9b, 0x4a, 0xc1, 0x0d, 0xea, 0x93, 0x82, 0xe8, 0xee, 0xea, 0xfa, 0x5b, 0x3a, 0x40,
-	0x4b, 0x5a, 0x3f, 0x20, 0x78, 0xbd, 0x3d, 0x37, 0x37, 0xe5, 0xfe, 0x84, 0x09, 0xfc, 0x1d, 0x02,
+	0xca, 0x92, 0xd6, 0x77, 0x08, 0x5e, 0x5d, 0xbc, 0x37, 0x37, 0xe5, 0xfe, 0x88, 0x09, 0xfc, 0x0d,
-	0xec, 0xb5, 0xb2, 0x7a, 0x92, 0xef, 0x5f, 0xbf, 0x8f, 0x25, 0x37, 0xec, 0xea, 0x96, 0x96, 0x6c,
+	0x02, 0xec, 0x2d, 0x64, 0xf5, 0x4d, 0xbe, 0xbb, 0xfa, 0x1c, 0x4b, 0x3a, 0xec, 0xeb, 0x91, 0x96,
-	0x8d, 0x2c, 0xb9, 0xd3, 0xfa, 0x13, 0xc1, 0x6b, 0x6d, 0xe8, 0x03, 0x2e, 0x13, 0xfc, 0xa4, 0xb5,
+	0x6c, 0x8d, 0x2c, 0xe9, 0x69, 0xfd, 0x8e, 0xe0, 0x95, 0x45, 0xe8, 0x03, 0x2e, 0x13, 0xfc, 0x64,
-	0x64, 0xfb, 0x7a, 0x4b, 0xce, 0xd9, 0x6a, 0xc5, 0xd5, 0xfc, 0xcb, 0x48, 0x63, 0xc1, 0x14, 0x7a,
+	0x61, 0xc9, 0xf6, 0x6a, 0x4b, 0xce, 0xd9, 0x6a, 0xc5, 0xd5, 0xfd, 0x97, 0x91, 0xc6, 0x82, 0x29,
-	0x3c, 0x61, 0x41, 0xb9, 0xdd, 0xff, 0xa6, 0xba, 0x7a, 0xbc, 0x87, 0x79, 0x49, 0x52, 0x54, 0xb6,
+	0x74, 0x78, 0xc2, 0x82, 0x72, 0xbb, 0xff, 0x4e, 0x75, 0xf5, 0x78, 0x8f, 0xf3, 0x92, 0xa4, 0xa8,
-	0x7e, 0x47, 0xb0, 0xdd, 0x00, 0xaf, 0x40, 0xd4, 0xe3, 0xf3, 0xa2, 0xde, 0xb9, 0x9d, 0xa8, 0xe5,
+	0x6c, 0xfd, 0x8a, 0x60, 0xb7, 0x01, 0x5e, 0x83, 0xa8, 0xc7, 0xf3, 0xa2, 0xde, 0xba, 0x9d, 0xa8,
-	0x6a, 0xfe, 0x41, 0x00, 0xf5, 0xf7, 0x8a, 0x87, 0xd0, 0x3b, 0x61, 0x62, 0x2c, 0x0d, 0xb4, 0xb7,
+	0xe5, 0x6a, 0xfe, 0x42, 0x00, 0xf5, 0xf7, 0x8a, 0xfb, 0xd0, 0x39, 0x63, 0x62, 0x28, 0x0d, 0x74,
-	0xbe, 0x3f, 0x70, 0x07, 0x39, 0xfe, 0x51, 0x1e, 0x20, 0x45, 0x1c, 0xbf, 0x09, 0x03, 0x1a, 0xf3,
+	0xb0, 0x79, 0xd8, 0x73, 0x7b, 0x39, 0xfe, 0x51, 0x1e, 0x20, 0x45, 0x1c, 0xbf, 0x0e, 0x3d, 0x1a,
-	0x8f, 0x44, 0x94, 0xc6, 0xd2, 0x58, 0x57, 0xa0, 0xad, 0x6c, 0x31, 0x1c, 0xdc, 0x3f, 0x3e, 0x2c,
+	0xf3, 0x0f, 0x44, 0x94, 0xc6, 0xd2, 0xd8, 0x54, 0xa0, 0x9d, 0x6c, 0xd6, 0xef, 0xdd, 0x3f, 0x3d,
-	0x82, 0xa4, 0xce, 0xe7, 0xe0, 0xd2, 0x31, 0xa5, 0xd1, 0xad, 0xc1, 0xa4, 0x0c, 0x92, 0x3a, 0x8f,
+	0x2e, 0x82, 0xa4, 0xce, 0xe7, 0xe0, 0xd2, 0xd0, 0xa5, 0xd1, 0xae, 0xc1, 0xa4, 0x0c, 0x92, 0x3a,
-	0xdf, 0x83, 0xad, 0xf2, 0x70, 0x44, 0x03, 0x26, 0x8d, 0x9e, 0x22, 0xec, 0x64, 0x8b, 0xe1, 0x16,
+	0x8f, 0xdf, 0x81, 0x9d, 0xf2, 0x70, 0x42, 0x03, 0x26, 0x8d, 0x8e, 0x22, 0xec, 0x65, 0xb3, 0xfe,
-	0x69, 0x26, 0xc8, 0x79, 0x1c, 0xfe, 0x00, 0xb6, 0xc3, 0x28, 0x2c, 0x21, 0x9f, 0x91, 0x07, 0xd2,
+	0x0e, 0x69, 0x26, 0xc8, 0x3c, 0x0e, 0xbf, 0x07, 0xbb, 0x61, 0x14, 0x96, 0x90, 0x4f, 0xc8, 0x03,
-	0x78, 0x49, 0x51, 0x5f, 0xcd, 0x16, 0xc3, 0xed, 0xa3, 0xf3, 0x29, 0x72, 0x11, 0x6b, 0x7d, 0x03,
+	0x69, 0xbc, 0xa0, 0xa8, 0x2f, 0x67, 0xb3, 0xfe, 0xee, 0xc9, 0x7c, 0x8a, 0x5c, 0xc6, 0x5a, 0x5f,
-	0x3b, 0x0d, 0xc3, 0xd2, 0xdf, 0xd2, 0x0c, 0x20, 0xae, 0x82, 0x7a, 0xa5, 0xb7, 0x73, 0xc0, 0xca,
+	0xc1, 0x5e, 0xc3, 0xb0, 0xf4, 0xb7, 0x34, 0x01, 0x88, 0xab, 0xa0, 0x5e, 0xe9, 0xed, 0x1c, 0xb0,
-	0x90, 0xea, 0x18, 0x69, 0xd4, 0xb6, 0x7e, 0x45, 0xd0, 0xfd, 0xff, 0x3b, 0xfa, 0x8f, 0x6b, 0xb0,
+	0x32, 0xa4, 0x3a, 0x46, 0x1a, 0xb5, 0xad, 0x9f, 0x11, 0xb4, 0xff, 0xfb, 0x8e, 0xfe, 0xfd, 0x06,
-	0xf9, 0xc2, 0xca, 0x6f, 0x60, 0xe5, 0xb9, 0x8b, 0xac, 0xd6, 0x1a, 0x6f, 0xef, 0x22, 0x57, 0x7b,
+	0x6c, 0xff, 0x6f, 0xe5, 0x37, 0xb0, 0xf2, 0xdc, 0x45, 0xd6, 0x6b, 0x8d, 0xb7, 0x77, 0x91, 0xeb,
-	0xe2, 0x2f, 0x08, 0xfa, 0x2b, 0x32, 0xc3, 0x87, 0xe7, 0x65, 0xd8, 0x37, 0x94, 0xb1, 0xbc, 0xff,
+	0x3d, 0xf1, 0x27, 0x04, 0xdd, 0x35, 0x99, 0xe1, 0xc3, 0x79, 0x19, 0xf6, 0x0d, 0x65, 0x2c, 0x9f,
-	0xaf, 0xa1, 0xdc, 0x10, 0xbe, 0x03, 0xfd, 0xd2, 0xc0, 0x54, 0xf7, 0x83, 0xba, 0x9b, 0xd2, 0xe3,
+	0xff, 0x4b, 0x28, 0x37, 0x84, 0xef, 0x40, 0xb7, 0x34, 0x30, 0x35, 0x7d, 0xaf, 0x9e, 0xa6, 0xf4,
-	0x48, 0x85, 0xc0, 0x7b, 0xd0, 0x9d, 0xf3, 0x70, 0x62, 0xac, 0x29, 0xe4, 0xcb, 0x1a, 0xd9, 0xfd,
+	0x38, 0x52, 0x21, 0xf0, 0x01, 0xb4, 0xa7, 0x3c, 0x1c, 0x19, 0x1b, 0x0a, 0xf9, 0xa2, 0x46, 0xb6,
-	0x98, 0x87, 0x13, 0xa2, 0x32, 0x39, 0x22, 0xa4, 0x01, 0x53, 0x6f, 0xa8, 0x81, 0xc8, 0xad, 0x8b,
+	0x3f, 0xe4, 0xe1, 0x88, 0xa8, 0x4c, 0x8e, 0x08, 0x69, 0xc0, 0xd4, 0x1b, 0x6a, 0x20, 0x72, 0xeb,
-	0xa8, 0x8c, 0xf5, 0x13, 0x82, 0x0d, 0xfd, 0xfe, 0xaa, 0x7a, 0xe8, 0xd2, 0x7a, 0x07, 0x00, 0x34,
+	0x22, 0x2a, 0x63, 0xfd, 0x80, 0x60, 0x4b, 0xbf, 0xbf, 0xaa, 0x1e, 0xba, 0xb2, 0xde, 0x11, 0x00,
-	0xe6, 0x8f, 0x98, 0x90, 0x3c, 0x0a, 0xf5, 0xbd, 0xd5, 0x97, 0x72, 0xff, 0xf8, 0x50, 0x67, 0x48,
+	0x8d, 0xf9, 0x23, 0x26, 0x24, 0x8f, 0x42, 0xdd, 0xb7, 0xfa, 0x52, 0xee, 0x9f, 0x1e, 0xeb, 0x0c,
-	0x03, 0x75, 0x75, 0x0f, 0xd8, 0x81, 0x41, 0xfe, 0x2b, 0x63, 0xea, 0x31, 0xa3, 0xab, 0x60, 0x3b,
+	0x69, 0xa0, 0xae, 0x9f, 0x01, 0x3b, 0xd0, 0xcb, 0x7f, 0x65, 0x4c, 0x3d, 0x66, 0xb4, 0x15, 0x6c,
-	0x1a, 0x36, 0x38, 0x2a, 0x13, 0xa4, 0xc6, 0xb8, 0x6f, 0x9c, 0x9e, 0x99, 0x9d, 0xe7, 0x67, 0x66,
+	0x4f, 0xc3, 0x7a, 0x27, 0x65, 0x82, 0xd4, 0x18, 0xf7, 0xb5, 0xf3, 0x0b, 0xb3, 0xf5, 0xfc, 0xc2,
-	0xe7, 0x8f, 0x33, 0xb3, 0xf3, 0x6d, 0x66, 0xa2, 0xd3, 0xcc, 0x44, 0xcf, 0x33, 0x13, 0xfd, 0x95,
+	0x6c, 0xfd, 0x76, 0x61, 0xb6, 0xbe, 0xce, 0x4c, 0x74, 0x9e, 0x99, 0xe8, 0x79, 0x66, 0xa2, 0x3f,
-	0x99, 0xe8, 0xfb, 0xbf, 0xcd, 0xce, 0xe3, 0x7e, 0x39, 0xf8, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff,
+	0x32, 0x13, 0x7d, 0xfb, 0xa7, 0xd9, 0x7a, 0xdc, 0x2d, 0x2f, 0xfe, 0xef, 0x00, 0x00, 0x00, 0xff,
-	0x57, 0x75, 0x75, 0xfb, 0x83, 0x0c, 0x00, 0x00,
+	0xff, 0xb1, 0x27, 0x54, 0x88, 0x85, 0x0c, 0x00, 0x00,
 }

pkg/apis/rbac/v1alpha1/generated.proto

@@ -21,10 +21,10 @@ syntax = 'proto2';
 
 package k8s.io.kubernetes.pkg.apis.rbac.v1alpha1;
 
+import "k8s.io/apimachinery/pkg/api/resource/generated.proto";
 import "k8s.io/apimachinery/pkg/apis/meta/v1/generated.proto";
 import "k8s.io/apimachinery/pkg/runtime/generated.proto";
 import "k8s.io/apimachinery/pkg/runtime/schema/generated.proto";
-import "k8s.io/apimachinery/pkg/api/resource/generated.proto";
 import "k8s.io/kubernetes/pkg/api/v1/generated.proto";
 import "k8s.io/kubernetes/pkg/util/intstr/generated.proto";
 

pkg/apis/rbac/v1beta1/generated.pb.go

@@ -2760,58 +2760,58 @@ var (
 )
 
 var fileDescriptorGenerated = []byte{
-	// 838 bytes of a gzipped FileDescriptorProto
+	// 839 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xec, 0x54, 0xbf, 0x6f, 0xe4, 0x44,
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xec, 0x54, 0xbf, 0x6f, 0x23, 0x45,
-	0x14, 0xde, 0x49, 0x76, 0x95, 0xdd, 0x17, 0xa2, 0x90, 0x41, 0x42, 0x26, 0x85, 0x37, 0x72, 0x43,
+	0x14, 0xf6, 0x24, 0xb6, 0x62, 0xbf, 0x10, 0x85, 0x0c, 0x12, 0x5a, 0x52, 0xac, 0xa3, 0x6d, 0x08,
-	0x10, 0x77, 0xf6, 0x25, 0x9c, 0x38, 0x24, 0x44, 0x71, 0xa6, 0x40, 0x11, 0x47, 0x88, 0x06, 0x71,
+	0xe2, 0x6e, 0xf7, 0x12, 0x4e, 0x1c, 0x12, 0xa2, 0xb8, 0xa5, 0x40, 0x11, 0x47, 0x88, 0x06, 0x71,
-	0xe2, 0x97, 0xd0, 0xcd, 0x7a, 0xe7, 0x9c, 0x61, 0xfd, 0x4b, 0x33, 0xe3, 0x48, 0x27, 0x28, 0xe8,
+	0xe2, 0x97, 0xd0, 0x8d, 0xd7, 0x73, 0x9b, 0xc1, 0xfb, 0x4b, 0x33, 0xb3, 0x91, 0x4e, 0x50, 0xd0,
-	0x68, 0xf9, 0x27, 0xe8, 0xa8, 0xa0, 0xa5, 0xa2, 0x0a, 0x54, 0x57, 0x5e, 0xb5, 0x22, 0xe6, 0x0f,
+	0xd1, 0xf2, 0x4f, 0xd0, 0x51, 0x41, 0x4b, 0x45, 0x15, 0xa8, 0xae, 0xbc, 0xca, 0x22, 0xcb, 0x1f,
-	0x01, 0xd9, 0x1e, 0xff, 0xd8, 0xf3, 0x46, 0x59, 0x82, 0x14, 0x09, 0x89, 0x6a, 0x77, 0xde, 0xfb,
+	0x02, 0xda, 0xdd, 0xd9, 0x1f, 0x8e, 0x1d, 0x62, 0x82, 0x64, 0x09, 0xe9, 0x2a, 0x7b, 0xde, 0xfb,
-	0xbe, 0x37, 0xef, 0x7b, 0x6f, 0xfc, 0xc1, 0xbd, 0xd9, 0x5b, 0xd2, 0xe6, 0xb1, 0x33, 0x4b, 0x27,
+	0xbe, 0xf7, 0xde, 0x37, 0x6f, 0xf6, 0x83, 0x7b, 0x93, 0xb7, 0xa4, 0xcd, 0x63, 0x67, 0x92, 0x8e,
-	0x4c, 0x44, 0x4c, 0x31, 0xe9, 0x24, 0x33, 0xdf, 0xa1, 0x09, 0x97, 0x8e, 0x98, 0x50, 0xcf, 0x39,
+	0x98, 0x88, 0x98, 0x62, 0xd2, 0x49, 0x26, 0xbe, 0x43, 0x13, 0x2e, 0x1d, 0x31, 0xa2, 0x9e, 0x73,
-	0x3b, 0x98, 0x30, 0x45, 0x0f, 0x1c, 0x9f, 0x45, 0x4c, 0x50, 0xc5, 0xa6, 0x76, 0x22, 0x62, 0x15,
+	0x76, 0x30, 0x62, 0x8a, 0x1e, 0x38, 0x3e, 0x8b, 0x98, 0xa0, 0x8a, 0x8d, 0xed, 0x44, 0xc4, 0x2a,
-	0xe3, 0x57, 0x4b, 0xa2, 0xdd, 0x10, 0xed, 0x64, 0xe6, 0xdb, 0x39, 0xd1, 0xce, 0x89, 0xb6, 0x26,
+	0xc6, 0xaf, 0x96, 0x44, 0xbb, 0x21, 0xda, 0xc9, 0xc4, 0xb7, 0x73, 0xa2, 0x9d, 0x13, 0x6d, 0x4d,
-	0xee, 0xde, 0xf6, 0xb9, 0x3a, 0x4d, 0x27, 0xb6, 0x17, 0x87, 0x8e, 0x1f, 0xfb, 0xb1, 0x53, 0xf0,
+	0xdc, 0xbd, 0xed, 0x73, 0x75, 0x9a, 0x8e, 0x6c, 0x2f, 0x0e, 0x1d, 0x3f, 0xf6, 0x63, 0xa7, 0xe0,
-	0x27, 0xe9, 0xe3, 0xe2, 0x54, 0x1c, 0x8a, 0x7f, 0x65, 0xdd, 0xdd, 0xbb, 0xba, 0x21, 0x9a, 0xf0,
+	0x8f, 0xd2, 0xc7, 0xc5, 0xa9, 0x38, 0x14, 0xff, 0xca, 0xba, 0xbb, 0x77, 0xf5, 0x40, 0x34, 0xe1,
-	0x90, 0x7a, 0xa7, 0x3c, 0x62, 0xe2, 0x49, 0xd3, 0x52, 0xc8, 0x14, 0x75, 0xce, 0x3a, 0xdd, 0xec,
+	0x21, 0xf5, 0x4e, 0x79, 0xc4, 0xc4, 0x93, 0x6a, 0x24, 0x47, 0x30, 0x19, 0xa7, 0xc2, 0x63, 0x97,
-	0x3a, 0x97, 0xb1, 0x44, 0x1a, 0x29, 0x1e, 0xb2, 0x0e, 0xe1, 0xcd, 0xab, 0x08, 0xd2, 0x3b, 0x65,
+	0xa7, 0xf9, 0x47, 0x96, 0x74, 0x42, 0xa6, 0xa8, 0x73, 0x36, 0xa7, 0x61, 0xd7, 0xb9, 0x8a, 0x25,
-	0x21, 0xed, 0xf0, 0x0e, 0x2f, 0x9d, 0x97, 0x23, 0x98, 0x8c, 0x53, 0xe1, 0x75, 0xef, 0xba, 0x75,
+	0xd2, 0x48, 0xf1, 0x70, 0xbe, 0xcd, 0x9b, 0xd7, 0x11, 0xa4, 0x77, 0xca, 0x42, 0x3a, 0xc7, 0xbb,
-	0x39, 0x67, 0x89, 0x94, 0x83, 0xe5, 0xe8, 0x54, 0xf1, 0xc0, 0xe1, 0x91, 0x92, 0x4a, 0x3c, 0x4f,
+	0x75, 0xe5, 0x2d, 0x2f, 0x1a, 0xeb, 0x60, 0x31, 0x3a, 0x55, 0x3c, 0x70, 0x78, 0xa4, 0xa4, 0x12,
-	0xb1, 0x7e, 0x43, 0xb0, 0xf9, 0x6e, 0x90, 0x4a, 0xc5, 0x04, 0x89, 0x03, 0x86, 0x1f, 0xc1, 0x30,
+	0x97, 0x29, 0xd6, 0x6f, 0x08, 0x36, 0xdf, 0x0d, 0x52, 0xa9, 0x98, 0x20, 0x71, 0xc0, 0xf0, 0x23,
-	0x1f, 0xd4, 0x94, 0x2a, 0x6a, 0xa0, 0x3d, 0xb4, 0xbf, 0x79, 0x78, 0xc7, 0xd6, 0xeb, 0x6a, 0xeb,
+	0xe8, 0xe7, 0xa2, 0xc7, 0x54, 0x51, 0x03, 0xed, 0xa1, 0xfd, 0xcd, 0xc3, 0x3b, 0xb6, 0x5e, 0x58,
-	0x6d, 0x16, 0x96, 0xa3, 0xed, 0xb3, 0x03, 0xfb, 0xc3, 0xc9, 0x57, 0xcc, 0x53, 0x1f, 0x30, 0x45,
+	0x7b, 0xf6, 0x66, 0x65, 0x39, 0xda, 0x3e, 0x3b, 0xb0, 0x3f, 0x1c, 0x7d, 0xc5, 0x3c, 0xf5, 0x01,
-	0x5d, 0x7c, 0x3e, 0x1f, 0xf7, 0xb2, 0xf9, 0x18, 0x9a, 0x18, 0xa9, 0xab, 0xe2, 0x4f, 0x60, 0x20,
+	0x53, 0xd4, 0xc5, 0xe7, 0xd3, 0x61, 0x27, 0x9b, 0x0e, 0xa1, 0x89, 0x91, 0xba, 0x2a, 0xfe, 0x04,
-	0xd2, 0x80, 0x49, 0x63, 0x6d, 0x6f, 0x7d, 0x7f, 0xf3, 0xf0, 0x0d, 0x7b, 0xc5, 0xd7, 0x60, 0x9f,
+	0x7a, 0x22, 0x0d, 0x98, 0x34, 0xd6, 0xf6, 0xd6, 0xf7, 0x37, 0x0f, 0xdf, 0xb0, 0x97, 0x7c, 0x0f,
-	0xc4, 0x01, 0xf7, 0x9e, 0x90, 0x34, 0x60, 0xee, 0x96, 0xbe, 0x61, 0x90, 0x9f, 0x24, 0x29, 0x0b,
+	0xf6, 0x49, 0x1c, 0x70, 0xef, 0x09, 0x49, 0x03, 0xe6, 0x6e, 0xe9, 0x0e, 0xbd, 0xfc, 0x24, 0x49,
-	0x5a, 0x3f, 0xaf, 0x01, 0x6e, 0x69, 0x71, 0x79, 0x34, 0xe5, 0x91, 0x7f, 0x03, 0x92, 0xbe, 0x84,
+	0x59, 0xd0, 0xfa, 0x79, 0x0d, 0x70, 0x4b, 0x8b, 0xcb, 0xa3, 0x31, 0x8f, 0xfc, 0x15, 0x48, 0xfa,
-	0xa1, 0x4c, 0x8b, 0x44, 0xa5, 0xea, 0xce, 0xca, 0xaa, 0x3e, 0x2a, 0x89, 0xee, 0x8b, 0xfa, 0x86,
+	0x12, 0xfa, 0x32, 0x2d, 0x12, 0x95, 0xaa, 0x3b, 0x4b, 0xab, 0xfa, 0xa8, 0x24, 0xba, 0x2f, 0xea,
-	0xa1, 0x0e, 0x48, 0x52, 0xd7, 0xc4, 0x9f, 0xc3, 0x86, 0x88, 0x03, 0x46, 0xd8, 0x63, 0x63, 0x7d,
+	0x0e, 0x7d, 0x1d, 0x90, 0xa4, 0xae, 0x89, 0x3f, 0x87, 0x0d, 0x11, 0x07, 0x8c, 0xb0, 0xc7, 0xc6,
-	0x51, 0xc0, 0x95, 0xe5, 0x49, 0xc9, 0x73, 0xb7, 0x75, 0xf9, 0x0d, 0x1d, 0x20, 0x55, 0x45, 0xeb,
+	0xfa, 0xac, 0x80, 0x6b, 0xcb, 0x93, 0x92, 0xe7, 0x6e, 0xeb, 0xf2, 0x1b, 0x3a, 0x40, 0xaa, 0x8a,
-	0x07, 0x04, 0xaf, 0x74, 0xa7, 0xe6, 0xa6, 0x3c, 0x98, 0x32, 0x81, 0xbf, 0x43, 0x80, 0xbd, 0x4e,
+	0xd6, 0x0f, 0x08, 0x5e, 0x99, 0xbf, 0x35, 0x37, 0xe5, 0xc1, 0x98, 0x09, 0xfc, 0x1d, 0x02, 0xec,
-	0x56, 0xcf, 0xf1, 0xed, 0x95, 0xdb, 0x58, 0x72, 0xc1, 0xae, 0xee, 0x68, 0xc9, 0xca, 0xc8, 0x92,
+	0xcd, 0x65, 0xf5, 0x3d, 0xbe, 0xbd, 0xf4, 0x18, 0x0b, 0x1a, 0xec, 0xea, 0x89, 0x16, 0xac, 0x8c,
-	0x2b, 0xad, 0x67, 0x08, 0x5e, 0xee, 0x42, 0x1f, 0x70, 0xa9, 0xf0, 0x17, 0x9d, 0x0d, 0xdb, 0xab,
+	0x2c, 0x68, 0x69, 0x3d, 0x43, 0xf0, 0xf2, 0x3c, 0xf4, 0x01, 0x97, 0x0a, 0x7f, 0x31, 0xb7, 0x61,
-	0x6d, 0x38, 0x67, 0x17, 0xfb, 0xad, 0xa7, 0x5f, 0x45, 0x5a, 0xdb, 0x7d, 0x04, 0x03, 0xae, 0x58,
+	0x7b, 0xb9, 0x0d, 0xe7, 0xec, 0x62, 0xbf, 0xf5, 0xed, 0x57, 0x91, 0xd6, 0x76, 0x1f, 0x41, 0x8f,
-	0x58, 0xad, 0xf6, 0x5f, 0x89, 0xae, 0x1f, 0xee, 0x51, 0x5e, 0x91, 0x94, 0x85, 0xad, 0xdf, 0x11,
+	0x2b, 0x16, 0x56, 0xab, 0xfd, 0x4f, 0xa2, 0xeb, 0x87, 0x7b, 0x94, 0x57, 0x24, 0x65, 0x61, 0xeb,
-	0x6c, 0xb7, 0xc0, 0x37, 0xa0, 0xe9, 0xd3, 0x45, 0x4d, 0x77, 0xaf, 0xa5, 0x69, 0xb9, 0x98, 0xbf,
+	0x77, 0x04, 0xdb, 0x2d, 0xf0, 0x0a, 0x34, 0x7d, 0x3a, 0xab, 0xe9, 0xee, 0x8d, 0x34, 0x2d, 0x16,
-	0x10, 0x40, 0xf3, 0xa9, 0xe2, 0x31, 0x0c, 0xce, 0x98, 0x98, 0x48, 0x03, 0xed, 0xad, 0xef, 0x8f,
+	0xf3, 0x17, 0x02, 0x68, 0x3e, 0x55, 0x3c, 0x84, 0xde, 0x19, 0x13, 0x23, 0x69, 0xa0, 0xbd, 0xf5,
-	0xdc, 0x51, 0x8e, 0x7f, 0x98, 0x07, 0x48, 0x19, 0xc7, 0xaf, 0xc3, 0x88, 0x26, 0xfc, 0x3d, 0x11,
+	0xfd, 0x81, 0x3b, 0xc8, 0xf1, 0x0f, 0xf3, 0x00, 0x29, 0xe3, 0xf8, 0x75, 0x18, 0xd0, 0x84, 0xbf,
-	0xa7, 0x49, 0xd9, 0xce, 0xc8, 0xdd, 0xca, 0xe6, 0xe3, 0xd1, 0xfd, 0x93, 0xa3, 0x32, 0x48, 0x9a,
+	0x27, 0xe2, 0x34, 0x29, 0xc7, 0x19, 0xb8, 0x5b, 0xd9, 0x74, 0x38, 0xb8, 0x7f, 0x72, 0x54, 0x06,
-	0x7c, 0x0e, 0xae, 0xbc, 0x52, 0x1a, 0xeb, 0x0d, 0x98, 0x54, 0x41, 0xd2, 0xe4, 0xf1, 0x3d, 0xd8,
+	0x49, 0x93, 0xcf, 0xc1, 0x95, 0x95, 0x4b, 0x63, 0xbd, 0x01, 0x93, 0x2a, 0x48, 0x9a, 0x3c, 0xbe,
-	0xaa, 0x0e, 0xc7, 0x34, 0x64, 0xd2, 0xe8, 0x17, 0x84, 0x9d, 0x6c, 0x3e, 0xde, 0x22, 0xed, 0x04,
+	0x07, 0x5b, 0xd5, 0xe1, 0x98, 0x86, 0x4c, 0x1a, 0xdd, 0x82, 0xb0, 0x93, 0x4d, 0x87, 0x5b, 0xa4,
-	0x59, 0xc4, 0xe1, 0x77, 0x60, 0x3b, 0x8a, 0xa3, 0x0a, 0xf2, 0x31, 0x79, 0x20, 0x8d, 0x41, 0x41,
+	0x9d, 0x20, 0xb3, 0x38, 0xfc, 0x0e, 0x6c, 0x47, 0x71, 0x54, 0x41, 0x3e, 0x26, 0x0f, 0xa4, 0xd1,
-	0x7d, 0x29, 0x9b, 0x8f, 0xb7, 0x8f, 0x17, 0x53, 0xe4, 0x79, 0xac, 0xf5, 0x0d, 0xec, 0xb4, 0xbc,
+	0x2b, 0xa8, 0x2f, 0x65, 0xd3, 0xe1, 0xf6, 0xf1, 0x6c, 0x8a, 0x5c, 0xc6, 0x5a, 0xdf, 0xc0, 0x4e,
-	0x4a, 0x7f, 0x48, 0x3e, 0x40, 0x52, 0x07, 0xf5, 0x46, 0xaf, 0xe5, 0x7d, 0xb5, 0x15, 0x35, 0x31,
+	0xcb, 0xab, 0xf4, 0x87, 0xe4, 0x03, 0x24, 0x75, 0x50, 0x6f, 0xf4, 0x46, 0xde, 0x57, 0x5b, 0x51,
-	0xd2, 0x2a, 0x6d, 0xfd, 0x8a, 0xa0, 0xff, 0x9f, 0xb7, 0xf2, 0x1f, 0xd7, 0x60, 0xf3, 0x7f, 0x0f,
+	0x13, 0x23, 0xad, 0xd2, 0xd6, 0xaf, 0x08, 0xba, 0xff, 0x7b, 0x2b, 0xff, 0x71, 0x0d, 0x36, 0x9f,
-	0x5f, 0xd9, 0xc3, 0x73, 0x03, 0xb9, 0x59, 0x53, 0xbc, 0xb6, 0x81, 0x5c, 0xed, 0x86, 0xbf, 0x20,
+	0x7b, 0xf8, 0xd2, 0x1e, 0x9e, 0x1b, 0xc8, 0x6a, 0x4d, 0xf1, 0xc6, 0x06, 0x72, 0xbd, 0x1b, 0xfe,
-	0x18, 0xde, 0x90, 0x0d, 0x92, 0x45, 0x15, 0xb7, 0xff, 0x99, 0x8a, 0xe5, 0xed, 0x7f, 0x0d, 0xd5,
+	0x82, 0xa0, 0xbf, 0x22, 0x1b, 0x24, 0xb3, 0x2a, 0x6e, 0xff, 0x3b, 0x15, 0x8b, 0xc7, 0xff, 0x1a,
-	0x7e, 0xf0, 0x2d, 0x18, 0x56, 0xd6, 0x55, 0x34, 0x3f, 0x6a, 0x9a, 0xa9, 0xdc, 0x8d, 0xd4, 0x08,
+	0xaa, 0xfd, 0xe0, 0x5b, 0xd0, 0xaf, 0xac, 0xab, 0x18, 0x7e, 0xd0, 0x0c, 0x53, 0xb9, 0x1b, 0xa9,
-	0xbc, 0x07, 0xfd, 0x19, 0x8f, 0xa6, 0xc6, 0x5a, 0x81, 0x7c, 0x41, 0x23, 0xfb, 0xef, 0xf3, 0x68,
+	0x11, 0x78, 0x0f, 0xba, 0x13, 0x1e, 0x8d, 0x8d, 0xb5, 0x02, 0xf9, 0x82, 0x46, 0x76, 0xdf, 0xe7,
-	0x4a, 0x8a, 0x4c, 0x8e, 0x88, 0x68, 0xc8, 0x8a, 0x07, 0xd4, 0x42, 0xe4, 0xa6, 0x45, 0x8a, 0x8c,
+	0xd1, 0x98, 0x14, 0x99, 0x1c, 0x11, 0xd1, 0x90, 0x15, 0x0f, 0xa8, 0x85, 0xc8, 0x4d, 0x8b, 0x14,
-	0xf5, 0x13, 0x82, 0x0d, 0xfd, 0xf8, 0xea, 0x7a, 0xe8, 0xd2, 0x7a, 0x87, 0x00, 0x34, 0xe1, 0x0f,
+	0x19, 0xeb, 0x27, 0x04, 0x1b, 0xfa, 0xf1, 0xd5, 0xf5, 0xd0, 0x95, 0xf5, 0x0e, 0x01, 0x68, 0xc2,
-	0x99, 0x90, 0x3c, 0x8e, 0xf4, 0xbd, 0xf5, 0x57, 0x72, 0xff, 0xe4, 0x48, 0x67, 0x48, 0x0b, 0x75,
+	0x1f, 0x32, 0x21, 0x79, 0x1c, 0xe9, 0xbe, 0xf5, 0x57, 0x72, 0xff, 0xe4, 0x48, 0x67, 0x48, 0x0b,
-	0x75, 0x0f, 0xd8, 0x81, 0x51, 0xfe, 0x2b, 0x13, 0xea, 0x31, 0xa3, 0x5f, 0xc0, 0x76, 0x34, 0x6c,
+	0x75, 0xfd, 0x0c, 0xd8, 0x81, 0x41, 0xfe, 0x2b, 0x13, 0xea, 0x31, 0xa3, 0x5b, 0xc0, 0x76, 0x34,
-	0x74, 0x5c, 0x25, 0x48, 0x83, 0x71, 0x5f, 0x3b, 0xbf, 0x30, 0x7b, 0x4f, 0x2f, 0xcc, 0xde, 0xb3,
+	0x6c, 0x70, 0x5c, 0x25, 0x48, 0x83, 0x71, 0x5f, 0x3b, 0xbf, 0x30, 0x3b, 0x4f, 0x2f, 0xcc, 0xce,
-	0x0b, 0xb3, 0xf7, 0x6d, 0x66, 0xa2, 0xf3, 0xcc, 0x44, 0x4f, 0x33, 0x13, 0xfd, 0x91, 0x99, 0xe8,
+	0xb3, 0x0b, 0xb3, 0xf3, 0x6d, 0x66, 0xa2, 0xf3, 0xcc, 0x44, 0x4f, 0x33, 0x13, 0xfd, 0x91, 0x99,
-	0xfb, 0x3f, 0xcd, 0xde, 0x67, 0x1b, 0x7a, 0xee, 0x7f, 0x07, 0x00, 0x00, 0xff, 0xff, 0x2f, 0x1d,
+	0xe8, 0xfb, 0x3f, 0xcd, 0xce, 0x67, 0x1b, 0xfa, 0xde, 0xff, 0x0e, 0x00, 0x00, 0xff, 0xff, 0x14,
-	0x32, 0x0f, 0x74, 0x0c, 0x00, 0x00,
+	0x07, 0x5d, 0xd2, 0x76, 0x0c, 0x00, 0x00,
 }

pkg/apis/rbac/v1beta1/generated.proto

@@ -21,10 +21,10 @@ syntax = 'proto2';
 
 package k8s.io.kubernetes.pkg.apis.rbac.v1beta1;
 
+import "k8s.io/apimachinery/pkg/api/resource/generated.proto";
 import "k8s.io/apimachinery/pkg/apis/meta/v1/generated.proto";
 import "k8s.io/apimachinery/pkg/runtime/generated.proto";
 import "k8s.io/apimachinery/pkg/runtime/schema/generated.proto";
-import "k8s.io/apimachinery/pkg/api/resource/generated.proto";
 import "k8s.io/kubernetes/pkg/api/v1/generated.proto";
 import "k8s.io/kubernetes/pkg/util/intstr/generated.proto";
 

pkg/apis/storage/v1beta1/generated.pb.go

@@ -696,36 +696,36 @@ var (
 )
 
 var fileDescriptorGenerated = []byte{
-	// 481 bytes of a gzipped FileDescriptorProto
+	// 483 bytes of a gzipped FileDescriptorProto
 	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x9c, 0x92, 0xcf, 0x8b, 0xd3, 0x40,
-	0x14, 0xc7, 0x93, 0x96, 0xe2, 0xee, 0x54, 0xb1, 0x44, 0x0f, 0xa5, 0x87, 0x6c, 0xd9, 0x53, 0x15,
+	0x14, 0xc7, 0x3b, 0x2d, 0xc5, 0xdd, 0xa9, 0x62, 0x89, 0x1e, 0x4a, 0x0f, 0xd9, 0xb2, 0xa7, 0x2a,
-	0x9d, 0xb1, 0x45, 0xa5, 0x2c, 0x78, 0xa9, 0x08, 0x0a, 0x8a, 0x4b, 0xbc, 0x89, 0x82, 0x93, 0xec,
+	0x3a, 0x63, 0x17, 0x95, 0xb2, 0xe0, 0xa5, 0x22, 0x28, 0x28, 0x2e, 0xf1, 0x26, 0x0a, 0x4e, 0xb2,
-	0x33, 0x1d, 0xd3, 0x64, 0xc2, 0xcc, 0x4b, 0xa0, 0xe0, 0xc1, 0x3f, 0xc1, 0x3f, 0xab, 0x37, 0xf7,
+	0xcf, 0x74, 0x4c, 0x93, 0x09, 0x33, 0x2f, 0x81, 0x82, 0x07, 0xff, 0x04, 0xff, 0xac, 0xde, 0xdc,
-	0xe8, 0x69, 0xb1, 0xd1, 0x3f, 0x44, 0xf2, 0xc3, 0x4d, 0xd8, 0x6c, 0x71, 0xd9, 0x5b, 0xde, 0xcc,
+	0xa3, 0xa7, 0xc5, 0x46, 0xff, 0x10, 0xc9, 0x8f, 0xdd, 0x84, 0x76, 0x57, 0x97, 0xbd, 0xe5, 0xcd,
-	0xfb, 0x7c, 0xdf, 0xf7, 0x7d, 0x27, 0xe4, 0x28, 0x98, 0x6b, 0x2a, 0x24, 0x0b, 0x12, 0x17, 0x54,
+	0xbc, 0xcf, 0xf7, 0x7d, 0xdf, 0x77, 0x42, 0x0f, 0x83, 0xa9, 0x61, 0x52, 0xf1, 0x20, 0x71, 0x41,
-	0x04, 0x08, 0x9a, 0xc5, 0x81, 0xcf, 0x78, 0x2c, 0x34, 0xd3, 0x28, 0x15, 0xf7, 0x81, 0xa5, 0x53,
+	0x47, 0x80, 0x60, 0x78, 0x1c, 0xf8, 0x5c, 0xc4, 0xd2, 0x70, 0x83, 0x4a, 0x0b, 0x1f, 0x78, 0x3a,
-	0x17, 0x90, 0x4f, 0x99, 0x0f, 0x11, 0x28, 0x8e, 0x70, 0x42, 0x63, 0x25, 0x51, 0x5a, 0xf7, 0x4b,
+	0x71, 0x01, 0xc5, 0x84, 0xfb, 0x10, 0x81, 0x16, 0x08, 0xc7, 0x2c, 0xd6, 0x0a, 0x95, 0x75, 0xbf,
-	0x96, 0xd6, 0x2c, 0x8d, 0x03, 0x9f, 0xe6, 0x2c, 0xad, 0x58, 0x5a, 0xb1, 0xa3, 0x87, 0xbe, 0xc0,
+	0x64, 0x59, 0xcd, 0xb2, 0x38, 0xf0, 0x59, 0xce, 0xb2, 0x8a, 0x65, 0x15, 0x3b, 0x7c, 0xe8, 0x4b,
-	0x65, 0xe2, 0x52, 0x4f, 0x86, 0xcc, 0x97, 0xbe, 0x64, 0x85, 0x84, 0x9b, 0x7c, 0x2e, 0xaa, 0xa2,
+	0x9c, 0x27, 0x2e, 0xf3, 0x54, 0xc8, 0x7d, 0xe5, 0x2b, 0x5e, 0x48, 0xb8, 0xc9, 0xe7, 0xa2, 0x2a,
-	0x28, 0xbe, 0x4a, 0xe9, 0xd1, 0xe3, 0xca, 0x16, 0x8f, 0x45, 0xc8, 0xbd, 0xa5, 0x88, 0x40, 0xad,
+	0x8a, 0xe2, 0xab, 0x94, 0x1e, 0x3e, 0xae, 0x6c, 0x89, 0x58, 0x86, 0xc2, 0x9b, 0xcb, 0x08, 0xf4,
-	0x6b, 0x63, 0x21, 0x20, 0x67, 0x69, 0xcb, 0xd0, 0x88, 0xed, 0xa2, 0x54, 0x12, 0xa1, 0x08, 0xa1,
+	0xf2, 0xcc, 0x18, 0xd7, 0x60, 0x54, 0xa2, 0x3d, 0xd8, 0x34, 0xf4, 0x4f, 0xca, 0xf0, 0x10, 0x50,
-	0x05, 0x3c, 0xfd, 0x1f, 0xa0, 0xbd, 0x25, 0x84, 0xbc, 0xc5, 0xcd, 0x76, 0xa6, 0xc6, 0x14, 0x68,
+	0xf0, 0x74, 0x6b, 0x8d, 0x21, 0xbf, 0x8c, 0xd2, 0x49, 0x84, 0x32, 0xdc, 0x1e, 0xf3, 0xf4, 0x7f,
-	0x99, 0x28, 0xaf, 0x3d, 0xeb, 0xc1, 0x6e, 0xe6, 0x92, 0x55, 0xa6, 0x97, 0x77, 0x27, 0x28, 0x56,
+	0x80, 0xf1, 0xe6, 0x10, 0x8a, 0x2d, 0xee, 0xc1, 0xa5, 0x59, 0x5f, 0x64, 0x6b, 0x72, 0x71, 0x77,
-	0x4c, 0x44, 0xa8, 0x51, 0x5d, 0x44, 0x0e, 0xff, 0x74, 0xc8, 0xcd, 0x77, 0x65, 0xec, 0xcf, 0x57,
+	0x82, 0x72, 0xc1, 0x65, 0x84, 0x06, 0xf5, 0x26, 0xb2, 0xff, 0xa7, 0x4d, 0x6f, 0xbe, 0x2b, 0x83,
-	0x5c, 0x6b, 0xeb, 0x13, 0xd9, 0xcb, 0x93, 0x3a, 0xe1, 0xc8, 0x87, 0xe6, 0xd8, 0x9c, 0xf4, 0x67,
+	0x7f, 0xbe, 0x10, 0xc6, 0x58, 0x9f, 0xe8, 0x4e, 0xbe, 0xf5, 0xb1, 0x40, 0x31, 0x20, 0x23, 0x32,
-	0x8f, 0x68, 0xf5, 0x64, 0xcd, 0x85, 0xeb, 0x47, 0xcb, 0xbb, 0x69, 0x3a, 0xa5, 0x6f, 0xdd, 0x2f,
+	0xee, 0x1d, 0x3c, 0x62, 0xd5, 0xa3, 0x35, 0xcd, 0xd7, 0xcf, 0x96, 0x77, 0xb3, 0x74, 0xc2, 0xde,
-	0xe0, 0xe1, 0x1b, 0x40, 0xbe, 0xb0, 0x36, 0x67, 0x07, 0x46, 0x76, 0x76, 0x40, 0xea, 0x33, 0xe7,
+	0xba, 0x5f, 0xc0, 0xc3, 0x37, 0x80, 0x62, 0x66, 0xad, 0x4e, 0xf7, 0x5a, 0xd9, 0xe9, 0x1e, 0xad,
-	0x5c, 0xd5, 0x7a, 0x42, 0xfa, 0xb1, 0x92, 0xa9, 0xd0, 0x42, 0x46, 0xa0, 0x86, 0x9d, 0xb1, 0x39,
+	0xcf, 0x9c, 0x73, 0x55, 0xeb, 0x09, 0xed, 0xc5, 0x5a, 0xa5, 0xd2, 0x48, 0x15, 0x81, 0x1e, 0xb4,
-	0xd9, 0x5f, 0xdc, 0xa9, 0x90, 0xfe, 0x71, 0x7d, 0xe5, 0x34, 0xfb, 0xac, 0xaf, 0x84, 0xc4, 0x5c,
+	0x47, 0x64, 0xbc, 0x3b, 0xbb, 0x53, 0x21, 0xbd, 0xa3, 0xfa, 0xca, 0x69, 0xf6, 0x59, 0x5f, 0x29,
-	0xf1, 0x10, 0x10, 0x94, 0x1e, 0x76, 0xc7, 0xdd, 0x49, 0x7f, 0xf6, 0x92, 0x5e, 0xfd, 0x6f, 0xa2,
+	0x8d, 0x85, 0x16, 0x21, 0x20, 0x68, 0x33, 0xe8, 0x8c, 0x3a, 0xe3, 0xde, 0xc1, 0x4b, 0x76, 0xf5,
-	0xcd, 0x35, 0xe9, 0xf1, 0xb9, 0xd4, 0x8b, 0x08, 0xd5, 0xba, 0xb6, 0x5c, 0x5f, 0x38, 0x8d, 0x79,
+	0xff, 0x89, 0x35, 0xd7, 0x64, 0x47, 0xe7, 0x52, 0x2f, 0x22, 0xd4, 0xcb, 0xda, 0x72, 0x7d, 0xe1,
-	0xa3, 0x67, 0xe4, 0xf6, 0x05, 0xc4, 0x1a, 0x90, 0x6e, 0x00, 0xeb, 0x22, 0xa4, 0x7d, 0x27, 0xff,
+	0x34, 0xe6, 0x0d, 0x9f, 0xd1, 0xdb, 0x1b, 0x88, 0xd5, 0xa7, 0x9d, 0x00, 0x96, 0x45, 0x48, 0xbb,
-	0xb4, 0xee, 0x92, 0x5e, 0xca, 0x57, 0x09, 0x94, 0x3b, 0x39, 0x65, 0x71, 0xd4, 0x99, 0x9b, 0x87,
+	0x4e, 0xfe, 0x69, 0xdd, 0xa5, 0xdd, 0x54, 0x2c, 0x12, 0x28, 0x77, 0x72, 0xca, 0xe2, 0xb0, 0x3d,
-	0x3f, 0x4c, 0x32, 0x68, 0xce, 0x7f, 0x2d, 0x34, 0x5a, 0x1f, 0x5a, 0x51, 0xd3, 0xab, 0x45, 0x9d,
+	0x25, 0xfb, 0x3f, 0x08, 0xed, 0x37, 0xe7, 0xbf, 0x96, 0x06, 0xad, 0x0f, 0x5b, 0x51, 0xb3, 0xab,
-	0xd3, 0x45, 0xd0, 0x83, 0xca, 0xf5, 0xde, 0xbf, 0x93, 0x46, 0xcc, 0x1f, 0x49, 0x4f, 0x20, 0x84,
+	0x45, 0x9d, 0xd3, 0x45, 0xd0, 0xfd, 0xca, 0xf5, 0xce, 0xd9, 0x49, 0x23, 0xe6, 0x8f, 0xb4, 0x2b,
-	0x7a, 0xd8, 0x29, 0xa2, 0x9a, 0x5f, 0x37, 0xaa, 0xc5, 0xad, 0x6a, 0x48, 0xef, 0x55, 0x2e, 0xe7,
+	0x11, 0x42, 0x33, 0x68, 0x17, 0x51, 0x4d, 0xaf, 0x1b, 0xd5, 0xec, 0x56, 0x35, 0xa4, 0xfb, 0x2a,
-	0x94, 0xaa, 0x8b, 0x7b, 0x9b, 0xad, 0x6d, 0x9c, 0x6e, 0x6d, 0xe3, 0xe7, 0xd6, 0x36, 0xbe, 0x65,
+	0x97, 0x73, 0x4a, 0xd5, 0xd9, 0xbd, 0xd5, 0xda, 0x6e, 0x9d, 0xac, 0xed, 0xd6, 0xcf, 0xb5, 0xdd,
-	0xb6, 0xb9, 0xc9, 0x6c, 0xf3, 0x34, 0xb3, 0xcd, 0x5f, 0x99, 0x6d, 0x7e, 0xff, 0x6d, 0x1b, 0xef,
+	0xfa, 0x96, 0xd9, 0x64, 0x95, 0xd9, 0xe4, 0x24, 0xb3, 0xc9, 0xaf, 0xcc, 0x26, 0xdf, 0x7f, 0xdb,
-	0x6f, 0x54, 0x6a, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0xfe, 0xb6, 0x02, 0x5f, 0x2f, 0x04, 0x00,
+	0xad, 0xf7, 0x37, 0x2a, 0xb5, 0xbf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x87, 0x2f, 0x57, 0x0f, 0x31,
-	0x00,
+	0x04, 0x00, 0x00,
 }

pkg/apis/storage/v1beta1/generated.proto

@@ -21,10 +21,10 @@ syntax = 'proto2';
 
 package k8s.io.kubernetes.pkg.apis.storage.v1beta1;
 
+import "k8s.io/apimachinery/pkg/api/resource/generated.proto";
 import "k8s.io/apimachinery/pkg/apis/meta/v1/generated.proto";
 import "k8s.io/apimachinery/pkg/runtime/generated.proto";
 import "k8s.io/apimachinery/pkg/runtime/schema/generated.proto";
-import "k8s.io/apimachinery/pkg/api/resource/generated.proto";
 import "k8s.io/kubernetes/pkg/api/v1/generated.proto";
 import "k8s.io/kubernetes/pkg/util/intstr/generated.proto";
 

pkg/client/unversioned/testclient/simple/BUILD

@@ -15,6 +15,7 @@ go_library(
         "//pkg/api:go_default_library",
         "//pkg/api/testapi:go_default_library",
         "//pkg/client/clientset_generated/internalclientset:go_default_library",
+        "//vendor:k8s.io/apimachinery/pkg/api/equality",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/fields",
         "//vendor:k8s.io/apimachinery/pkg/labels",

pkg/cloudprovider/providers/mesos/BUILD

@@ -18,7 +18,6 @@ go_library(
     ],
     tags = ["automanaged"],
     deps = [
-        "//pkg/api/resource:go_default_library",
         "//pkg/api/v1:go_default_library",
         "//pkg/cloudprovider:go_default_library",
         "//vendor:github.com/golang/glog",
@@ -27,6 +26,7 @@ go_library(
         "//vendor:github.com/mesos/mesos-go/mesosproto",
         "//vendor:golang.org/x/net/context",
         "//vendor:gopkg.in/gcfg.v1",
+        "//vendor:k8s.io/apimachinery/pkg/api/resource",
         "//vendor:k8s.io/apimachinery/pkg/types",
         "//vendor:k8s.io/apimachinery/pkg/util/net",
     ],

pkg/cloudprovider/providers/openstack/BUILD

@@ -20,7 +20,6 @@ go_library(
     ],
     tags = ["automanaged"],
     deps = [
-        "//pkg/api/resource:go_default_library",
         "//pkg/api/v1:go_default_library",
         "//pkg/api/v1/service:go_default_library",
         "//pkg/cloudprovider:go_default_library",
@@ -53,6 +52,7 @@ go_library(
         "//vendor:github.com/rackspace/gophercloud/openstack/networking/v2/ports",
         "//vendor:github.com/rackspace/gophercloud/pagination",
         "//vendor:gopkg.in/gcfg.v1",
+        "//vendor:k8s.io/apimachinery/pkg/api/resource",
         "//vendor:k8s.io/apimachinery/pkg/types",
     ],
 )

pkg/controller/BUILD

@@ -60,6 +60,7 @@ go_test(
         "//pkg/client/clientset_generated/clientset:go_default_library",
         "//pkg/client/record:go_default_library",
         "//pkg/securitycontext:go_default_library",
+        "//vendor:k8s.io/apimachinery/pkg/api/equality",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/runtime",
         "//vendor:k8s.io/apimachinery/pkg/util/sets",

pkg/controller/daemon/BUILD

@@ -47,7 +47,6 @@ go_test(
     tags = ["automanaged"],
     deps = [
         "//pkg/api:go_default_library",
-        "//pkg/api/resource:go_default_library",
         "//pkg/api/testapi:go_default_library",
         "//pkg/api/v1:go_default_library",
         "//pkg/apis/extensions/v1beta1:go_default_library",
@@ -55,6 +54,7 @@ go_test(
         "//pkg/controller:go_default_library",
         "//pkg/controller/informers:go_default_library",
         "//pkg/securitycontext:go_default_library",
+        "//vendor:k8s.io/apimachinery/pkg/api/resource",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/runtime",
         "//vendor:k8s.io/apiserver/pkg/storage/names",

pkg/controller/deployment/BUILD

@@ -34,6 +34,7 @@ go_library(
         "//pkg/util/metrics:go_default_library",
         "//pkg/util/workqueue:go_default_library",
         "//vendor:github.com/golang/glog",
+        "//vendor:k8s.io/apimachinery/pkg/api/equality",
         "//vendor:k8s.io/apimachinery/pkg/api/errors",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/labels",

pkg/controller/deployment/util/BUILD

@@ -32,6 +32,7 @@ go_library(
         "//pkg/util/intstr:go_default_library",
         "//pkg/util/labels:go_default_library",
         "//vendor:github.com/golang/glog",
+        "//vendor:k8s.io/apimachinery/pkg/api/equality",
         "//vendor:k8s.io/apimachinery/pkg/api/meta",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/labels",
@@ -57,6 +58,7 @@ go_test(
         "//pkg/client/clientset_generated/clientset/fake:go_default_library",
         "//pkg/util/intstr:go_default_library",
         "//vendor:github.com/stretchr/testify/assert",
+        "//vendor:k8s.io/apimachinery/pkg/api/equality",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/runtime",
         "//vendor:k8s.io/client-go/testing",

pkg/controller/job/BUILD

@@ -53,6 +53,7 @@ go_test(
         "//pkg/client/clientset_generated/clientset/fake:go_default_library",
         "//pkg/controller:go_default_library",
         "//pkg/controller/informers:go_default_library",
+        "//vendor:k8s.io/apimachinery/pkg/api/equality",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/util/rand",
         "//vendor:k8s.io/apimachinery/pkg/util/wait",

pkg/controller/node/BUILD

@@ -36,6 +36,7 @@ go_library(
         "//pkg/util/version:go_default_library",
         "//vendor:github.com/golang/glog",
         "//vendor:github.com/prometheus/client_golang/prometheus",
+        "//vendor:k8s.io/apimachinery/pkg/api/equality",
         "//vendor:k8s.io/apimachinery/pkg/api/errors",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/fields",
@@ -61,8 +62,6 @@ go_test(
     library = ":go_default_library",
     tags = ["automanaged"],
     deps = [
-        "//pkg/api:go_default_library",
-        "//pkg/api/resource:go_default_library",
         "//pkg/api/v1:go_default_library",
         "//pkg/apis/extensions/v1beta1:go_default_library",
         "//pkg/client/clientset_generated/clientset:go_default_library",
@@ -74,6 +73,8 @@ go_test(
         "//pkg/controller/node/testutil:go_default_library",
         "//pkg/util/node:go_default_library",
         "//vendor:github.com/golang/glog",
+        "//vendor:k8s.io/apimachinery/pkg/api/equality",
+        "//vendor:k8s.io/apimachinery/pkg/api/resource",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/types",
         "//vendor:k8s.io/apimachinery/pkg/util/diff",

pkg/controller/node/testutil/BUILD

@@ -13,12 +13,12 @@ go_library(
     tags = ["automanaged"],
     deps = [
         "//pkg/api:go_default_library",
-        "//pkg/api/resource:go_default_library",
         "//pkg/api/v1:go_default_library",
         "//pkg/client/clientset_generated/clientset/fake:go_default_library",
         "//pkg/client/clientset_generated/clientset/typed/core/v1:go_default_library",
         "//pkg/util/node:go_default_library",
         "//vendor:k8s.io/apimachinery/pkg/api/errors",
+        "//vendor:k8s.io/apimachinery/pkg/api/resource",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/runtime",
         "//vendor:k8s.io/apimachinery/pkg/types",

pkg/controller/podautoscaler/BUILD

@@ -17,7 +17,6 @@ go_library(
     ],
     tags = ["automanaged"],
     deps = [
-        "//pkg/api/resource:go_default_library",
         "//pkg/api/v1:go_default_library",
         "//pkg/apis/autoscaling/v1:go_default_library",
         "//pkg/apis/extensions/v1beta1:go_default_library",
@@ -27,6 +26,7 @@ go_library(
         "//pkg/client/record:go_default_library",
         "//pkg/controller/podautoscaler/metrics:go_default_library",
         "//vendor:github.com/golang/glog",
+        "//vendor:k8s.io/apimachinery/pkg/api/resource",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/labels",
         "//vendor:k8s.io/apimachinery/pkg/runtime",
@@ -46,7 +46,6 @@ go_test(
     library = ":go_default_library",
     tags = ["automanaged"],
     deps = [
-        "//pkg/api/resource:go_default_library",
         "//pkg/api/unversioned:go_default_library",
         "//pkg/api/v1:go_default_library",
         "//pkg/apis/autoscaling/v1:go_default_library",
@@ -57,6 +56,7 @@ go_test(
         "//pkg/controller/podautoscaler/metrics:go_default_library",
         "//vendor:github.com/stretchr/testify/assert",
         "//vendor:github.com/stretchr/testify/require",
+        "//vendor:k8s.io/apimachinery/pkg/api/resource",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/runtime",
         "//vendor:k8s.io/apimachinery/pkg/watch",

pkg/controller/podautoscaler/metrics/BUILD

@@ -33,11 +33,11 @@ go_test(
     library = ":go_default_library",
     tags = ["automanaged"],
     deps = [
-        "//pkg/api/resource:go_default_library",
         "//pkg/api/unversioned:go_default_library",
         "//pkg/api/v1:go_default_library",
         "//pkg/client/clientset_generated/clientset/fake:go_default_library",
         "//vendor:github.com/stretchr/testify/assert",
+        "//vendor:k8s.io/apimachinery/pkg/api/resource",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/labels",
         "//vendor:k8s.io/apimachinery/pkg/runtime",

pkg/controller/replicaset/BUILD

@@ -57,6 +57,7 @@ go_test(
         "//pkg/controller:go_default_library",
         "//pkg/controller/informers:go_default_library",
         "//pkg/securitycontext:go_default_library",
+        "//vendor:k8s.io/apimachinery/pkg/api/equality",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/runtime",
         "//vendor:k8s.io/apimachinery/pkg/util/sets",

pkg/controller/replication/BUILD

@@ -24,7 +24,6 @@ go_library(
         "//pkg/client/record:go_default_library",
         "//pkg/controller:go_default_library",
         "//pkg/controller/informers:go_default_library",
-        "//pkg/util:go_default_library",
         "//pkg/util/metrics:go_default_library",
         "//pkg/util/workqueue:go_default_library",
         "//vendor:github.com/golang/glog",
@@ -35,6 +34,7 @@ go_library(
         "//vendor:k8s.io/apimachinery/pkg/util/errors",
         "//vendor:k8s.io/apimachinery/pkg/util/runtime",
         "//vendor:k8s.io/apimachinery/pkg/util/wait",
+        "//vendor:k8s.io/apiserver/pkg/util/trace",
         "//vendor:k8s.io/client-go/tools/cache",
     ],
 )
@@ -53,6 +53,7 @@ go_test(
         "//pkg/controller:go_default_library",
         "//pkg/controller/informers:go_default_library",
         "//pkg/securitycontext:go_default_library",
+        "//vendor:k8s.io/apimachinery/pkg/api/equality",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/runtime",
         "//vendor:k8s.io/apimachinery/pkg/util/sets",

pkg/controller/resourcequota/BUILD

@@ -27,6 +27,7 @@ go_library(
         "//pkg/util/metrics:go_default_library",
         "//pkg/util/workqueue:go_default_library",
         "//vendor:github.com/golang/glog",
+        "//vendor:k8s.io/apimachinery/pkg/api/equality",
         "//vendor:k8s.io/apimachinery/pkg/api/meta",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/runtime",
@@ -48,13 +49,13 @@ go_test(
     tags = ["automanaged"],
     deps = [
         "//pkg/api:go_default_library",
-        "//pkg/api/resource:go_default_library",
         "//pkg/api/v1:go_default_library",
         "//pkg/client/clientset_generated/clientset/fake:go_default_library",
         "//pkg/controller:go_default_library",
         "//pkg/quota/generic:go_default_library",
         "//pkg/quota/install:go_default_library",
         "//pkg/util/intstr:go_default_library",
+        "//vendor:k8s.io/apimachinery/pkg/api/resource",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/runtime",
         "//vendor:k8s.io/apimachinery/pkg/runtime/schema",

pkg/controller/statefulset/BUILD

@@ -20,7 +20,6 @@ go_library(
     ],
     tags = ["automanaged"],
     deps = [
-        "//pkg/api/resource:go_default_library",
         "//pkg/api/v1:go_default_library",
         "//pkg/api/v1/pod:go_default_library",
         "//pkg/apis/apps/v1beta1:go_default_library",
@@ -34,6 +33,7 @@ go_library(
         "//vendor:github.com/golang/glog",
         "//vendor:gopkg.in/inf.v0",
         "//vendor:k8s.io/apimachinery/pkg/api/errors",
+        "//vendor:k8s.io/apimachinery/pkg/api/resource",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/runtime",
         "//vendor:k8s.io/apimachinery/pkg/types",

pkg/controller/volume/persistentvolume/BUILD

@@ -60,7 +60,6 @@ go_test(
     tags = ["automanaged"],
     deps = [
         "//pkg/api:go_default_library",
-        "//pkg/api/resource:go_default_library",
         "//pkg/api/testapi:go_default_library",
         "//pkg/api/v1:go_default_library",
         "//pkg/apis/storage/v1beta1:go_default_library",
@@ -71,6 +70,7 @@ go_test(
         "//pkg/controller/volume/persistentvolume/testing:go_default_library",
         "//pkg/volume:go_default_library",
         "//vendor:github.com/golang/glog",
+        "//vendor:k8s.io/apimachinery/pkg/api/resource",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/runtime",
         "//vendor:k8s.io/apimachinery/pkg/types",

pkg/fieldpath/BUILD

@@ -17,9 +17,9 @@ go_library(
     tags = ["automanaged"],
     deps = [
         "//pkg/api:go_default_library",
-        "//pkg/api/resource:go_default_library",
         "//pkg/api/v1:go_default_library",
         "//vendor:k8s.io/apimachinery/pkg/api/meta",
+        "//vendor:k8s.io/apimachinery/pkg/api/resource",
     ],
 )
 
@@ -29,9 +29,9 @@ go_test(
     library = ":go_default_library",
     tags = ["automanaged"],
     deps = [
-        "//pkg/api/resource:go_default_library",
         "//pkg/api/v1:go_default_library",
         "//vendor:github.com/stretchr/testify/assert",
+        "//vendor:k8s.io/apimachinery/pkg/api/resource",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
     ],
 )

pkg/generated/openapi/BUILD

@@ -15,9 +15,9 @@ go_library(
     ],
     tags = ["automanaged"],
     deps = [
-        "//pkg/api/resource:go_default_library",
         "//pkg/util/intstr:go_default_library",
         "//vendor:github.com/go-openapi/spec",
+        "//vendor:k8s.io/apimachinery/pkg/api/resource",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/openapi",
     ],

pkg/genericapiserver/endpoints/BUILD

@@ -31,8 +31,10 @@ go_test(
         "//plugin/pkg/admission/deny:go_default_library",
         "//vendor:github.com/emicklei/go-restful",
         "//vendor:golang.org/x/net/websocket",
+        "//vendor:k8s.io/apimachinery/pkg/api/equality",
         "//vendor:k8s.io/apimachinery/pkg/api/errors",
         "//vendor:k8s.io/apimachinery/pkg/api/meta",
+        "//vendor:k8s.io/apimachinery/pkg/api/testing",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/internalversion",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/fields",

pkg/genericapiserver/endpoints/handlers/BUILD

@@ -20,6 +20,7 @@ go_test(
         "//pkg/genericapiserver/registry/rest:go_default_library",
         "//vendor:github.com/emicklei/go-restful",
         "//vendor:github.com/evanphx/json-patch",
+        "//vendor:k8s.io/apimachinery/pkg/api/equality",
         "//vendor:k8s.io/apimachinery/pkg/api/errors",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/runtime",
@@ -45,7 +46,6 @@ go_library(
     deps = [
         "//pkg/genericapiserver/endpoints/handlers/responsewriters:go_default_library",
         "//pkg/genericapiserver/registry/rest:go_default_library",
-        "//pkg/util:go_default_library",
         "//vendor:github.com/emicklei/go-restful",
         "//vendor:github.com/evanphx/json-patch",
         "//vendor:github.com/golang/glog",
@@ -70,6 +70,7 @@ go_library(
         "//vendor:k8s.io/apiserver/pkg/endpoints/request",
         "//vendor:k8s.io/apiserver/pkg/server/httplog",
         "//vendor:k8s.io/apiserver/pkg/util/proxy",
+        "//vendor:k8s.io/apiserver/pkg/util/trace",
         "//vendor:k8s.io/apiserver/pkg/util/wsstream",
     ],
 )

pkg/genericapiserver/registry/generic/registry/BUILD

@@ -64,6 +64,7 @@ go_test(
         "//pkg/storage/etcd/testing:go_default_library",
         "//pkg/storage/storagebackend/factory:go_default_library",
         "//pkg/storage/testing:go_default_library",
+        "//vendor:k8s.io/apimachinery/pkg/api/equality",
         "//vendor:k8s.io/apimachinery/pkg/api/errors",
         "//vendor:k8s.io/apimachinery/pkg/api/meta",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/internalversion",

pkg/genericapiserver/registry/rest/resttest/BUILD

@@ -14,6 +14,7 @@ go_library(
     deps = [
         "//pkg/api:go_default_library",
         "//pkg/genericapiserver/registry/rest:go_default_library",
+        "//vendor:k8s.io/apimachinery/pkg/api/equality",
         "//vendor:k8s.io/apimachinery/pkg/api/errors",
         "//vendor:k8s.io/apimachinery/pkg/api/validation/path",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/internalversion",

pkg/kubectl/BUILD

@@ -57,7 +57,6 @@ go_library(
         "//pkg/api:go_default_library",
         "//pkg/api/annotations:go_default_library",
         "//pkg/api/events:go_default_library",
-        "//pkg/api/resource:go_default_library",
         "//pkg/api/util:go_default_library",
         "//pkg/api/v1:go_default_library",
         "//pkg/apis/apps:go_default_library",
@@ -96,6 +95,7 @@ go_library(
         "//vendor:github.com/spf13/pflag",
         "//vendor:k8s.io/apimachinery/pkg/api/errors",
         "//vendor:k8s.io/apimachinery/pkg/api/meta",
+        "//vendor:k8s.io/apimachinery/pkg/api/resource",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1/unstructured",
         "//vendor:k8s.io/apimachinery/pkg/fields",
@@ -151,7 +151,6 @@ go_test(
         "//federation/apis/federation/v1beta1:go_default_library",
         "//federation/client/clientset_generated/federation_internalclientset/fake:go_default_library",
         "//pkg/api:go_default_library",
-        "//pkg/api/resource:go_default_library",
         "//pkg/api/testapi:go_default_library",
         "//pkg/api/testing:go_default_library",
         "//pkg/api/v1:go_default_library",
@@ -172,7 +171,9 @@ go_test(
         "//pkg/util/intstr:go_default_library",
         "//vendor:github.com/ghodss/yaml",
         "//vendor:github.com/spf13/cobra",
+        "//vendor:k8s.io/apimachinery/pkg/api/equality",
         "//vendor:k8s.io/apimachinery/pkg/api/errors",
+        "//vendor:k8s.io/apimachinery/pkg/api/resource",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/runtime",
         "//vendor:k8s.io/apimachinery/pkg/runtime/schema",

pkg/kubectl/cmd/BUILD

@@ -174,7 +174,6 @@ go_test(
     deps = [
         "//pkg/api:go_default_library",
         "//pkg/api/annotations:go_default_library",
-        "//pkg/api/resource:go_default_library",
         "//pkg/api/testapi:go_default_library",
         "//pkg/api/testing:go_default_library",
         "//pkg/api/unversioned:go_default_library",
@@ -191,8 +190,10 @@ go_test(
         "//pkg/util/term:go_default_library",
         "//vendor:github.com/spf13/cobra",
         "//vendor:github.com/stretchr/testify/assert",
+        "//vendor:k8s.io/apimachinery/pkg/api/equality",
         "//vendor:k8s.io/apimachinery/pkg/api/errors",
         "//vendor:k8s.io/apimachinery/pkg/api/meta",
+        "//vendor:k8s.io/apimachinery/pkg/api/resource",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/runtime",
         "//vendor:k8s.io/apimachinery/pkg/runtime/schema",

pkg/kubectl/cmd/config/BUILD

@@ -57,8 +57,8 @@ go_test(
     library = ":go_default_library",
     tags = ["automanaged"],
     deps = [
-        "//pkg/api:go_default_library",
         "//pkg/kubectl/cmd/util:go_default_library",
+        "//vendor:k8s.io/apimachinery/pkg/api/equality",
         "//vendor:k8s.io/apimachinery/pkg/util/diff",
         "//vendor:k8s.io/apiserver/pkg/util/flag",
         "//vendor:k8s.io/client-go/tools/clientcmd",

pkg/kubectl/metricsutil/BUILD

@@ -16,10 +16,10 @@ go_library(
     tags = ["automanaged"],
     deps = [
         "//pkg/api:go_default_library",
-        "//pkg/api/resource:go_default_library",
         "//pkg/api/validation:go_default_library",
         "//pkg/client/clientset_generated/internalclientset/typed/core/internalversion:go_default_library",
         "//pkg/kubectl:go_default_library",
+        "//vendor:k8s.io/apimachinery/pkg/api/resource",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/labels",
         "//vendor:k8s.io/apimachinery/pkg/runtime/schema",

pkg/kubectl/resource/BUILD

@@ -60,13 +60,14 @@ go_test(
     ],
     deps = [
         "//pkg/api:go_default_library",
-        "//pkg/api/resource:go_default_library",
         "//pkg/api/testapi:go_default_library",
         "//pkg/api/testing:go_default_library",
         "//pkg/api/v1:go_default_library",
         "//vendor:github.com/ghodss/yaml",
         "//vendor:github.com/stretchr/testify/assert",
+        "//vendor:k8s.io/apimachinery/pkg/api/equality",
         "//vendor:k8s.io/apimachinery/pkg/api/meta",
+        "//vendor:k8s.io/apimachinery/pkg/api/resource",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/labels",
         "//vendor:k8s.io/apimachinery/pkg/runtime",

pkg/kubelet/BUILD

@@ -36,7 +36,6 @@ go_library(
     deps = [
         "//cmd/kubelet/app/options:go_default_library",
         "//pkg/api:go_default_library",
-        "//pkg/api/resource:go_default_library",
         "//pkg/api/v1:go_default_library",
         "//pkg/api/v1/pod:go_default_library",
         "//pkg/api/v1/validation:go_default_library",
@@ -111,6 +110,7 @@ go_library(
         "//vendor:github.com/google/cadvisor/info/v1",
         "//vendor:github.com/google/cadvisor/info/v2",
         "//vendor:k8s.io/apimachinery/pkg/api/errors",
+        "//vendor:k8s.io/apimachinery/pkg/api/resource",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/conversion",
         "//vendor:k8s.io/apimachinery/pkg/fields",
@@ -155,7 +155,6 @@ go_test(
     tags = ["automanaged"],
     deps = [
         "//pkg/api:go_default_library",
-        "//pkg/api/resource:go_default_library",
         "//pkg/api/v1:go_default_library",
         "//pkg/apis/componentconfig:go_default_library",
         "//pkg/capabilities:go_default_library",
@@ -195,7 +194,9 @@ go_test(
         "//vendor:github.com/google/cadvisor/info/v2",
         "//vendor:github.com/stretchr/testify/assert",
         "//vendor:github.com/stretchr/testify/require",
+        "//vendor:k8s.io/apimachinery/pkg/api/equality",
         "//vendor:k8s.io/apimachinery/pkg/api/errors",
+        "//vendor:k8s.io/apimachinery/pkg/api/resource",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/labels",
         "//vendor:k8s.io/apimachinery/pkg/runtime",

pkg/kubelet/cadvisor/BUILD

@@ -18,7 +18,6 @@ go_library(
     ],
     tags = ["automanaged"],
     deps = [
-        "//pkg/api/resource:go_default_library",
         "//pkg/api/v1:go_default_library",
         "//pkg/kubelet/types:go_default_library",
         "//vendor:github.com/golang/glog",
@@ -32,6 +31,7 @@ go_library(
         "//vendor:github.com/google/cadvisor/manager",
         "//vendor:github.com/google/cadvisor/metrics",
         "//vendor:github.com/google/cadvisor/utils/sysfs",
+        "//vendor:k8s.io/apimachinery/pkg/api/resource",
         "//vendor:k8s.io/apimachinery/pkg/util/runtime",
     ],
 )

pkg/kubelet/cm/BUILD

@@ -22,7 +22,6 @@ go_library(
     ],
     tags = ["automanaged"],
     deps = [
-        "//pkg/api/resource:go_default_library",
         "//pkg/api/v1:go_default_library",
         "//pkg/kubelet/cadvisor:go_default_library",
         "//pkg/kubelet/cm/util:go_default_library",
@@ -38,6 +37,7 @@ go_library(
         "//vendor:github.com/opencontainers/runc/libcontainer/cgroups/fs",
         "//vendor:github.com/opencontainers/runc/libcontainer/cgroups/systemd",
         "//vendor:github.com/opencontainers/runc/libcontainer/configs",
+        "//vendor:k8s.io/apimachinery/pkg/api/resource",
         "//vendor:k8s.io/apimachinery/pkg/types",
         "//vendor:k8s.io/apimachinery/pkg/util/errors",
         "//vendor:k8s.io/apimachinery/pkg/util/runtime",
@@ -56,11 +56,11 @@ go_test(
     library = ":go_default_library",
     tags = ["automanaged"],
     deps = [
-        "//pkg/api/resource:go_default_library",
         "//pkg/api/v1:go_default_library",
         "//pkg/util/mount:go_default_library",
         "//vendor:github.com/stretchr/testify/assert",
         "//vendor:github.com/stretchr/testify/require",
+        "//vendor:k8s.io/apimachinery/pkg/api/resource",
     ],
 )
 

pkg/kubelet/config/BUILD

@@ -67,6 +67,7 @@ go_test(
         "//pkg/client/record:go_default_library",
         "//pkg/kubelet/types:go_default_library",
         "//pkg/securitycontext:go_default_library",
+        "//vendor:k8s.io/apimachinery/pkg/api/equality",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/runtime",
         "//vendor:k8s.io/apimachinery/pkg/types",

pkg/kubelet/dockertools/BUILD

@@ -102,7 +102,6 @@ go_test(
         "automanaged",
     ],
     deps = [
-        "//pkg/api:go_default_library",
         "//pkg/api/testapi:go_default_library",
         "//pkg/api/v1:go_default_library",
         "//pkg/apis/componentconfig:go_default_library",
@@ -131,6 +130,7 @@ go_test(
         "//vendor:github.com/golang/mock/gomock",
         "//vendor:github.com/google/cadvisor/info/v1",
         "//vendor:github.com/stretchr/testify/assert",
+        "//vendor:k8s.io/apimachinery/pkg/api/equality",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/runtime",
         "//vendor:k8s.io/apimachinery/pkg/types",

pkg/kubelet/eviction/BUILD

@@ -21,7 +21,6 @@ go_library(
     tags = ["automanaged"],
     deps = [
         "//pkg/api:go_default_library",
-        "//pkg/api/resource:go_default_library",
         "//pkg/api/v1:go_default_library",
         "//pkg/client/record:go_default_library",
         "//pkg/kubelet/api/v1alpha1/stats:go_default_library",
@@ -34,6 +33,7 @@ go_library(
         "//pkg/kubelet/util/format:go_default_library",
         "//pkg/quota/evaluator/core:go_default_library",
         "//vendor:github.com/golang/glog",
+        "//vendor:k8s.io/apimachinery/pkg/api/resource",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/util/sets",
         "//vendor:k8s.io/apimachinery/pkg/util/wait",
@@ -51,13 +51,13 @@ go_test(
     tags = ["automanaged"],
     deps = [
         "//pkg/api:go_default_library",
-        "//pkg/api/resource:go_default_library",
         "//pkg/api/v1:go_default_library",
         "//pkg/client/record:go_default_library",
         "//pkg/kubelet/api/v1alpha1/stats:go_default_library",
         "//pkg/kubelet/lifecycle:go_default_library",
         "//pkg/kubelet/types:go_default_library",
         "//pkg/quota:go_default_library",
+        "//vendor:k8s.io/apimachinery/pkg/api/resource",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/types",
         "//vendor:k8s.io/client-go/util/clock",

pkg/kubelet/qos/BUILD

@@ -18,9 +18,9 @@ go_library(
     tags = ["automanaged"],
     deps = [
         "//pkg/api:go_default_library",
-        "//pkg/api/resource:go_default_library",
         "//pkg/api/v1:go_default_library",
         "//pkg/kubelet/types:go_default_library",
+        "//vendor:k8s.io/apimachinery/pkg/api/resource",
         "//vendor:k8s.io/apimachinery/pkg/util/sets",
     ],
 )
@@ -34,9 +34,9 @@ go_test(
     library = ":go_default_library",
     tags = ["automanaged"],
     deps = [
-        "//pkg/api/resource:go_default_library",
         "//pkg/api/v1:go_default_library",
         "//pkg/kubelet/types:go_default_library",
+        "//vendor:k8s.io/apimachinery/pkg/api/resource",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
     ],
 )

pkg/kubelet/rkt/BUILD

@@ -70,7 +70,6 @@ go_test(
     library = ":go_default_library",
     tags = ["automanaged"],
     deps = [
-        "//pkg/api/resource:go_default_library",
         "//pkg/api/v1:go_default_library",
         "//pkg/kubelet/container:go_default_library",
         "//pkg/kubelet/container/testing:go_default_library",
@@ -88,6 +87,7 @@ go_test(
         "//vendor:github.com/stretchr/testify/assert",
         "//vendor:golang.org/x/net/context",
         "//vendor:google.golang.org/grpc",
+        "//vendor:k8s.io/apimachinery/pkg/api/resource",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/types",
         "//vendor:k8s.io/apimachinery/pkg/util/errors",

pkg/kubelet/status/BUILD

@@ -25,6 +25,7 @@ go_library(
         "//pkg/kubelet/types:go_default_library",
         "//pkg/kubelet/util/format:go_default_library",
         "//vendor:github.com/golang/glog",
+        "//vendor:k8s.io/apimachinery/pkg/api/equality",
         "//vendor:k8s.io/apimachinery/pkg/api/errors",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/types",

pkg/kubelet/util/format/BUILD

@@ -27,8 +27,8 @@ go_test(
     library = ":go_default_library",
     tags = ["automanaged"],
     deps = [
-        "//pkg/api/resource:go_default_library",
         "//pkg/api/v1:go_default_library",
+        "//vendor:k8s.io/apimachinery/pkg/api/resource",
     ],
 )
 

pkg/proxy/config/BUILD

@@ -35,6 +35,7 @@ go_test(
     tags = ["automanaged"],
     deps = [
         "//pkg/api:go_default_library",
+        "//vendor:k8s.io/apimachinery/pkg/api/equality",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/runtime",
         "//vendor:k8s.io/apimachinery/pkg/watch",

pkg/quota/BUILD

@@ -17,8 +17,8 @@ go_library(
     tags = ["automanaged"],
     deps = [
         "//pkg/api:go_default_library",
-        "//pkg/api/resource:go_default_library",
         "//pkg/api/v1:go_default_library",
+        "//vendor:k8s.io/apimachinery/pkg/api/resource",
         "//vendor:k8s.io/apimachinery/pkg/runtime",
         "//vendor:k8s.io/apimachinery/pkg/runtime/schema",
         "//vendor:k8s.io/apimachinery/pkg/util/sets",
@@ -33,7 +33,7 @@ go_test(
     tags = ["automanaged"],
     deps = [
         "//pkg/api:go_default_library",
-        "//pkg/api/resource:go_default_library",
+        "//vendor:k8s.io/apimachinery/pkg/api/resource",
     ],
 )
 

pkg/quota/evaluator/core/BUILD

@@ -24,7 +24,6 @@ go_library(
     tags = ["automanaged"],
     deps = [
         "//pkg/api:go_default_library",
-        "//pkg/api/resource:go_default_library",
         "//pkg/api/v1:go_default_library",
         "//pkg/api/validation:go_default_library",
         "//pkg/apis/storage/util:go_default_library",
@@ -33,6 +32,7 @@ go_library(
         "//pkg/kubelet/qos:go_default_library",
         "//pkg/quota:go_default_library",
         "//pkg/quota/generic:go_default_library",
+        "//vendor:k8s.io/apimachinery/pkg/api/resource",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/runtime",
         "//vendor:k8s.io/apimachinery/pkg/runtime/schema",
@@ -53,10 +53,10 @@ go_test(
     tags = ["automanaged"],
     deps = [
         "//pkg/api:go_default_library",
-        "//pkg/api/resource:go_default_library",
         "//pkg/apis/storage/util:go_default_library",
         "//pkg/client/clientset_generated/clientset/fake:go_default_library",
         "//pkg/quota:go_default_library",
+        "//vendor:k8s.io/apimachinery/pkg/api/resource",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
     ],
 )

pkg/quota/generic/BUILD

@@ -16,9 +16,9 @@ go_library(
     tags = ["automanaged"],
     deps = [
         "//pkg/api:go_default_library",
-        "//pkg/api/resource:go_default_library",
         "//pkg/controller/informers:go_default_library",
         "//pkg/quota:go_default_library",
+        "//vendor:k8s.io/apimachinery/pkg/api/resource",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/labels",
         "//vendor:k8s.io/apimachinery/pkg/runtime",

pkg/registry/core/limitrange/storage/BUILD

@@ -15,10 +15,10 @@ go_test(
     tags = ["automanaged"],
     deps = [
         "//pkg/api:go_default_library",
-        "//pkg/api/resource:go_default_library",
         "//pkg/genericapiserver/registry/generic:go_default_library",
         "//pkg/registry/registrytest:go_default_library",
         "//pkg/storage/etcd/testing:go_default_library",
+        "//vendor:k8s.io/apimachinery/pkg/api/resource",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/fields",
         "//vendor:k8s.io/apimachinery/pkg/labels",

pkg/registry/core/node/storage/BUILD

@@ -15,11 +15,11 @@ go_test(
     tags = ["automanaged"],
     deps = [
         "//pkg/api:go_default_library",
-        "//pkg/api/resource:go_default_library",
         "//pkg/genericapiserver/registry/generic:go_default_library",
         "//pkg/kubelet/client:go_default_library",
         "//pkg/registry/registrytest:go_default_library",
         "//pkg/storage/etcd/testing:go_default_library",
+        "//vendor:k8s.io/apimachinery/pkg/api/resource",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/fields",
         "//vendor:k8s.io/apimachinery/pkg/labels",

pkg/registry/core/persistentvolume/storage/BUILD

@@ -15,11 +15,12 @@ go_test(
     tags = ["automanaged"],
     deps = [
         "//pkg/api:go_default_library",
-        "//pkg/api/resource:go_default_library",
         "//pkg/genericapiserver/registry/generic:go_default_library",
         "//pkg/genericapiserver/registry/rest:go_default_library",
         "//pkg/registry/registrytest:go_default_library",
         "//pkg/storage/etcd/testing:go_default_library",
+        "//vendor:k8s.io/apimachinery/pkg/api/equality",
+        "//vendor:k8s.io/apimachinery/pkg/api/resource",
         "//vendor:k8s.io/apimachinery/pkg/apis/meta/v1",
         "//vendor:k8s.io/apimachinery/pkg/fields",
         "//vendor:k8s.io/apimachinery/pkg/labels",