published by bot

(https://github.com/kubernetes/test-infra/tree/master/mungegithub)

copied from https://github.com/kubernetes/kubernetes.git, branch master,
last commit is c09311fa32be02ebb79c7959447e3e4294cc12a3

Godeps/Godeps.json

@@ -322,165 +322,185 @@
 			"ImportPath": "gopkg.in/yaml.v2",
 			"Rev": "53feefa2559fb8dfa8d81baad31be332c97d6c77"
 		},
+		{
+			"ImportPath": "k8s.io/apimachinery/pkg/api/equality",
+			"Rev": "21807b270ec15d19215659a5caa08b17f66d6f44"
+		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/errors",
-			"Rev": "e0f5fdb097647ab1d282af70228f0a742cf61c65"
+			"Rev": "21807b270ec15d19215659a5caa08b17f66d6f44"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/meta",
-			"Rev": "e0f5fdb097647ab1d282af70228f0a742cf61c65"
+			"Rev": "21807b270ec15d19215659a5caa08b17f66d6f44"
+		},
+		{
+			"ImportPath": "k8s.io/apimachinery/pkg/api/resource",
+			"Rev": "21807b270ec15d19215659a5caa08b17f66d6f44"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apimachinery",
-			"Rev": "e0f5fdb097647ab1d282af70228f0a742cf61c65"
+			"Rev": "21807b270ec15d19215659a5caa08b17f66d6f44"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apimachinery/announced",
-			"Rev": "e0f5fdb097647ab1d282af70228f0a742cf61c65"
+			"Rev": "21807b270ec15d19215659a5caa08b17f66d6f44"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apimachinery/registered",
-			"Rev": "e0f5fdb097647ab1d282af70228f0a742cf61c65"
+			"Rev": "21807b270ec15d19215659a5caa08b17f66d6f44"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1",
-			"Rev": "e0f5fdb097647ab1d282af70228f0a742cf61c65"
+			"Rev": "21807b270ec15d19215659a5caa08b17f66d6f44"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured",
-			"Rev": "e0f5fdb097647ab1d282af70228f0a742cf61c65"
+			"Rev": "21807b270ec15d19215659a5caa08b17f66d6f44"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/conversion",
-			"Rev": "e0f5fdb097647ab1d282af70228f0a742cf61c65"
+			"Rev": "21807b270ec15d19215659a5caa08b17f66d6f44"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/conversion/queryparams",
-			"Rev": "e0f5fdb097647ab1d282af70228f0a742cf61c65"
+			"Rev": "21807b270ec15d19215659a5caa08b17f66d6f44"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/fields",
-			"Rev": "e0f5fdb097647ab1d282af70228f0a742cf61c65"
+			"Rev": "21807b270ec15d19215659a5caa08b17f66d6f44"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/labels",
-			"Rev": "e0f5fdb097647ab1d282af70228f0a742cf61c65"
+			"Rev": "21807b270ec15d19215659a5caa08b17f66d6f44"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/openapi",
-			"Rev": "e0f5fdb097647ab1d282af70228f0a742cf61c65"
+			"Rev": "21807b270ec15d19215659a5caa08b17f66d6f44"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime",
-			"Rev": "e0f5fdb097647ab1d282af70228f0a742cf61c65"
+			"Rev": "21807b270ec15d19215659a5caa08b17f66d6f44"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/schema",
-			"Rev": "e0f5fdb097647ab1d282af70228f0a742cf61c65"
+			"Rev": "21807b270ec15d19215659a5caa08b17f66d6f44"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer",
-			"Rev": "e0f5fdb097647ab1d282af70228f0a742cf61c65"
+			"Rev": "21807b270ec15d19215659a5caa08b17f66d6f44"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/json",
-			"Rev": "e0f5fdb097647ab1d282af70228f0a742cf61c65"
+			"Rev": "21807b270ec15d19215659a5caa08b17f66d6f44"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/protobuf",
-			"Rev": "e0f5fdb097647ab1d282af70228f0a742cf61c65"
+			"Rev": "21807b270ec15d19215659a5caa08b17f66d6f44"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/recognizer",
-			"Rev": "e0f5fdb097647ab1d282af70228f0a742cf61c65"
+			"Rev": "21807b270ec15d19215659a5caa08b17f66d6f44"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/streaming",
-			"Rev": "e0f5fdb097647ab1d282af70228f0a742cf61c65"
+			"Rev": "21807b270ec15d19215659a5caa08b17f66d6f44"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/versioning",
-			"Rev": "e0f5fdb097647ab1d282af70228f0a742cf61c65"
+			"Rev": "21807b270ec15d19215659a5caa08b17f66d6f44"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/selection",
-			"Rev": "e0f5fdb097647ab1d282af70228f0a742cf61c65"
+			"Rev": "21807b270ec15d19215659a5caa08b17f66d6f44"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/types",
-			"Rev": "e0f5fdb097647ab1d282af70228f0a742cf61c65"
+			"Rev": "21807b270ec15d19215659a5caa08b17f66d6f44"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/diff",
-			"Rev": "e0f5fdb097647ab1d282af70228f0a742cf61c65"
+			"Rev": "21807b270ec15d19215659a5caa08b17f66d6f44"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/errors",
-			"Rev": "e0f5fdb097647ab1d282af70228f0a742cf61c65"
+			"Rev": "21807b270ec15d19215659a5caa08b17f66d6f44"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/framer",
-			"Rev": "e0f5fdb097647ab1d282af70228f0a742cf61c65"
+			"Rev": "21807b270ec15d19215659a5caa08b17f66d6f44"
+		},
+		{
+			"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream",
+			"Rev": "21807b270ec15d19215659a5caa08b17f66d6f44"
+		},
+		{
+			"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream/spdy",
+			"Rev": "21807b270ec15d19215659a5caa08b17f66d6f44"
+		},
+		{
+			"ImportPath": "k8s.io/apimachinery/pkg/util/intstr",
+			"Rev": "21807b270ec15d19215659a5caa08b17f66d6f44"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/json",
-			"Rev": "e0f5fdb097647ab1d282af70228f0a742cf61c65"
+			"Rev": "21807b270ec15d19215659a5caa08b17f66d6f44"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/net",
-			"Rev": "e0f5fdb097647ab1d282af70228f0a742cf61c65"
+			"Rev": "21807b270ec15d19215659a5caa08b17f66d6f44"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/rand",
-			"Rev": "e0f5fdb097647ab1d282af70228f0a742cf61c65"
+			"Rev": "21807b270ec15d19215659a5caa08b17f66d6f44"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/runtime",
-			"Rev": "e0f5fdb097647ab1d282af70228f0a742cf61c65"
+			"Rev": "21807b270ec15d19215659a5caa08b17f66d6f44"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/sets",
-			"Rev": "e0f5fdb097647ab1d282af70228f0a742cf61c65"
+			"Rev": "21807b270ec15d19215659a5caa08b17f66d6f44"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/strategicpatch",
-			"Rev": "e0f5fdb097647ab1d282af70228f0a742cf61c65"
+			"Rev": "21807b270ec15d19215659a5caa08b17f66d6f44"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/validation",
-			"Rev": "e0f5fdb097647ab1d282af70228f0a742cf61c65"
+			"Rev": "21807b270ec15d19215659a5caa08b17f66d6f44"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/validation/field",
-			"Rev": "e0f5fdb097647ab1d282af70228f0a742cf61c65"
+			"Rev": "21807b270ec15d19215659a5caa08b17f66d6f44"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/wait",
-			"Rev": "e0f5fdb097647ab1d282af70228f0a742cf61c65"
+			"Rev": "21807b270ec15d19215659a5caa08b17f66d6f44"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/yaml",
-			"Rev": "e0f5fdb097647ab1d282af70228f0a742cf61c65"
+			"Rev": "21807b270ec15d19215659a5caa08b17f66d6f44"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/version",
-			"Rev": "e0f5fdb097647ab1d282af70228f0a742cf61c65"
+			"Rev": "21807b270ec15d19215659a5caa08b17f66d6f44"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/watch",
-			"Rev": "e0f5fdb097647ab1d282af70228f0a742cf61c65"
+			"Rev": "21807b270ec15d19215659a5caa08b17f66d6f44"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/json",
-			"Rev": "e0f5fdb097647ab1d282af70228f0a742cf61c65"
+			"Rev": "21807b270ec15d19215659a5caa08b17f66d6f44"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/netutil",
-			"Rev": "e0f5fdb097647ab1d282af70228f0a742cf61c65"
+			"Rev": "21807b270ec15d19215659a5caa08b17f66d6f44"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect",
-			"Rev": "e0f5fdb097647ab1d282af70228f0a742cf61c65"
+			"Rev": "21807b270ec15d19215659a5caa08b17f66d6f44"
 		}
 	]
 }

pkg/api/conversion.go

@@ -21,13 +21,13 @@ import (
 	"strconv"
 	"strings"
 
+	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/conversion"
 	"k8s.io/apimachinery/pkg/fields"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/client-go/pkg/api/resource"
+	"k8s.io/apimachinery/pkg/util/intstr"
-	"k8s.io/client-go/pkg/util/intstr"
 	utillabels "k8s.io/client-go/pkg/util/labels"
 )
 

pkg/api/helpers.go

@@ -25,6 +25,7 @@ import (
 
 	"github.com/davecgh/go-spew/spew"
 
+	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/conversion"
 	"k8s.io/apimachinery/pkg/fields"
@@ -32,7 +33,6 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/selection"
 	"k8s.io/apimachinery/pkg/util/sets"
-	"k8s.io/client-go/pkg/api/resource"
 )
 
 // Conversion error conveniently packages up errors in conversions.

pkg/api/resource/generated.pb.go

@@ -1,71 +0,0 @@
-/*
-Copyright 2017 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-// Code generated by protoc-gen-gogo.
-// source: k8s.io/apimachinery/pkg/api/resource/generated.proto
-// DO NOT EDIT!
-
-/*
-	Package resource is a generated protocol buffer package.
-
-	It is generated from these files:
-		k8s.io/apimachinery/pkg/api/resource/generated.proto
-
-	It has these top-level messages:
-		Quantity
-*/
-package resource
-
-import proto "github.com/gogo/protobuf/proto"
-import fmt "fmt"
-import math "math"
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
-
-// This is a compile-time assertion to ensure that this generated file
-// is compatible with the proto package it is being compiled against.
-const _ = proto.GoGoProtoPackageIsVersion1
-
-func (m *Quantity) Reset()                    { *m = Quantity{} }
-func (*Quantity) ProtoMessage()               {}
-func (*Quantity) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{0} }
-
-func init() {
-	proto.RegisterType((*Quantity)(nil), "k8s.io.client-go.pkg.api.resource.Quantity")
-}
-
-var fileDescriptorGenerated = []byte{
-	// 245 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x5c, 0x8f, 0xb1, 0x4e, 0xc3, 0x30,
-	0x10, 0x86, 0xed, 0x05, 0x95, 0x8c, 0x15, 0x42, 0xa8, 0x83, 0x53, 0x75, 0x42, 0x48, 0xd8, 0x12,
-	0x2c, 0x15, 0x23, 0x6f, 0x00, 0x23, 0x9b, 0x13, 0x0e, 0xf7, 0x14, 0x6a, 0x5b, 0xf6, 0x79, 0xe8,
-	0xd6, 0x91, 0xb1, 0x23, 0x63, 0xf3, 0x36, 0x1d, 0x3b, 0x32, 0x30, 0x90, 0xf0, 0x22, 0x48, 0x6e,
-	0x23, 0xa4, 0x6e, 0xf7, 0x0d, 0xdf, 0xe9, 0xfb, 0x8b, 0xbb, 0x66, 0x1e, 0x25, 0x3a, 0xd5, 0xa4,
-	0x0a, 0x82, 0x05, 0x82, 0xa8, 0x7c, 0x63, 0x94, 0xf6, 0xa8, 0x02, 0x44, 0x97, 0x42, 0x0d, 0xca,
-	0x80, 0x85, 0xa0, 0x09, 0x5e, 0xa5, 0x0f, 0x8e, 0xdc, 0x78, 0x76, 0x70, 0xe4, 0xbf, 0x23, 0x7d,
-	0x63, 0xa4, 0xf6, 0x28, 0x07, 0x67, 0x72, 0x6b, 0x90, 0x16, 0xa9, 0x92, 0xb5, 0x5b, 0x2a, 0xe3,
-	0x8c, 0x53, 0x59, 0xad, 0xd2, 0x5b, 0xa6, 0x0c, 0xf9, 0x3a, 0xbc, 0x9c, 0xdc, 0x1f, 0x33, 0xb4,
-	0xc7, 0xa5, 0xae, 0x17, 0x68, 0x21, 0xac, 0x72, 0x48, 0x22, 0x7c, 0x57, 0x68, 0x29, 0x52, 0x38,
-	0xed, 0x98, 0xcd, 0x8b, 0xd1, 0x53, 0xd2, 0x96, 0x90, 0x56, 0xe3, 0xcb, 0xe2, 0x2c, 0x52, 0x40,
-	0x6b, 0xae, 0xf8, 0x94, 0x5f, 0x9f, 0x3f, 0x1f, 0xe9, 0xe1, 0xe2, 0x73, 0x5b, 0xb2, 0x8f, 0xb6,
-	0x64, 0x9b, 0xb6, 0x64, 0xdb, 0xb6, 0x64, 0xeb, 0xef, 0x29, 0x7b, 0xbc, 0xd9, 0x75, 0x82, 0xed,
-	0x3b, 0xc1, 0xbe, 0x3a, 0xc1, 0xd6, 0xbd, 0xe0, 0xbb, 0x5e, 0xf0, 0x7d, 0x2f, 0xf8, 0x4f, 0x2f,
-	0xf8, 0xe6, 0x57, 0xb0, 0x97, 0xd1, 0xb0, 0xe4, 0x2f, 0x00, 0x00, 0xff, 0xff, 0x55, 0x28, 0xd5,
-	0x78, 0x22, 0x01, 0x00, 0x00,
-}

pkg/api/resource_helpers.go

@@ -19,8 +19,8 @@ package api
 import (
 	"time"
 
+	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/client-go/pkg/api/resource"
 )
 
 // Returns string version of ResourceName.

pkg/api/types.go

@@ -17,13 +17,13 @@ limitations under the License.
 package api
 
 import (
+	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/fields"
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/types"
-	"k8s.io/client-go/pkg/api/resource"
+	"k8s.io/apimachinery/pkg/util/intstr"
-	"k8s.io/client-go/pkg/util/intstr"
 )
 
 // Common string formats
@@ -1783,8 +1783,12 @@ type Taint struct {
 	Value string
 	// Required. The effect of the taint on pods
 	// that do not tolerate the taint.
-	// Valid effects are NoSchedule and PreferNoSchedule.
+	// Valid effects are NoSchedule, PreferNoSchedule and NoExecute.
 	Effect TaintEffect
+	// TimeAdded represents the time at which the taint was added.
+	// It is only written for NoExecute taints.
+	// +optional
+	TimeAdded metav1.Time
 }
 
 type TaintEffect string
@@ -1800,26 +1804,23 @@ const (
 	// onto the node entirely. Enforced by the scheduler.
 	TaintEffectPreferNoSchedule TaintEffect = "PreferNoSchedule"
 	// NOT YET IMPLEMENTED. TODO: Uncomment field once it is implemented.
-	// Do not allow new pods to schedule onto the node unless they tolerate the taint,
+	// Like TaintEffectNoSchedule, but additionally do not allow pods submitted to
-	// do not allow pods to start on Kubelet unless they tolerate the taint,
+	// Kubelet without going through the scheduler to start.
-	// but allow all already-running pods to continue running.
+	// Enforced by Kubelet and the scheduler.
-	// Enforced by the scheduler and Kubelet.
 	// TaintEffectNoScheduleNoAdmit TaintEffect = "NoScheduleNoAdmit"
-	// NOT YET IMPLEMENTED. TODO: Uncomment field once it is implemented.
+	// Evict any already-running pods that do not tolerate the taint.
-	// Do not allow new pods to schedule onto the node unless they tolerate the taint,
+	// Currently enforced by NodeController.
-	// do not allow pods to start on Kubelet unless they tolerate the taint,
+	TaintEffectNoExecute TaintEffect = "NoExecute"
-	// and evict any already-running pods that do not tolerate the taint.
-	// Enforced by the scheduler and Kubelet.
-	// TaintEffectNoScheduleNoAdmitNoExecute = "NoScheduleNoAdmitNoExecute"
 )
 
 // The pod this Toleration is attached to tolerates any taint that matches
 // the triple <key,value,effect> using the matching operator <operator>.
 type Toleration struct {
-	// Required. Key is the taint key that the toleration applies to.
+	// Key is the taint key that the toleration applies to. Empty means match all taint keys.
+	// If the key is empty, operator must be Exists; this combination means to match all values and all keys.
 	// +optional
 	Key string
-	// operator represents a key's relationship to the value.
+	// Operator represents a key's relationship to the value.
 	// Valid operators are Exists and Equal. Defaults to Equal.
 	// Exists is equivalent to wildcard for value, so that a pod can
 	// tolerate all taints of a particular category.
@@ -1830,11 +1831,15 @@ type Toleration struct {
 	// +optional
 	Value string
 	// Effect indicates the taint effect to match. Empty means match all taint effects.
-	// When specified, allowed values are NoSchedule and PreferNoSchedule.
+	// When specified, allowed values are NoSchedule, PreferNoSchedule and NoExecute.
 	// +optional
 	Effect TaintEffect
-	// TODO: For forgiveness (#1574), we'd eventually add at least a grace period
+	// TolerationSeconds represents the period of time the toleration (which must be
-	// here, and possibly an occurrence threshold and period.
+	// of effect NoExecute, otherwise this field is ignored) tolerates the taint. By default,
+	// it is not set, which means tolerate the taint forever (do not evict). Zero and
+	// negative values will be treated as 0 (evict immediately) by the system.
+	// +optional
+	TolerationSeconds *int64
 }
 
 // A toleration operator is the set of operators that can be used in a toleration.

pkg/api/v1/defaults.go

@@ -18,8 +18,8 @@ package v1
 
 import (
 	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/util/intstr"
 	"k8s.io/client-go/pkg/util"
-	"k8s.io/client-go/pkg/util/intstr"
 	"k8s.io/client-go/pkg/util/parsers"
 )
 

pkg/api/v1/generated.proto

@@ -21,11 +21,11 @@ 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/apimachinery/pkg/util/intstr/generated.proto";
-import "k8s.io/kubernetes/pkg/util/intstr/generated.proto";
 
 // Package-wide variables from generator "generated".
 option go_package = "v1";
@@ -1095,7 +1095,7 @@ message HTTPGetAction {
   // Name or number of the port to access on the container.
   // Number must be in the range 1 to 65535.
   // Name must be an IANA_SVC_NAME.
-  optional k8s.io.kubernetes.pkg.util.intstr.IntOrString port = 2;
+  optional k8s.io.apimachinery.pkg.util.intstr.IntOrString port = 2;
 
   // Host name to connect to, defaults to the pod IP. You probably want to set
   // "Host" in httpHeaders instead.
@@ -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
@@ -3331,7 +3331,7 @@ message ServicePort {
   // omitted or set equal to the 'port' field.
   // More info: http://kubernetes.io/docs/user-guide/services#defining-a-service
   // +optional
-  optional k8s.io.kubernetes.pkg.util.intstr.IntOrString targetPort = 4;
+  optional k8s.io.apimachinery.pkg.util.intstr.IntOrString targetPort = 4;
 
   // The port on each node on which this service is exposed when type=NodePort or LoadBalancer.
   // Usually assigned by the system. If specified, it will be allocated to the service
@@ -3465,7 +3465,7 @@ message TCPSocketAction {
   // Number or name of the port to access on the container.
   // Number must be in the range 1 to 65535.
   // Name must be an IANA_SVC_NAME.
-  optional k8s.io.kubernetes.pkg.util.intstr.IntOrString port = 1;
+  optional k8s.io.apimachinery.pkg.util.intstr.IntOrString port = 1;
 }
 
 // The node this Taint is attached to has the effect "effect" on
@@ -3480,18 +3480,24 @@ message Taint {
 
   // Required. The effect of the taint on pods
   // that do not tolerate the taint.
-  // Valid effects are NoSchedule and PreferNoSchedule.
+  // Valid effects are NoSchedule, PreferNoSchedule and NoExecute.
   optional string effect = 3;
+
+  // TimeAdded represents the time at which the taint was added.
+  // It is only written for NoExecute taints.
+  // +optional
+  optional k8s.io.apimachinery.pkg.apis.meta.v1.Time timeAdded = 4;
 }
 
 // The pod this Toleration is attached to tolerates any taint that matches
 // the triple <key,value,effect> using the matching operator <operator>.
 message Toleration {
-  // Required. Key is the taint key that the toleration applies to.
+  // Key is the taint key that the toleration applies to. Empty means match all taint keys.
+  // If the key is empty, operator must be Exists; this combination means to match all values and all keys.
   // +optional
   optional string key = 1;
 
-  // operator represents a key's relationship to the value.
+  // Operator represents a key's relationship to the value.
   // Valid operators are Exists and Equal. Defaults to Equal.
   // Exists is equivalent to wildcard for value, so that a pod can
   // tolerate all taints of a particular category.
@@ -3504,9 +3510,16 @@ message Toleration {
   optional string value = 3;
 
   // Effect indicates the taint effect to match. Empty means match all taint effects.
-  // When specified, allowed values are NoSchedule and PreferNoSchedule.
+  // When specified, allowed values are NoSchedule, PreferNoSchedule and NoExecute.
   // +optional
   optional string effect = 4;
+
+  // TolerationSeconds represents the period of time the toleration (which must be
+  // of effect NoExecute, otherwise this field is ignored) tolerates the taint. By default,
+  // it is not set, which means tolerate the taint forever (do not evict). Zero and
+  // negative values will be treated as 0 (evict immediately) by the system.
+  // +optional
+  optional int64 tolerationSeconds = 5;
 }
 
 // Volume represents a named volume in a pod that may be accessed by any container in the pod.

pkg/api/v1/resource_helpers.go

@@ -19,8 +19,8 @@ package v1
 import (
 	"time"
 
+	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/client-go/pkg/api/resource"
 )
 
 // Returns string version of ResourceName.

pkg/api/v1/types.generated.go

@@ -25,11 +25,11 @@ import (
 	"errors"
 	"fmt"
 	codec1978 "github.com/ugorji/go/codec"
+	pkg3_resource "k8s.io/apimachinery/pkg/api/resource"
 	pkg2_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	pkg5_runtime "k8s.io/apimachinery/pkg/runtime"
 	pkg1_types "k8s.io/apimachinery/pkg/types"
-	pkg3_resource "k8s.io/client-go/pkg/api/resource"
+	pkg4_intstr "k8s.io/apimachinery/pkg/util/intstr"
-	pkg4_intstr "k8s.io/client-go/pkg/util/intstr"
 	"reflect"
 	"runtime"
 	time "time"
@@ -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
@@ -29903,13 +29903,14 @@ func (x *Taint) CodecEncodeSelf(e *codec1978.Encoder) {
 		} else {
 			yysep2 := !z.EncBinary()
 			yy2arr2 := z.EncBasicHandle().StructToArray
-			var yyq2 [3]bool
+			var yyq2 [4]bool
 			_, _, _ = yysep2, yyq2, yy2arr2
 			const yyr2 bool = false
 			yyq2[1] = x.Value != ""
+			yyq2[3] = true
 			var yynn2 int
 			if yyr2 || yy2arr2 {
-				r.EncodeArrayStart(3)
+				r.EncodeArrayStart(4)
 			} else {
 				yynn2 = 2
 				for _, b := range yyq2 {
@@ -29973,6 +29974,43 @@ func (x *Taint) CodecEncodeSelf(e *codec1978.Encoder) {
 				z.EncSendContainerState(codecSelfer_containerMapValue1234)
 				x.Effect.CodecEncodeSelf(e)
 			}
+			if yyr2 || yy2arr2 {
+				z.EncSendContainerState(codecSelfer_containerArrayElem1234)
+				if yyq2[3] {
+					yy13 := &x.TimeAdded
+					yym14 := z.EncBinary()
+					_ = yym14
+					if false {
+					} else if z.HasExtensions() && z.EncExt(yy13) {
+					} else if yym14 {
+						z.EncBinaryMarshal(yy13)
+					} else if !yym14 && z.IsJSONHandle() {
+						z.EncJSONMarshal(yy13)
+					} else {
+						z.EncFallback(yy13)
+					}
+				} else {
+					r.EncodeNil()
+				}
+			} else {
+				if yyq2[3] {
+					z.EncSendContainerState(codecSelfer_containerMapKey1234)
+					r.EncodeString(codecSelferC_UTF81234, string("timeAdded"))
+					z.EncSendContainerState(codecSelfer_containerMapValue1234)
+					yy15 := &x.TimeAdded
+					yym16 := z.EncBinary()
+					_ = yym16
+					if false {
+					} else if z.HasExtensions() && z.EncExt(yy15) {
+					} else if yym16 {
+						z.EncBinaryMarshal(yy15)
+					} else if !yym16 && z.IsJSONHandle() {
+						z.EncJSONMarshal(yy15)
+					} else {
+						z.EncFallback(yy15)
+					}
+				}
+			}
 			if yyr2 || yy2arr2 {
 				z.EncSendContainerState(codecSelfer_containerArrayEnd1234)
 			} else {
@@ -30065,6 +30103,23 @@ func (x *Taint) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
 				yyv8 := &x.Effect
 				yyv8.CodecDecodeSelf(d)
 			}
+		case "timeAdded":
+			if r.TryDecodeAsNil() {
+				x.TimeAdded = pkg2_v1.Time{}
+			} else {
+				yyv9 := &x.TimeAdded
+				yym10 := z.DecBinary()
+				_ = yym10
+				if false {
+				} else if z.HasExtensions() && z.DecExt(yyv9) {
+				} else if yym10 {
+					z.DecBinaryUnmarshal(yyv9)
+				} else if !yym10 && z.IsJSONHandle() {
+					z.DecJSONUnmarshal(yyv9)
+				} else {
+					z.DecFallback(yyv9, false)
+				}
+			}
 		default:
 			z.DecStructFieldNotFound(-1, yys3)
 		} // end switch yys3
@@ -30076,16 +30131,16 @@ func (x *Taint) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
 	var h codecSelfer1234
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
-	var yyj9 int
+	var yyj11 int
-	var yyb9 bool
+	var yyb11 bool
-	var yyhl9 bool = l >= 0
+	var yyhl11 bool = l >= 0
-	yyj9++
+	yyj11++
-	if yyhl9 {
+	if yyhl11 {
-		yyb9 = yyj9 > l
+		yyb11 = yyj11 > l
 	} else {
-		yyb9 = r.CheckBreak()
+		yyb11 = r.CheckBreak()
 	}
-	if yyb9 {
+	if yyb11 {
 		z.DecSendContainerState(codecSelfer_containerArrayEnd1234)
 		return
 	}
@@ -30093,29 +30148,7 @@ func (x *Taint) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
 	if r.TryDecodeAsNil() {
 		x.Key = ""
 	} else {
-		yyv10 := &x.Key
+		yyv12 := &x.Key
-		yym11 := z.DecBinary()
-		_ = yym11
-		if false {
-		} else {
-			*((*string)(yyv10)) = r.DecodeString()
-		}
-	}
-	yyj9++
-	if yyhl9 {
-		yyb9 = yyj9 > l
-	} else {
-		yyb9 = r.CheckBreak()
-	}
-	if yyb9 {
-		z.DecSendContainerState(codecSelfer_containerArrayEnd1234)
-		return
-	}
-	z.DecSendContainerState(codecSelfer_containerArrayElem1234)
-	if r.TryDecodeAsNil() {
-		x.Value = ""
-	} else {
-		yyv12 := &x.Value
 		yym13 := z.DecBinary()
 		_ = yym13
 		if false {
@@ -30123,13 +30156,35 @@ func (x *Taint) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
 			*((*string)(yyv12)) = r.DecodeString()
 		}
 	}
-	yyj9++
+	yyj11++
-	if yyhl9 {
+	if yyhl11 {
-		yyb9 = yyj9 > l
+		yyb11 = yyj11 > l
 	} else {
-		yyb9 = r.CheckBreak()
+		yyb11 = r.CheckBreak()
 	}
-	if yyb9 {
+	if yyb11 {
+		z.DecSendContainerState(codecSelfer_containerArrayEnd1234)
+		return
+	}
+	z.DecSendContainerState(codecSelfer_containerArrayElem1234)
+	if r.TryDecodeAsNil() {
+		x.Value = ""
+	} else {
+		yyv14 := &x.Value
+		yym15 := z.DecBinary()
+		_ = yym15
+		if false {
+		} else {
+			*((*string)(yyv14)) = r.DecodeString()
+		}
+	}
+	yyj11++
+	if yyhl11 {
+		yyb11 = yyj11 > l
+	} else {
+		yyb11 = r.CheckBreak()
+	}
+	if yyb11 {
 		z.DecSendContainerState(codecSelfer_containerArrayEnd1234)
 		return
 	}
@@ -30137,21 +30192,48 @@ func (x *Taint) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
 	if r.TryDecodeAsNil() {
 		x.Effect = ""
 	} else {
-		yyv14 := &x.Effect
+		yyv16 := &x.Effect
-		yyv14.CodecDecodeSelf(d)
+		yyv16.CodecDecodeSelf(d)
+	}
+	yyj11++
+	if yyhl11 {
+		yyb11 = yyj11 > l
+	} else {
+		yyb11 = r.CheckBreak()
+	}
+	if yyb11 {
+		z.DecSendContainerState(codecSelfer_containerArrayEnd1234)
+		return
+	}
+	z.DecSendContainerState(codecSelfer_containerArrayElem1234)
+	if r.TryDecodeAsNil() {
+		x.TimeAdded = pkg2_v1.Time{}
+	} else {
+		yyv17 := &x.TimeAdded
+		yym18 := z.DecBinary()
+		_ = yym18
+		if false {
+		} else if z.HasExtensions() && z.DecExt(yyv17) {
+		} else if yym18 {
+			z.DecBinaryUnmarshal(yyv17)
+		} else if !yym18 && z.IsJSONHandle() {
+			z.DecJSONUnmarshal(yyv17)
+		} else {
+			z.DecFallback(yyv17, false)
+		}
 	}
 	for {
-		yyj9++
+		yyj11++
-		if yyhl9 {
+		if yyhl11 {
-			yyb9 = yyj9 > l
+			yyb11 = yyj11 > l
 		} else {
-			yyb9 = r.CheckBreak()
+			yyb11 = r.CheckBreak()
 		}
-		if yyb9 {
+		if yyb11 {
 			break
 		}
 		z.DecSendContainerState(codecSelfer_containerArrayElem1234)
-		z.DecStructFieldNotFound(yyj9-1, "")
+		z.DecStructFieldNotFound(yyj11-1, "")
 	}
 	z.DecSendContainerState(codecSelfer_containerArrayEnd1234)
 }
@@ -30196,16 +30278,17 @@ func (x *Toleration) CodecEncodeSelf(e *codec1978.Encoder) {
 		} else {
 			yysep2 := !z.EncBinary()
 			yy2arr2 := z.EncBasicHandle().StructToArray
-			var yyq2 [4]bool
+			var yyq2 [5]bool
 			_, _, _ = yysep2, yyq2, yy2arr2
 			const yyr2 bool = false
 			yyq2[0] = x.Key != ""
 			yyq2[1] = x.Operator != ""
 			yyq2[2] = x.Value != ""
 			yyq2[3] = x.Effect != ""
+			yyq2[4] = x.TolerationSeconds != nil
 			var yynn2 int
 			if yyr2 || yy2arr2 {
-				r.EncodeArrayStart(4)
+				r.EncodeArrayStart(5)
 			} else {
 				yynn2 = 0
 				for _, b := range yyq2 {
@@ -30296,6 +30379,41 @@ func (x *Toleration) CodecEncodeSelf(e *codec1978.Encoder) {
 					x.Effect.CodecEncodeSelf(e)
 				}
 			}
+			if yyr2 || yy2arr2 {
+				z.EncSendContainerState(codecSelfer_containerArrayElem1234)
+				if yyq2[4] {
+					if x.TolerationSeconds == nil {
+						r.EncodeNil()
+					} else {
+						yy16 := *x.TolerationSeconds
+						yym17 := z.EncBinary()
+						_ = yym17
+						if false {
+						} else {
+							r.EncodeInt(int64(yy16))
+						}
+					}
+				} else {
+					r.EncodeNil()
+				}
+			} else {
+				if yyq2[4] {
+					z.EncSendContainerState(codecSelfer_containerMapKey1234)
+					r.EncodeString(codecSelferC_UTF81234, string("tolerationSeconds"))
+					z.EncSendContainerState(codecSelfer_containerMapValue1234)
+					if x.TolerationSeconds == nil {
+						r.EncodeNil()
+					} else {
+						yy18 := *x.TolerationSeconds
+						yym19 := z.EncBinary()
+						_ = yym19
+						if false {
+						} else {
+							r.EncodeInt(int64(yy18))
+						}
+					}
+				}
+			}
 			if yyr2 || yy2arr2 {
 				z.EncSendContainerState(codecSelfer_containerArrayEnd1234)
 			} else {
@@ -30395,6 +30513,22 @@ func (x *Toleration) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
 				yyv9 := &x.Effect
 				yyv9.CodecDecodeSelf(d)
 			}
+		case "tolerationSeconds":
+			if r.TryDecodeAsNil() {
+				if x.TolerationSeconds != nil {
+					x.TolerationSeconds = nil
+				}
+			} else {
+				if x.TolerationSeconds == nil {
+					x.TolerationSeconds = new(int64)
+				}
+				yym11 := z.DecBinary()
+				_ = yym11
+				if false {
+				} else {
+					*((*int64)(x.TolerationSeconds)) = int64(r.DecodeInt(64))
+				}
+			}
 		default:
 			z.DecStructFieldNotFound(-1, yys3)
 		} // end switch yys3
@@ -30406,16 +30540,16 @@ func (x *Toleration) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
 	var h codecSelfer1234
 	z, r := codec1978.GenHelperDecoder(d)
 	_, _, _ = h, z, r
-	var yyj10 int
+	var yyj12 int
-	var yyb10 bool
+	var yyb12 bool
-	var yyhl10 bool = l >= 0
+	var yyhl12 bool = l >= 0
-	yyj10++
+	yyj12++
-	if yyhl10 {
+	if yyhl12 {
-		yyb10 = yyj10 > l
+		yyb12 = yyj12 > l
 	} else {
-		yyb10 = r.CheckBreak()
+		yyb12 = r.CheckBreak()
 	}
-	if yyb10 {
+	if yyb12 {
 		z.DecSendContainerState(codecSelfer_containerArrayEnd1234)
 		return
 	}
@@ -30423,21 +30557,21 @@ func (x *Toleration) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
 	if r.TryDecodeAsNil() {
 		x.Key = ""
 	} else {
-		yyv11 := &x.Key
+		yyv13 := &x.Key
-		yym12 := z.DecBinary()
+		yym14 := z.DecBinary()
-		_ = yym12
+		_ = yym14
 		if false {
 		} else {
-			*((*string)(yyv11)) = r.DecodeString()
+			*((*string)(yyv13)) = r.DecodeString()
 		}
 	}
-	yyj10++
+	yyj12++
-	if yyhl10 {
+	if yyhl12 {
-		yyb10 = yyj10 > l
+		yyb12 = yyj12 > l
 	} else {
-		yyb10 = r.CheckBreak()
+		yyb12 = r.CheckBreak()
 	}
-	if yyb10 {
+	if yyb12 {
 		z.DecSendContainerState(codecSelfer_containerArrayEnd1234)
 		return
 	}
@@ -30445,16 +30579,16 @@ func (x *Toleration) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
 	if r.TryDecodeAsNil() {
 		x.Operator = ""
 	} else {
-		yyv13 := &x.Operator
+		yyv15 := &x.Operator
-		yyv13.CodecDecodeSelf(d)
+		yyv15.CodecDecodeSelf(d)
 	}
-	yyj10++
+	yyj12++
-	if yyhl10 {
+	if yyhl12 {
-		yyb10 = yyj10 > l
+		yyb12 = yyj12 > l
 	} else {
-		yyb10 = r.CheckBreak()
+		yyb12 = r.CheckBreak()
 	}
-	if yyb10 {
+	if yyb12 {
 		z.DecSendContainerState(codecSelfer_containerArrayEnd1234)
 		return
 	}
@@ -30462,21 +30596,21 @@ func (x *Toleration) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
 	if r.TryDecodeAsNil() {
 		x.Value = ""
 	} else {
-		yyv14 := &x.Value
+		yyv16 := &x.Value
-		yym15 := z.DecBinary()
+		yym17 := z.DecBinary()
-		_ = yym15
+		_ = yym17
 		if false {
 		} else {
-			*((*string)(yyv14)) = r.DecodeString()
+			*((*string)(yyv16)) = r.DecodeString()
 		}
 	}
-	yyj10++
+	yyj12++
-	if yyhl10 {
+	if yyhl12 {
-		yyb10 = yyj10 > l
+		yyb12 = yyj12 > l
 	} else {
-		yyb10 = r.CheckBreak()
+		yyb12 = r.CheckBreak()
 	}
-	if yyb10 {
+	if yyb12 {
 		z.DecSendContainerState(codecSelfer_containerArrayEnd1234)
 		return
 	}
@@ -30484,21 +30618,47 @@ func (x *Toleration) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
 	if r.TryDecodeAsNil() {
 		x.Effect = ""
 	} else {
-		yyv16 := &x.Effect
+		yyv18 := &x.Effect
-		yyv16.CodecDecodeSelf(d)
+		yyv18.CodecDecodeSelf(d)
+	}
+	yyj12++
+	if yyhl12 {
+		yyb12 = yyj12 > l
+	} else {
+		yyb12 = r.CheckBreak()
+	}
+	if yyb12 {
+		z.DecSendContainerState(codecSelfer_containerArrayEnd1234)
+		return
+	}
+	z.DecSendContainerState(codecSelfer_containerArrayElem1234)
+	if r.TryDecodeAsNil() {
+		if x.TolerationSeconds != nil {
+			x.TolerationSeconds = nil
+		}
+	} else {
+		if x.TolerationSeconds == nil {
+			x.TolerationSeconds = new(int64)
+		}
+		yym20 := z.DecBinary()
+		_ = yym20
+		if false {
+		} else {
+			*((*int64)(x.TolerationSeconds)) = int64(r.DecodeInt(64))
+		}
 	}
 	for {
-		yyj10++
+		yyj12++
-		if yyhl10 {
+		if yyhl12 {
-			yyb10 = yyj10 > l
+			yyb12 = yyj12 > l
 		} else {
-			yyb10 = r.CheckBreak()
+			yyb12 = r.CheckBreak()
 		}
-		if yyb10 {
+		if yyb12 {
 			break
 		}
 		z.DecSendContainerState(codecSelfer_containerArrayElem1234)
-		z.DecStructFieldNotFound(yyj10-1, "")
+		z.DecStructFieldNotFound(yyj12-1, "")
 	}
 	z.DecSendContainerState(codecSelfer_containerArrayEnd1234)
 }

pkg/api/v1/types.go

@@ -17,11 +17,11 @@ limitations under the License.
 package v1
 
 import (
+	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/types"
-	"k8s.io/client-go/pkg/api/resource"
+	"k8s.io/apimachinery/pkg/util/intstr"
-	"k8s.io/client-go/pkg/util/intstr"
 )
 
 // The comments for the structs and fields can be used from go-restful to
@@ -2002,8 +2002,12 @@ type Taint struct {
 	Value string `json:"value,omitempty" protobuf:"bytes,2,opt,name=value"`
 	// Required. The effect of the taint on pods
 	// that do not tolerate the taint.
-	// Valid effects are NoSchedule and PreferNoSchedule.
+	// Valid effects are NoSchedule, PreferNoSchedule and NoExecute.
 	Effect TaintEffect `json:"effect" protobuf:"bytes,3,opt,name=effect,casttype=TaintEffect"`
+	// TimeAdded represents the time at which the taint was added.
+	// It is only written for NoExecute taints.
+	// +optional
+	TimeAdded metav1.Time `json:"timeAdded,omitempty" protobuf:"bytes,4,opt,name=timeAdded"`
 }
 
 type TaintEffect string
@@ -2019,26 +2023,23 @@ const (
 	// onto the node entirely. Enforced by the scheduler.
 	TaintEffectPreferNoSchedule TaintEffect = "PreferNoSchedule"
 	// NOT YET IMPLEMENTED. TODO: Uncomment field once it is implemented.
-	// Do not allow new pods to schedule onto the node unless they tolerate the taint,
+	// Like TaintEffectNoSchedule, but additionally do not allow pods submitted to
-	// do not allow pods to start on Kubelet unless they tolerate the taint,
+	// Kubelet without going through the scheduler to start.
-	// but allow all already-running pods to continue running.
+	// Enforced by Kubelet and the scheduler.
-	// Enforced by the scheduler and Kubelet.
 	// TaintEffectNoScheduleNoAdmit TaintEffect = "NoScheduleNoAdmit"
-	// NOT YET IMPLEMENTED. TODO: Uncomment field once it is implemented.
+	// Evict any already-running pods that do not tolerate the taint.
-	// Do not allow new pods to schedule onto the node unless they tolerate the taint,
+	// Currently enforced by NodeController.
-	// do not allow pods to start on Kubelet unless they tolerate the taint,
+	TaintEffectNoExecute TaintEffect = "NoExecute"
-	// and evict any already-running pods that do not tolerate the taint.
-	// Enforced by the scheduler and Kubelet.
-	// TaintEffectNoScheduleNoAdmitNoExecute = "NoScheduleNoAdmitNoExecute"
 )
 
 // The pod this Toleration is attached to tolerates any taint that matches
 // the triple <key,value,effect> using the matching operator <operator>.
 type Toleration struct {
-	// Required. Key is the taint key that the toleration applies to.
+	// Key is the taint key that the toleration applies to. Empty means match all taint keys.
+	// If the key is empty, operator must be Exists; this combination means to match all values and all keys.
 	// +optional
 	Key string `json:"key,omitempty" patchStrategy:"merge" patchMergeKey:"key" protobuf:"bytes,1,opt,name=key"`
-	// operator represents a key's relationship to the value.
+	// Operator represents a key's relationship to the value.
 	// Valid operators are Exists and Equal. Defaults to Equal.
 	// Exists is equivalent to wildcard for value, so that a pod can
 	// tolerate all taints of a particular category.
@@ -2049,11 +2050,15 @@ type Toleration struct {
 	// +optional
 	Value string `json:"value,omitempty" protobuf:"bytes,3,opt,name=value"`
 	// Effect indicates the taint effect to match. Empty means match all taint effects.
-	// When specified, allowed values are NoSchedule and PreferNoSchedule.
+	// When specified, allowed values are NoSchedule, PreferNoSchedule and NoExecute.
 	// +optional
 	Effect TaintEffect `json:"effect,omitempty" protobuf:"bytes,4,opt,name=effect,casttype=TaintEffect"`
-	// TODO: For forgiveness (#1574), we'd eventually add at least a grace period
+	// TolerationSeconds represents the period of time the toleration (which must be
-	// here, and possibly an occurrence threshold and period.
+	// of effect NoExecute, otherwise this field is ignored) tolerates the taint. By default,
+	// it is not set, which means tolerate the taint forever (do not evict). Zero and
+	// negative values will be treated as 0 (evict immediately) by the system.
+	// +optional
+	TolerationSeconds *int64 `json:"tolerationSeconds,omitempty" protobuf:"varint,5,opt,name=tolerationSeconds"`
 }
 
 // A toleration operator is the set of operators that can be used in a toleration.

pkg/api/v1/types_swagger_doc_generated.go

@@ -1770,7 +1770,8 @@ var map_Taint = map[string]string{
 	"":          "The node this Taint is attached to has the effect \"effect\" on any pod that that does not tolerate the Taint.",
 	"key":       "Required. The taint key to be applied to a node.",
 	"value":     "Required. The taint value corresponding to the taint key.",
-	"effect": "Required. The effect of the taint on pods that do not tolerate the taint. Valid effects are NoSchedule and PreferNoSchedule.",
+	"effect":    "Required. The effect of the taint on pods that do not tolerate the taint. Valid effects are NoSchedule, PreferNoSchedule and NoExecute.",
+	"timeAdded": "TimeAdded represents the time at which the taint was added. It is only written for NoExecute taints.",
 }
 
 func (Taint) SwaggerDoc() map[string]string {
@@ -1779,10 +1780,11 @@ func (Taint) SwaggerDoc() map[string]string {
 
 var map_Toleration = map[string]string{
 	"":                  "The pod this Toleration is attached to tolerates any taint that matches the triple <key,value,effect> using the matching operator <operator>.",
-	"key":      "Required. Key is the taint key that the toleration applies to.",
+	"key":               "Key is the taint key that the toleration applies to. Empty means match all taint keys. If the key is empty, operator must be Exists; this combination means to match all values and all keys.",
-	"operator": "operator represents a key's relationship to the value. Valid operators are Exists and Equal. Defaults to Equal. Exists is equivalent to wildcard for value, so that a pod can tolerate all taints of a particular category.",
+	"operator":          "Operator represents a key's relationship to the value. Valid operators are Exists and Equal. Defaults to Equal. Exists is equivalent to wildcard for value, so that a pod can tolerate all taints of a particular category.",
 	"value":             "Value is the taint value the toleration matches to. If the operator is Exists, the value should be empty, otherwise just a regular string.",
-	"effect":   "Effect indicates the taint effect to match. Empty means match all taint effects. When specified, allowed values are NoSchedule and PreferNoSchedule.",
+	"effect":            "Effect indicates the taint effect to match. Empty means match all taint effects. When specified, allowed values are NoSchedule, PreferNoSchedule and NoExecute.",
+	"tolerationSeconds": "TolerationSeconds represents the period of time the toleration (which must be of effect NoExecute, otherwise this field is ignored) tolerates the taint. By default, it is not set, which means tolerate the taint forever (do not evict). Zero and negative values will be treated as 0 (evict immediately) by the system.",
 }
 
 func (Toleration) SwaggerDoc() map[string]string {

pkg/api/v1/zz_generated.conversion.go

@@ -4203,6 +4203,7 @@ func autoConvert_v1_Taint_To_api_Taint(in *Taint, out *api.Taint, s conversion.S
 	out.Key = in.Key
 	out.Value = in.Value
 	out.Effect = api.TaintEffect(in.Effect)
+	out.TimeAdded = in.TimeAdded
 	return nil
 }
 
@@ -4214,6 +4215,7 @@ func autoConvert_api_Taint_To_v1_Taint(in *api.Taint, out *Taint, s conversion.S
 	out.Key = in.Key
 	out.Value = in.Value
 	out.Effect = TaintEffect(in.Effect)
+	out.TimeAdded = in.TimeAdded
 	return nil
 }
 
@@ -4226,6 +4228,7 @@ func autoConvert_v1_Toleration_To_api_Toleration(in *Toleration, out *api.Tolera
 	out.Operator = api.TolerationOperator(in.Operator)
 	out.Value = in.Value
 	out.Effect = api.TaintEffect(in.Effect)
+	out.TolerationSeconds = (*int64)(unsafe.Pointer(in.TolerationSeconds))
 	return nil
 }
 
@@ -4238,6 +4241,7 @@ func autoConvert_api_Toleration_To_v1_Toleration(in *api.Toleration, out *Tolera
 	out.Operator = TolerationOperator(in.Operator)
 	out.Value = in.Value
 	out.Effect = TaintEffect(in.Effect)
+	out.TolerationSeconds = (*int64)(unsafe.Pointer(in.TolerationSeconds))
 	return nil
 }
 

pkg/api/v1/zz_generated.deepcopy.go

@@ -3070,6 +3070,7 @@ func DeepCopy_v1_Taint(in interface{}, out interface{}, c *conversion.Cloner) er
 		in := in.(*Taint)
 		out := out.(*Taint)
 		*out = *in
+		out.TimeAdded = in.TimeAdded.DeepCopy()
 		return nil
 	}
 }
@@ -3079,6 +3080,11 @@ func DeepCopy_v1_Toleration(in interface{}, out interface{}, c *conversion.Clone
 		in := in.(*Toleration)
 		out := out.(*Toleration)
 		*out = *in
+		if in.TolerationSeconds != nil {
+			in, out := &in.TolerationSeconds, &out.TolerationSeconds
+			*out = new(int64)
+			**out = **in
+		}
 		return nil
 	}
 }

pkg/api/zz_generated.deepcopy.go

@@ -3097,6 +3097,7 @@ func DeepCopy_api_Taint(in interface{}, out interface{}, c *conversion.Cloner) e
 		in := in.(*Taint)
 		out := out.(*Taint)
 		*out = *in
+		out.TimeAdded = in.TimeAdded.DeepCopy()
 		return nil
 	}
 }
@@ -3106,6 +3107,11 @@ func DeepCopy_api_Toleration(in interface{}, out interface{}, c *conversion.Clon
 		in := in.(*Toleration)
 		out := out.(*Toleration)
 		*out = *in
+		if in.TolerationSeconds != nil {
+			in, out := &in.TolerationSeconds, &out.TolerationSeconds
+			*out = new(int64)
+			**out = **in
+		}
 		return nil
 	}
 }

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

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

pkg/apis/apps/v1beta1/generated.proto

@@ -24,9 +24,8 @@ package k8s.io.kubernetes.pkg.apis.apps.v1beta1;
 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/apimachinery/pkg/util/intstr/generated.proto";
 import "k8s.io/kubernetes/pkg/api/v1/generated.proto";
-import "k8s.io/kubernetes/pkg/util/intstr/generated.proto";
 
 // Package-wide variables from generator "generated".
 option go_package = "v1beta1";

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

@@ -25,11 +25,11 @@ import (
 	"errors"
 	"fmt"
 	codec1978 "github.com/ugorji/go/codec"
+	pkg4_resource "k8s.io/apimachinery/pkg/api/resource"
 	pkg1_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	pkg2_types "k8s.io/apimachinery/pkg/types"
-	pkg4_resource "k8s.io/client-go/pkg/api/resource"
+	pkg5_intstr "k8s.io/apimachinery/pkg/util/intstr"
 	pkg3_v1 "k8s.io/client-go/pkg/api/v1"
-	pkg5_intstr "k8s.io/client-go/pkg/util/intstr"
 	"reflect"
 	"runtime"
 	time "time"
@@ -65,11 +65,11 @@ 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 v3 pkg5_intstr.IntOrString
-		var v4 pkg5_intstr.IntOrString
+		var v4 pkg3_v1.PodTemplateSpec
 		var v5 time.Time
 		_, _, _, _, _, _ = v0, v1, v2, v3, v4, v5
 	}

pkg/apis/authentication/OWNERS

@@ -1,4 +1,5 @@
 reviewers:
+- liggitt
 - lavalamp
 - wojtek-t
 - deads2k

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

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

pkg/apis/authentication/v1beta1/generated.proto

@@ -24,9 +24,8 @@ package k8s.io.kubernetes.pkg.apis.authentication.v1beta1;
 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/apimachinery/pkg/util/intstr/generated.proto";
 import "k8s.io/kubernetes/pkg/api/v1/generated.proto";
-import "k8s.io/kubernetes/pkg/util/intstr/generated.proto";
 
 // Package-wide variables from generator "generated".
 option go_package = "v1beta1";

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

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

pkg/apis/authorization/v1beta1/generated.proto

@@ -24,9 +24,8 @@ package k8s.io.kubernetes.pkg.apis.authorization.v1beta1;
 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/apimachinery/pkg/util/intstr/generated.proto";
 import "k8s.io/kubernetes/pkg/api/v1/generated.proto";
-import "k8s.io/kubernetes/pkg/util/intstr/generated.proto";
 
 // Package-wide variables from generator "generated".
 option go_package = "v1beta1";

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

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

pkg/apis/autoscaling/v1/generated.proto

@@ -24,9 +24,8 @@ package k8s.io.kubernetes.pkg.apis.autoscaling.v1;
 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/apimachinery/pkg/util/intstr/generated.proto";
 import "k8s.io/kubernetes/pkg/api/v1/generated.proto";
-import "k8s.io/kubernetes/pkg/util/intstr/generated.proto";
 
 // Package-wide variables from generator "generated".
 option go_package = "v1";

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

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

pkg/apis/batch/v1/generated.proto

@@ -24,9 +24,8 @@ package k8s.io.kubernetes.pkg.apis.batch.v1;
 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/apimachinery/pkg/util/intstr/generated.proto";
 import "k8s.io/kubernetes/pkg/api/v1/generated.proto";
-import "k8s.io/kubernetes/pkg/util/intstr/generated.proto";
 
 // Package-wide variables from generator "generated".
 option go_package = "v1";

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

@@ -25,11 +25,11 @@ import (
 	"errors"
 	"fmt"
 	codec1978 "github.com/ugorji/go/codec"
+	pkg4_resource "k8s.io/apimachinery/pkg/api/resource"
 	pkg1_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	pkg2_types "k8s.io/apimachinery/pkg/types"
-	pkg4_resource "k8s.io/client-go/pkg/api/resource"
+	pkg5_intstr "k8s.io/apimachinery/pkg/util/intstr"
 	pkg3_v1 "k8s.io/client-go/pkg/api/v1"
-	pkg5_intstr "k8s.io/client-go/pkg/util/intstr"
 	"reflect"
 	"runtime"
 	time "time"
@@ -65,11 +65,11 @@ 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 v3 pkg5_intstr.IntOrString
-		var v4 pkg5_intstr.IntOrString
+		var v4 pkg3_v1.PodTemplateSpec
 		var v5 time.Time
 		_, _, _, _, _, _ = v0, v1, v2, v3, v4, v5
 	}

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

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

pkg/apis/batch/v2alpha1/generated.proto

@@ -24,9 +24,8 @@ package k8s.io.kubernetes.pkg.apis.batch.v2alpha1;
 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/apimachinery/pkg/util/intstr/generated.proto";
 import "k8s.io/kubernetes/pkg/api/v1/generated.proto";
-import "k8s.io/kubernetes/pkg/util/intstr/generated.proto";
 
 // Package-wide variables from generator "generated".
 option go_package = "v2alpha1";

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

@@ -25,11 +25,11 @@ import (
 	"errors"
 	"fmt"
 	codec1978 "github.com/ugorji/go/codec"
+	pkg4_resource "k8s.io/apimachinery/pkg/api/resource"
 	pkg1_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	pkg2_types "k8s.io/apimachinery/pkg/types"
-	pkg4_resource "k8s.io/client-go/pkg/api/resource"
+	pkg5_intstr "k8s.io/apimachinery/pkg/util/intstr"
 	pkg3_v1 "k8s.io/client-go/pkg/api/v1"
-	pkg5_intstr "k8s.io/client-go/pkg/util/intstr"
 	"reflect"
 	"runtime"
 	time "time"
@@ -65,11 +65,11 @@ 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 v3 pkg5_intstr.IntOrString
-		var v4 pkg5_intstr.IntOrString
+		var v4 pkg3_v1.PodTemplateSpec
 		var v5 time.Time
 		_, _, _, _, _, _ = v0, v1, v2, v3, v4, v5
 	}

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

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

pkg/apis/certificates/v1beta1/generated.proto

@@ -24,9 +24,8 @@ package k8s.io.kubernetes.pkg.apis.certificates.v1beta1;
 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/apimachinery/pkg/util/intstr/generated.proto";
 import "k8s.io/kubernetes/pkg/api/v1/generated.proto";
-import "k8s.io/kubernetes/pkg/util/intstr/generated.proto";
 
 // Package-wide variables from generator "generated".
 option go_package = "v1beta1";

pkg/apis/extensions/types.go

@@ -29,10 +29,10 @@ support is experimental.
 package extensions
 
 import (
+	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/util/intstr"
 	"k8s.io/client-go/pkg/api"
-	"k8s.io/client-go/pkg/api/resource"
-	"k8s.io/client-go/pkg/util/intstr"
 )
 
 const (

pkg/apis/extensions/v1beta1/conversion.go

@@ -22,11 +22,11 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/conversion"
 	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/util/intstr"
 	"k8s.io/client-go/pkg/api"
 	v1 "k8s.io/client-go/pkg/api/v1"
 	"k8s.io/client-go/pkg/apis/autoscaling"
 	"k8s.io/client-go/pkg/apis/extensions"
-	"k8s.io/client-go/pkg/util/intstr"
 )
 
 func addConversionFuncs(scheme *runtime.Scheme) error {

pkg/apis/extensions/v1beta1/defaults.go

@@ -19,8 +19,8 @@ package v1beta1
 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/util/intstr"
 	"k8s.io/client-go/pkg/api/v1"
-	"k8s.io/client-go/pkg/util/intstr"
 )
 
 func addDefaultingFuncs(scheme *runtime.Scheme) error {

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

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

pkg/apis/extensions/v1beta1/generated.proto

@@ -21,12 +21,12 @@ 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/apimachinery/pkg/util/intstr/generated.proto";
 import "k8s.io/kubernetes/pkg/api/v1/generated.proto";
-import "k8s.io/kubernetes/pkg/util/intstr/generated.proto";
 
 // Package-wide variables from generator "generated".
 option go_package = "v1beta1";
@@ -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 {
@@ -450,7 +450,7 @@ message IngressBackend {
   optional string serviceName = 1;
 
   // Specifies the port of the referenced service.
-  optional k8s.io.kubernetes.pkg.util.intstr.IntOrString servicePort = 2;
+  optional k8s.io.apimachinery.pkg.util.intstr.IntOrString servicePort = 2;
 }
 
 // IngressList is a collection of Ingress.
@@ -623,7 +623,7 @@ message NetworkPolicyPort {
   // If present, only traffic on the specified protocol AND port
   // will be matched.
   // +optional
-  optional k8s.io.kubernetes.pkg.util.intstr.IntOrString port = 2;
+  optional k8s.io.apimachinery.pkg.util.intstr.IntOrString port = 2;
 }
 
 message NetworkPolicySpec {
@@ -869,7 +869,7 @@ message RollingUpdateDeployment {
   // that the total number of pods available at all times during the update is at
   // least 70% of desired pods.
   // +optional
-  optional k8s.io.kubernetes.pkg.util.intstr.IntOrString maxUnavailable = 1;
+  optional k8s.io.apimachinery.pkg.util.intstr.IntOrString maxUnavailable = 1;
 
   // The maximum number of pods that can be scheduled above the desired number of
   // pods.
@@ -883,7 +883,7 @@ message RollingUpdateDeployment {
   // new RC can be scaled up further, ensuring that total number of pods running
   // at any time during the update is atmost 130% of desired pods.
   // +optional
-  optional k8s.io.kubernetes.pkg.util.intstr.IntOrString maxSurge = 2;
+  optional k8s.io.apimachinery.pkg.util.intstr.IntOrString maxSurge = 2;
 }
 
 // Run A sUser Strategy Options defines the strategy type and any options used to create the strategy.

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

@@ -25,11 +25,11 @@ import (
 	"errors"
 	"fmt"
 	codec1978 "github.com/ugorji/go/codec"
+	pkg3_resource "k8s.io/apimachinery/pkg/api/resource"
 	pkg1_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	pkg2_types "k8s.io/apimachinery/pkg/types"
-	pkg3_resource "k8s.io/client-go/pkg/api/resource"
+	pkg5_intstr "k8s.io/apimachinery/pkg/util/intstr"
 	pkg4_v1 "k8s.io/client-go/pkg/api/v1"
-	pkg5_intstr "k8s.io/client-go/pkg/util/intstr"
 	"reflect"
 	"runtime"
 	time "time"
@@ -65,11 +65,11 @@ 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 v3 pkg5_intstr.IntOrString
-		var v4 pkg5_intstr.IntOrString
+		var v4 pkg4_v1.PodTemplateSpec
 		var v5 time.Time
 		_, _, _, _, _, _ = v0, v1, v2, v3, v4, v5
 	}

pkg/apis/extensions/v1beta1/types.go

@@ -17,10 +17,10 @@ limitations under the License.
 package v1beta1
 
 import (
+	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/client-go/pkg/api/resource"
+	"k8s.io/apimachinery/pkg/util/intstr"
 	"k8s.io/client-go/pkg/api/v1"
-	"k8s.io/client-go/pkg/util/intstr"
 )
 
 // describes the attributes of a scale subresource

pkg/apis/extensions/v1beta1/zz_generated.conversion.go

@@ -24,11 +24,11 @@ import (
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	conversion "k8s.io/apimachinery/pkg/conversion"
 	runtime "k8s.io/apimachinery/pkg/runtime"
+	intstr "k8s.io/apimachinery/pkg/util/intstr"
 	api "k8s.io/client-go/pkg/api"
 	api_v1 "k8s.io/client-go/pkg/api/v1"
 	autoscaling "k8s.io/client-go/pkg/apis/autoscaling"
 	extensions "k8s.io/client-go/pkg/apis/extensions"
-	intstr "k8s.io/client-go/pkg/util/intstr"
 	unsafe "unsafe"
 )
 
@@ -1440,14 +1440,14 @@ func Convert_extensions_RollbackConfig_To_v1beta1_RollbackConfig(in *extensions.
 }
 
 func autoConvert_v1beta1_RollingUpdateDeployment_To_extensions_RollingUpdateDeployment(in *RollingUpdateDeployment, out *extensions.RollingUpdateDeployment, s conversion.Scope) error {
-	// WARNING: in.MaxUnavailable requires manual conversion: inconvertible types (*k8s.io/kubernetes/pkg/util/intstr.IntOrString vs k8s.io/kubernetes/pkg/util/intstr.IntOrString)
+	// WARNING: in.MaxUnavailable requires manual conversion: inconvertible types (*k8s.io/apimachinery/pkg/util/intstr.IntOrString vs k8s.io/apimachinery/pkg/util/intstr.IntOrString)
-	// WARNING: in.MaxSurge requires manual conversion: inconvertible types (*k8s.io/kubernetes/pkg/util/intstr.IntOrString vs k8s.io/kubernetes/pkg/util/intstr.IntOrString)
+	// WARNING: in.MaxSurge requires manual conversion: inconvertible types (*k8s.io/apimachinery/pkg/util/intstr.IntOrString vs k8s.io/apimachinery/pkg/util/intstr.IntOrString)
 	return nil
 }
 
 func autoConvert_extensions_RollingUpdateDeployment_To_v1beta1_RollingUpdateDeployment(in *extensions.RollingUpdateDeployment, out *RollingUpdateDeployment, s conversion.Scope) error {
-	// WARNING: in.MaxUnavailable requires manual conversion: inconvertible types (k8s.io/kubernetes/pkg/util/intstr.IntOrString vs *k8s.io/kubernetes/pkg/util/intstr.IntOrString)
+	// WARNING: in.MaxUnavailable requires manual conversion: inconvertible types (k8s.io/apimachinery/pkg/util/intstr.IntOrString vs *k8s.io/apimachinery/pkg/util/intstr.IntOrString)
-	// WARNING: in.MaxSurge requires manual conversion: inconvertible types (k8s.io/kubernetes/pkg/util/intstr.IntOrString vs *k8s.io/kubernetes/pkg/util/intstr.IntOrString)
+	// WARNING: in.MaxSurge requires manual conversion: inconvertible types (k8s.io/apimachinery/pkg/util/intstr.IntOrString vs *k8s.io/apimachinery/pkg/util/intstr.IntOrString)
 	return nil
 }
 

pkg/apis/extensions/v1beta1/zz_generated.deepcopy.go

@@ -24,8 +24,8 @@ import (
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	conversion "k8s.io/apimachinery/pkg/conversion"
 	runtime "k8s.io/apimachinery/pkg/runtime"
+	intstr "k8s.io/apimachinery/pkg/util/intstr"
 	api_v1 "k8s.io/client-go/pkg/api/v1"
-	intstr "k8s.io/client-go/pkg/util/intstr"
 	reflect "reflect"
 )
 

pkg/apis/extensions/zz_generated.deepcopy.go

@@ -24,8 +24,8 @@ import (
 	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	conversion "k8s.io/apimachinery/pkg/conversion"
 	runtime "k8s.io/apimachinery/pkg/runtime"
+	intstr "k8s.io/apimachinery/pkg/util/intstr"
 	api "k8s.io/client-go/pkg/api"
-	intstr "k8s.io/client-go/pkg/util/intstr"
 	reflect "reflect"
 )
 

pkg/apis/policy/types.go

@@ -18,7 +18,7 @@ package policy
 
 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/client-go/pkg/util/intstr"
+	"k8s.io/apimachinery/pkg/util/intstr"
 )
 
 // PodDisruptionBudgetSpec is a description of a PodDisruptionBudget.

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

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

pkg/apis/policy/v1beta1/generated.proto

@@ -24,9 +24,8 @@ package k8s.io.kubernetes.pkg.apis.policy.v1beta1;
 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/apimachinery/pkg/util/intstr/generated.proto";
 import "k8s.io/kubernetes/pkg/api/v1/generated.proto";
-import "k8s.io/kubernetes/pkg/util/intstr/generated.proto";
 
 // Package-wide variables from generator "generated".
 option go_package = "v1beta1";
@@ -66,7 +65,7 @@ message PodDisruptionBudgetSpec {
   // "selector" will still be available after the eviction, i.e. even in the
   // absence of the evicted pod.  So for example you can prevent all voluntary
   // evictions by specifying "100%".
-  optional k8s.io.kubernetes.pkg.util.intstr.IntOrString minAvailable = 1;
+  optional k8s.io.apimachinery.pkg.util.intstr.IntOrString minAvailable = 1;
 
   // Label query over pods whose evictions are managed by the disruption
   // budget.

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

@@ -27,7 +27,7 @@ import (
 	codec1978 "github.com/ugorji/go/codec"
 	pkg2_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	pkg3_types "k8s.io/apimachinery/pkg/types"
-	pkg1_intstr "k8s.io/client-go/pkg/util/intstr"
+	pkg1_intstr "k8s.io/apimachinery/pkg/util/intstr"
 	"reflect"
 	"runtime"
 	time "time"

pkg/apis/policy/v1beta1/types.go

@@ -18,7 +18,7 @@ package v1beta1
 
 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/client-go/pkg/util/intstr"
+	"k8s.io/apimachinery/pkg/util/intstr"
 )
 
 // PodDisruptionBudgetSpec is a description of a PodDisruptionBudget.

pkg/apis/rbac/OWNERS

@@ -14,3 +14,4 @@ reviewers:
 - ericchiang
 - lixiaobing10051267
 - jianhuiz
+- liggitt

pkg/apis/rbac/helpers.go

@@ -252,3 +252,73 @@ func (r *ClusterRoleBindingBuilder) Binding() (ClusterRoleBinding, error) {
 
 	return r.ClusterRoleBinding, nil
 }
+
+// RoleBindingBuilder let's us attach methods. It is similar to
+// ClusterRoleBindingBuilder above.
+type RoleBindingBuilder struct {
+	RoleBinding RoleBinding
+}
+
+// NewRoleBinding creates a RoleBinding builder that can be used
+// to define the subjects of a role binding. At least one of
+// the `Groups`, `Users` or `SAs` method must be called before
+// calling the `Binding*` methods.
+func NewRoleBinding(roleName, namespace string) *RoleBindingBuilder {
+	return &RoleBindingBuilder{
+		RoleBinding: RoleBinding{
+			ObjectMeta: metav1.ObjectMeta{
+				Name:      roleName,
+				Namespace: namespace,
+			},
+			RoleRef: RoleRef{
+				APIGroup: GroupName,
+				Kind:     "Role",
+				Name:     roleName,
+			},
+		},
+	}
+}
+
+// Groups adds the specified groups as the subjects of the RoleBinding.
+func (r *RoleBindingBuilder) Groups(groups ...string) *RoleBindingBuilder {
+	for _, group := range groups {
+		r.RoleBinding.Subjects = append(r.RoleBinding.Subjects, Subject{Kind: GroupKind, Name: group})
+	}
+	return r
+}
+
+// Users adds the specified users as the subjects of the RoleBinding.
+func (r *RoleBindingBuilder) Users(users ...string) *RoleBindingBuilder {
+	for _, user := range users {
+		r.RoleBinding.Subjects = append(r.RoleBinding.Subjects, Subject{Kind: UserKind, Name: user})
+	}
+	return r
+}
+
+// SAs adds the specified service accounts as the subjects of the
+// RoleBinding.
+func (r *RoleBindingBuilder) SAs(namespace string, serviceAccountNames ...string) *RoleBindingBuilder {
+	for _, saName := range serviceAccountNames {
+		r.RoleBinding.Subjects = append(r.RoleBinding.Subjects, Subject{Kind: ServiceAccountKind, Namespace: namespace, Name: saName})
+	}
+	return r
+}
+
+// BindingOrDie calls the binding method and panics if there is an error.
+func (r *RoleBindingBuilder) BindingOrDie() RoleBinding {
+	ret, err := r.Binding()
+	if err != nil {
+		panic(err)
+	}
+	return ret
+}
+
+// Binding builds and returns the RoleBinding API object from the builder
+// object.
+func (r *RoleBindingBuilder) Binding() (RoleBinding, error) {
+	if len(r.RoleBinding.Subjects) == 0 {
+		return RoleBinding{}, fmt.Errorf("subjects are required: %#v", r.RoleBinding)
+	}
+
+	return r.RoleBinding, nil
+}

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

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

pkg/apis/rbac/v1alpha1/generated.proto

@@ -24,9 +24,8 @@ package k8s.io.kubernetes.pkg.apis.rbac.v1alpha1;
 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/apimachinery/pkg/util/intstr/generated.proto";
 import "k8s.io/kubernetes/pkg/api/v1/generated.proto";
-import "k8s.io/kubernetes/pkg/util/intstr/generated.proto";
 
 // Package-wide variables from generator "generated".
 option go_package = "v1alpha1";

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

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

pkg/apis/rbac/v1beta1/generated.proto

@@ -24,9 +24,8 @@ package k8s.io.kubernetes.pkg.apis.rbac.v1beta1;
 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/apimachinery/pkg/util/intstr/generated.proto";
 import "k8s.io/kubernetes/pkg/api/v1/generated.proto";
-import "k8s.io/kubernetes/pkg/util/intstr/generated.proto";
 
 // Package-wide variables from generator "generated".
 option go_package = "v1beta1";

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

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

pkg/apis/storage/v1beta1/generated.proto

@@ -24,9 +24,8 @@ package k8s.io.kubernetes.pkg.apis.storage.v1beta1;
 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/apimachinery/pkg/util/intstr/generated.proto";
 import "k8s.io/kubernetes/pkg/api/v1/generated.proto";
-import "k8s.io/kubernetes/pkg/util/intstr/generated.proto";
 
 // Package-wide variables from generator "generated".
 option go_package = "v1beta1";

pkg/kubelet/server/portforward/portforward.go

@@ -28,10 +28,10 @@ import (
 	"github.com/golang/glog"
 
 	"k8s.io/apimachinery/pkg/types"
+	"k8s.io/apimachinery/pkg/util/httpstream"
+	"k8s.io/apimachinery/pkg/util/httpstream/spdy"
 	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 	"k8s.io/client-go/pkg/api"
-	"k8s.io/client-go/pkg/util/httpstream"
-	"k8s.io/client-go/pkg/util/httpstream/spdy"
 )
 
 // PortForwarder knows how to forward content from a data stream to/from a port

pkg/util/trace.go

@@ -1,72 +0,0 @@
-/*
-Copyright 2015 The Kubernetes Authors.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package util
-
-import (
-	"bytes"
-	"fmt"
-	"time"
-
-	"github.com/golang/glog"
-)
-
-type traceStep struct {
-	stepTime time.Time
-	msg      string
-}
-
-type Trace struct {
-	name      string
-	startTime time.Time
-	steps     []traceStep
-}
-
-func NewTrace(name string) *Trace {
-	return &Trace{name, time.Now(), nil}
-}
-
-func (t *Trace) Step(msg string) {
-	if t.steps == nil {
-		// traces almost always have less than 6 steps, do this to avoid more than a single allocation
-		t.steps = make([]traceStep, 0, 6)
-	}
-	t.steps = append(t.steps, traceStep{time.Now(), msg})
-}
-
-func (t *Trace) Log() {
-	endTime := time.Now()
-	var buffer bytes.Buffer
-
-	buffer.WriteString(fmt.Sprintf("Trace %q (started %v):\n", t.name, t.startTime))
-	lastStepTime := t.startTime
-	for _, step := range t.steps {
-		buffer.WriteString(fmt.Sprintf("[%v] [%v] %v\n", step.stepTime.Sub(t.startTime), step.stepTime.Sub(lastStepTime), step.msg))
-		lastStepTime = step.stepTime
-	}
-	buffer.WriteString(fmt.Sprintf("[%v] [%v] END\n", endTime.Sub(t.startTime), endTime.Sub(lastStepTime)))
-	glog.Info(buffer.String())
-}
-
-func (t *Trace) LogIfLong(threshold time.Duration) {
-	if time.Since(t.startTime) >= threshold {
-		t.Log()
-	}
-}
-
-func (t *Trace) TotalTime() time.Duration {
-	return time.Since(t.startTime)
-}

rest/request_test.go

@@ -34,6 +34,7 @@ import (
 	"testing"
 	"time"
 
+	apiequality "k8s.io/apimachinery/pkg/api/equality"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"
@@ -41,16 +42,15 @@ import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/runtime/serializer/streaming"
 	"k8s.io/apimachinery/pkg/util/diff"
+	"k8s.io/apimachinery/pkg/util/httpstream"
+	"k8s.io/apimachinery/pkg/util/intstr"
 	"k8s.io/apimachinery/pkg/watch"
 	"k8s.io/client-go/pkg/api"
 	"k8s.io/client-go/pkg/api/v1"
-	"k8s.io/client-go/pkg/util/httpstream"
-	"k8s.io/client-go/pkg/util/intstr"
 	restclientwatch "k8s.io/client-go/rest/watch"
 	"k8s.io/client-go/util/clock"
 	"k8s.io/client-go/util/flowcontrol"
 	utiltesting "k8s.io/client-go/util/testing"
-	apiequality "k8s.io/apimachinery/pkg/api/equality"
 
 	_ "k8s.io/client-go/pkg/api/install"
 )

rest/watch/decoder_test.go

@@ -22,6 +22,7 @@ import (
 	"testing"
 	"time"
 
+	apiequality "k8s.io/apimachinery/pkg/api/equality"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/serializer/streaming"
@@ -30,7 +31,6 @@ import (
 	"k8s.io/client-go/pkg/api"
 	"k8s.io/client-go/pkg/api/v1"
 	restclientwatch "k8s.io/client-go/rest/watch"
-	apiequality "k8s.io/apimachinery/pkg/api/equality"
 
 	_ "k8s.io/client-go/pkg/api/install"
 )

tools/clientcmd/client_config.go

@@ -386,15 +386,15 @@ func (config *DirectClientConfig) getContext() (clientcmdapi.Context, error) {
 	contexts := config.config.Contexts
 	contextName, required := config.getContextName()
 
-	var mergedContext clientcmdapi.Context
+	mergedContext := clientcmdapi.NewContext()
 	if configContext, exists := contexts[contextName]; exists {
-		mergo.Merge(&mergedContext, configContext)
+		mergo.Merge(mergedContext, configContext)
 	} else if required {
 		return clientcmdapi.Context{}, fmt.Errorf("context %q does not exist", contextName)
 	}
-	mergo.Merge(&mergedContext, config.overrides.Context)
+	mergo.Merge(mergedContext, config.overrides.Context)
 
-	return mergedContext, nil
+	return *mergedContext, nil
 }
 
 // getAuthInfo returns the clientcmdapi.AuthInfo, or an error if a required auth info is not found.
@@ -402,15 +402,15 @@ func (config *DirectClientConfig) getAuthInfo() (clientcmdapi.AuthInfo, error) {
 	authInfos := config.config.AuthInfos
 	authInfoName, required := config.getAuthInfoName()
 
-	var mergedAuthInfo clientcmdapi.AuthInfo
+	mergedAuthInfo := clientcmdapi.NewAuthInfo()
 	if configAuthInfo, exists := authInfos[authInfoName]; exists {
-		mergo.Merge(&mergedAuthInfo, configAuthInfo)
+		mergo.Merge(mergedAuthInfo, configAuthInfo)
 	} else if required {
 		return clientcmdapi.AuthInfo{}, fmt.Errorf("auth info %q does not exist", authInfoName)
 	}
-	mergo.Merge(&mergedAuthInfo, config.overrides.AuthInfo)
+	mergo.Merge(mergedAuthInfo, config.overrides.AuthInfo)
 
-	return mergedAuthInfo, nil
+	return *mergedAuthInfo, nil
 }
 
 // getCluster returns the clientcmdapi.Cluster, or an error if a required cluster is not found.
@@ -418,14 +418,14 @@ func (config *DirectClientConfig) getCluster() (clientcmdapi.Cluster, error) {
 	clusterInfos := config.config.Clusters
 	clusterInfoName, required := config.getClusterName()
 
-	var mergedClusterInfo clientcmdapi.Cluster
+	mergedClusterInfo := clientcmdapi.NewCluster()
-	mergo.Merge(&mergedClusterInfo, config.overrides.ClusterDefaults)
+	mergo.Merge(mergedClusterInfo, config.overrides.ClusterDefaults)
 	if configClusterInfo, exists := clusterInfos[clusterInfoName]; exists {
-		mergo.Merge(&mergedClusterInfo, configClusterInfo)
+		mergo.Merge(mergedClusterInfo, configClusterInfo)
 	} else if required {
 		return clientcmdapi.Cluster{}, fmt.Errorf("cluster %q does not exist", clusterInfoName)
 	}
-	mergo.Merge(&mergedClusterInfo, config.overrides.ClusterInfo)
+	mergo.Merge(mergedClusterInfo, config.overrides.ClusterInfo)
 	// An override of --insecure-skip-tls-verify=true and no accompanying CA/CA data should clear already-set CA/CA data
 	// otherwise, a kubeconfig containing a CA reference would return an error that "CA and insecure-skip-tls-verify couldn't both be set"
 	caLen := len(config.overrides.ClusterInfo.CertificateAuthority)
@@ -435,7 +435,7 @@ func (config *DirectClientConfig) getCluster() (clientcmdapi.Cluster, error) {
 		mergedClusterInfo.CertificateAuthorityData = nil
 	}
 
-	return mergedClusterInfo, nil
+	return *mergedClusterInfo, nil
 }
 
 // inClusterClientConfig makes a config that will work from within a kubernetes cluster container environment.

tools/portforward/portforward.go

@@ -27,12 +27,15 @@ import (
 	"strings"
 	"sync"
 
+	"k8s.io/apimachinery/pkg/util/httpstream"
 	"k8s.io/apimachinery/pkg/util/runtime"
 	"k8s.io/client-go/pkg/api"
-	"k8s.io/client-go/pkg/kubelet/server/portforward"
-	"k8s.io/client-go/pkg/util/httpstream"
 )
 
+// TODO move to API machinery and re-unify with kubelet/server/portfoward
+// The subprotocol "portforward.k8s.io" is used for port forwarding.
+const PortForwardProtocolV1Name = "portforward.k8s.io"
+
 // PortForwarder knows how to listen for local connections and forward them to
 // a remote pod via an upgraded HTTP request.
 type PortForwarder struct {
@@ -132,7 +135,7 @@ func (pf *PortForwarder) ForwardPorts() error {
 	defer pf.Close()
 
 	var err error
-	pf.streamConn, _, err = pf.dialer.Dial(portforward.PortForwardProtocolV1Name)
+	pf.streamConn, _, err = pf.dialer.Dial(PortForwardProtocolV1Name)
 	if err != nil {
 		return fmt.Errorf("error upgrading connection: %s", err)
 	}

tools/portforward/portforward_test.go

@@ -0,0 +1,194 @@
+/*
+Copyright 2015 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package portforward
+
+import (
+	"net"
+	"os"
+	"reflect"
+	"strings"
+	"testing"
+
+	"k8s.io/apimachinery/pkg/util/httpstream"
+)
+
+type fakeDialer struct {
+	dialed             bool
+	conn               httpstream.Connection
+	err                error
+	negotiatedProtocol string
+}
+
+func (d *fakeDialer) Dial(protocols ...string) (httpstream.Connection, string, error) {
+	d.dialed = true
+	return d.conn, d.negotiatedProtocol, d.err
+}
+
+func TestParsePortsAndNew(t *testing.T) {
+	tests := []struct {
+		input            []string
+		expected         []ForwardedPort
+		expectParseError bool
+		expectNewError   bool
+	}{
+		{input: []string{}, expectNewError: true},
+		{input: []string{"a"}, expectParseError: true, expectNewError: true},
+		{input: []string{":a"}, expectParseError: true, expectNewError: true},
+		{input: []string{"-1"}, expectParseError: true, expectNewError: true},
+		{input: []string{"65536"}, expectParseError: true, expectNewError: true},
+		{input: []string{"0"}, expectParseError: true, expectNewError: true},
+		{input: []string{"0:0"}, expectParseError: true, expectNewError: true},
+		{input: []string{"a:5000"}, expectParseError: true, expectNewError: true},
+		{input: []string{"5000:a"}, expectParseError: true, expectNewError: true},
+		{
+			input: []string{"5000", "5000:5000", "8888:5000", "5000:8888", ":5000", "0:5000"},
+			expected: []ForwardedPort{
+				{5000, 5000},
+				{5000, 5000},
+				{8888, 5000},
+				{5000, 8888},
+				{0, 5000},
+				{0, 5000},
+			},
+		},
+	}
+
+	for i, test := range tests {
+		parsed, err := parsePorts(test.input)
+		haveError := err != nil
+		if e, a := test.expectParseError, haveError; e != a {
+			t.Fatalf("%d: parsePorts: error expected=%t, got %t: %s", i, e, a, err)
+		}
+
+		dialer := &fakeDialer{}
+		expectedStopChan := make(chan struct{})
+		readyChan := make(chan struct{})
+		pf, err := New(dialer, test.input, expectedStopChan, readyChan, os.Stdout, os.Stderr)
+		haveError = err != nil
+		if e, a := test.expectNewError, haveError; e != a {
+			t.Fatalf("%d: New: error expected=%t, got %t: %s", i, e, a, err)
+		}
+
+		if test.expectParseError || test.expectNewError {
+			continue
+		}
+
+		for pi, expectedPort := range test.expected {
+			if e, a := expectedPort.Local, parsed[pi].Local; e != a {
+				t.Fatalf("%d: local expected: %d, got: %d", i, e, a)
+			}
+			if e, a := expectedPort.Remote, parsed[pi].Remote; e != a {
+				t.Fatalf("%d: remote expected: %d, got: %d", i, e, a)
+			}
+		}
+
+		if dialer.dialed {
+			t.Fatalf("%d: expected not dialed", i)
+		}
+		if e, a := test.expected, pf.ports; !reflect.DeepEqual(e, a) {
+			t.Fatalf("%d: ports: expected %#v, got %#v", i, e, a)
+		}
+		if e, a := expectedStopChan, pf.stopChan; e != a {
+			t.Fatalf("%d: stopChan: expected %#v, got %#v", i, e, a)
+		}
+		if pf.Ready == nil {
+			t.Fatalf("%d: Ready should be non-nil", i)
+		}
+	}
+}
+
+type GetListenerTestCase struct {
+	Hostname                string
+	Protocol                string
+	ShouldRaiseError        bool
+	ExpectedListenerAddress string
+}
+
+func TestGetListener(t *testing.T) {
+	var pf PortForwarder
+	testCases := []GetListenerTestCase{
+		{
+			Hostname:                "localhost",
+			Protocol:                "tcp4",
+			ShouldRaiseError:        false,
+			ExpectedListenerAddress: "127.0.0.1",
+		},
+		{
+			Hostname:                "127.0.0.1",
+			Protocol:                "tcp4",
+			ShouldRaiseError:        false,
+			ExpectedListenerAddress: "127.0.0.1",
+		},
+		{
+			Hostname:                "[::1]",
+			Protocol:                "tcp6",
+			ShouldRaiseError:        false,
+			ExpectedListenerAddress: "::1",
+		},
+		{
+			Hostname:         "[::1]",
+			Protocol:         "tcp4",
+			ShouldRaiseError: true,
+		},
+		{
+			Hostname:         "127.0.0.1",
+			Protocol:         "tcp6",
+			ShouldRaiseError: true,
+		},
+		{
+			// IPv6 address must be put into brackets. This test reveals this.
+			Hostname:         "::1",
+			Protocol:         "tcp6",
+			ShouldRaiseError: true,
+		},
+	}
+
+	for i, testCase := range testCases {
+		expectedListenerPort := "12345"
+		listener, err := pf.getListener(testCase.Protocol, testCase.Hostname, &ForwardedPort{12345, 12345})
+		if err != nil && strings.Contains(err.Error(), "cannot assign requested address") {
+			t.Logf("Can't test #%d: %v", i, err)
+			continue
+		}
+		errorRaised := err != nil
+
+		if testCase.ShouldRaiseError != errorRaised {
+			t.Errorf("Test case #%d failed: Data %v an error has been raised(%t) where it should not (or reciprocally): %v", i, testCase, testCase.ShouldRaiseError, err)
+			continue
+		}
+		if errorRaised {
+			continue
+		}
+
+		if listener == nil {
+			t.Errorf("Test case #%d did not raise an error but failed in initializing listener", i)
+			continue
+		}
+
+		host, port, _ := net.SplitHostPort(listener.Addr().String())
+		t.Logf("Asked a %s forward for: %s:%v, got listener %s:%s, expected: %s", testCase.Protocol, testCase.Hostname, 12345, host, port, expectedListenerPort)
+		if host != testCase.ExpectedListenerAddress {
+			t.Errorf("Test case #%d failed: Listener does not listen on exepected address: asked %v got %v", i, testCase.ExpectedListenerAddress, host)
+		}
+		if port != expectedListenerPort {
+			t.Errorf("Test case #%d failed: Listener does not listen on exepected port: asked %v got %v", i, expectedListenerPort, port)
+
+		}
+		listener.Close()
+
+	}
+}

vendor/k8s.io/apimachinery/pkg/api/equality/semantic.go

@@ -0,0 +1,46 @@
+/*
+Copyright 2014 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package equality
+
+import (
+	"k8s.io/apimachinery/pkg/api/resource"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/conversion"
+	"k8s.io/apimachinery/pkg/fields"
+	"k8s.io/apimachinery/pkg/labels"
+)
+
+// Semantic can do semantic deep equality checks for api objects.
+// Example: apiequality.Semantic.DeepEqual(aPod, aPodWithNonNilButEmptyMaps) == true
+var Semantic = conversion.EqualitiesOrDie(
+	func(a, b resource.Quantity) bool {
+		// Ignore formatting, only care that numeric value stayed the same.
+		// TODO: if we decide it's important, it should be safe to start comparing the format.
+		//
+		// Uninitialized quantities are equivalent to 0 quantities.
+		return a.Cmp(b) == 0
+	},
+	func(a, b metav1.Time) bool {
+		return a.UTC() == b.UTC()
+	},
+	func(a, b labels.Selector) bool {
+		return a.String() == b.String()
+	},
+	func(a, b fields.Selector) bool {
+		return a.String() == b.String()
+	},
+)

vendor/k8s.io/apimachinery/pkg/api/resource/generated.pb.go

@@ -0,0 +1,71 @@
+/*
+Copyright 2017 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// Code generated by protoc-gen-gogo.
+// source: k8s.io/kubernetes/vendor/k8s.io/apimachinery/pkg/api/resource/generated.proto
+// DO NOT EDIT!
+
+/*
+	Package resource is a generated protocol buffer package.
+
+	It is generated from these files:
+		k8s.io/kubernetes/vendor/k8s.io/apimachinery/pkg/api/resource/generated.proto
+
+	It has these top-level messages:
+		Quantity
+*/
+package resource
+
+import proto "github.com/gogo/protobuf/proto"
+import fmt "fmt"
+import math "math"
+
+// Reference imports to suppress errors if they are not otherwise used.
+var _ = proto.Marshal
+var _ = fmt.Errorf
+var _ = math.Inf
+
+// This is a compile-time assertion to ensure that this generated file
+// is compatible with the proto package it is being compiled against.
+const _ = proto.GoGoProtoPackageIsVersion1
+
+func (m *Quantity) Reset()                    { *m = Quantity{} }
+func (*Quantity) ProtoMessage()               {}
+func (*Quantity) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{0} }
+
+func init() {
+	proto.RegisterType((*Quantity)(nil), "k8s.io.apimachinery.pkg.api.resource.Quantity")
+}
+
+var fileDescriptorGenerated = []byte{
+	// 253 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x74, 0x8f, 0xb1, 0x4a, 0x03, 0x41,
+	0x10, 0x86, 0x77, 0x1b, 0x89, 0x57, 0x06, 0x11, 0x49, 0xb1, 0x17, 0xc4, 0x42, 0x04, 0x77, 0x0a,
+	0x9b, 0x60, 0x69, 0x6f, 0xa1, 0xa5, 0xdd, 0xdd, 0x65, 0xdc, 0x2c, 0x67, 0x76, 0x8f, 0xd9, 0x59,
+	0x21, 0x5d, 0x4a, 0xcb, 0x94, 0x96, 0xb9, 0xb7, 0x49, 0x99, 0xd2, 0xc2, 0xc2, 0x3b, 0x5f, 0x44,
+	0x72, 0xc9, 0x81, 0x08, 0x76, 0xf3, 0xfd, 0xc3, 0x37, 0xfc, 0x93, 0xdc, 0x97, 0x93, 0xa0, 0xad,
+	0x87, 0x32, 0xe6, 0x48, 0x0e, 0x19, 0x03, 0xbc, 0xa2, 0x9b, 0x7a, 0x82, 0xc3, 0x22, 0xab, 0xec,
+	0x3c, 0x2b, 0x66, 0xd6, 0x21, 0x2d, 0xa0, 0x2a, 0xcd, 0x2e, 0x00, 0xc2, 0xe0, 0x23, 0x15, 0x08,
+	0x06, 0x1d, 0x52, 0xc6, 0x38, 0xd5, 0x15, 0x79, 0xf6, 0xc3, 0x8b, 0xbd, 0xa5, 0x7f, 0x5b, 0xba,
+	0x2a, 0xcd, 0x2e, 0xd0, 0xbd, 0x35, 0xba, 0x36, 0x96, 0x67, 0x31, 0xd7, 0x85, 0x9f, 0x83, 0xf1,
+	0xc6, 0x43, 0x27, 0xe7, 0xf1, 0xb9, 0xa3, 0x0e, 0xba, 0x69, 0x7f, 0x74, 0x74, 0xf3, 0x5f, 0x95,
+	0xc8, 0xf6, 0x05, 0xac, 0xe3, 0xc0, 0xf4, 0xb7, 0xc9, 0xf9, 0x24, 0x19, 0x3c, 0xc4, 0xcc, 0xb1,
+	0xe5, 0xc5, 0xf0, 0x34, 0x39, 0x0a, 0x4c, 0xd6, 0x99, 0x33, 0x39, 0x96, 0x97, 0xc7, 0x8f, 0x07,
+	0xba, 0x3d, 0x79, 0x5f, 0xa7, 0xe2, 0xad, 0x4e, 0xc5, 0xaa, 0x4e, 0xc5, 0xba, 0x4e, 0xc5, 0xf2,
+	0x73, 0x2c, 0xee, 0xae, 0x36, 0x8d, 0x12, 0xdb, 0x46, 0x89, 0x8f, 0x46, 0x89, 0x65, 0xab, 0xe4,
+	0xa6, 0x55, 0x72, 0xdb, 0x2a, 0xf9, 0xd5, 0x2a, 0xb9, 0xfa, 0x56, 0xe2, 0x69, 0xd0, 0x7f, 0xf2,
+	0x13, 0x00, 0x00, 0xff, 0xff, 0xdf, 0x3c, 0xf3, 0xc9, 0x3f, 0x01, 0x00, 0x00,
+}

vendor/k8s.io/apimachinery/pkg/api/resource/generated.proto

@@ -19,7 +19,7 @@ limitations under the License.
 
 syntax = 'proto2';
 
-package k8s.io.kubernetes.pkg.api.resource;
+package k8s.io.apimachinery.pkg.api.resource;
 
 import "k8s.io/apimachinery/pkg/util/intstr/generated.proto";
 

vendor/k8s.io/apimachinery/pkg/apis/meta/v1/generated.pb.go

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

vendor/k8s.io/apimachinery/pkg/apis/meta/v1/generated.proto

@@ -23,8 +23,7 @@ package k8s.io.apimachinery.pkg.apis.meta.v1;
 
 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/apimachinery/pkg/util/intstr/generated.proto";
-import "k8s.io/kubernetes/pkg/util/intstr/generated.proto";
 
 // Package-wide variables from generator "generated".
 option go_package = "v1";

vendor/k8s.io/apimachinery/pkg/apis/meta/v1/well_known_labels.go

@@ -33,6 +33,17 @@ const (
 	// of fluentd running on a node, kubelet need to mark node on which
 	// fluentd in not running as a manifest pod with LabelFluentdDsReady.
 	LabelFluentdDsReady = "alpha.kubernetes.io/fluentd-ds-ready"
+
+	// When the --use-taint-based-evictions flag is enabled,
+	// TaintNodeNotReady would be automatically added by node controller
+	// when node is not ready, and removed when node becomes ready.
+	TaintNodeNotReady = "node.alpha.kubernetes.io/notReady"
+
+	// When the --use-taint-based-evictions flag is enabled,
+	// TaintNodeUnreachable would be automatically added by node controller
+	// when node becomes unreachable (corresponding to NodeReady status ConditionUnknown)
+	// and removed when node becomes reachable (NodeReady status ConditionTrue).
+	TaintNodeUnreachable = "node.alpha.kubernetes.io/unreachable"
 )
 
 // Role labels are applied to Nodes to mark their purpose.  In particular, we

vendor/k8s.io/apimachinery/pkg/runtime/generated.pb.go

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

vendor/k8s.io/apimachinery/pkg/runtime/generated.proto

@@ -21,8 +21,7 @@ syntax = 'proto2';
 
 package k8s.io.apimachinery.pkg.runtime;
 
-import "k8s.io/apimachinery/pkg/api/resource/generated.proto";
+import "k8s.io/apimachinery/pkg/util/intstr/generated.proto";
-import "k8s.io/kubernetes/pkg/util/intstr/generated.proto";
 
 // Package-wide variables from generator "generated".
 option go_package = "runtime";

vendor/k8s.io/apimachinery/pkg/runtime/schema/generated.pb.go

@@ -42,19 +42,18 @@ var _ = math.Inf
 const _ = proto.GoGoProtoPackageIsVersion1
 
 var fileDescriptorGenerated = []byte{
-	// 215 bytes of a gzipped FileDescriptorProto
+	// 199 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x6c, 0xce, 0xb1, 0x4e, 0xc4, 0x30,
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x74, 0xce, 0x2f, 0x4e, 0x05, 0x31,
-	0x0c, 0xc6, 0xf1, 0x76, 0x61, 0x60, 0x64, 0xec, 0xe0, 0x11, 0xb1, 0x10, 0x0b, 0x26, 0x66, 0x5e,
+	0x10, 0xc7, 0xf1, 0xd6, 0x20, 0x90, 0xc8, 0x27, 0x46, 0x12, 0x0c, 0x1d, 0x81, 0x41, 0x73, 0x01,
-	0x80, 0x9d, 0x2d, 0xed, 0x99, 0xd4, 0x2a, 0x8d, 0x23, 0xc7, 0x41, 0x62, 0xe3, 0x11, 0x78, 0xac,
+	0x3c, 0xae, 0xbb, 0x6f, 0xe8, 0x36, 0xa5, 0x7f, 0xd2, 0x4e, 0x49, 0x70, 0x1c, 0x81, 0x63, 0xad,
-	0x1b, 0x6f, 0x64, 0xa4, 0xe5, 0x45, 0x10, 0xcd, 0x0d, 0xe8, 0x60, 0xcb, 0xa7, 0xe8, 0x67, 0xfd,
+	0x5c, 0x89, 0x64, 0xcb, 0x45, 0x48, 0xda, 0x15, 0x84, 0x04, 0xd7, 0x5f, 0x9a, 0xcf, 0xe4, 0x7b,
-	0xcf, 0x1f, 0xa6, 0xbb, 0xec, 0x58, 0x70, 0x2a, 0x3d, 0x69, 0x24, 0xa3, 0x8c, 0x2f, 0x14, 0x77,
+	0xf9, 0xe8, 0xee, 0x8b, 0xb2, 0x11, 0x5d, 0x9d, 0x28, 0x07, 0x62, 0x2a, 0xf8, 0x4a, 0xe1, 0x1c,
-	0xa2, 0x78, 0xfc, 0xf0, 0x89, 0x67, 0x3f, 0x8c, 0x1c, 0x49, 0x5f, 0x31, 0x4d, 0x01, 0xb5, 0x44,
+	0x33, 0x1e, 0x1f, 0x3a, 0x59, 0xaf, 0xe7, 0xc5, 0x06, 0xca, 0x6f, 0x98, 0x9c, 0xc1, 0x5c, 0x03,
-	0xe3, 0x99, 0x30, 0x0f, 0x23, 0xcd, 0x1e, 0x03, 0x45, 0x52, 0x6f, 0xb4, 0x73, 0x49, 0xc5, 0xe4,
+	0x5b, 0x4f, 0x58, 0xe6, 0x85, 0xbc, 0x46, 0x43, 0x81, 0xb2, 0x66, 0x3a, 0xab, 0x94, 0x23, 0xc7,
-	0xe2, 0xb2, 0x3a, 0xf7, 0xdb, 0xb9, 0x34, 0x05, 0x77, 0x74, 0xae, 0xba, 0xee, 0x3a, 0xb0, 0x8d,
+	0xab, 0xeb, 0xe1, 0xd4, 0x6f, 0xa7, 0x92, 0x33, 0xea, 0x70, 0x6a, 0xb8, 0xd3, 0xad, 0xb1, 0xbc,
-	0xa5, 0x77, 0x83, 0xcc, 0x18, 0x24, 0x08, 0x6e, 0xbc, 0x2f, 0x4f, 0xdb, 0xda, 0xc6, 0xf6, 0xaa,
+	0xd4, 0x49, 0xcd, 0xd1, 0xa3, 0x89, 0x26, 0x62, 0xe7, 0x53, 0x7d, 0xee, 0xab, 0x8f, 0xfe, 0x1a,
-	0x67, 0xbb, 0xdb, 0xbf, 0x9d, 0x3f, 0x31, 0x3e, 0x31, 0x2a, 0x65, 0x29, 0x3a, 0xd0, 0x69, 0x4a,
+	0x67, 0x4f, 0x77, 0xff, 0xe5, 0x54, 0xb6, 0x2f, 0x68, 0x03, 0x17, 0xce, 0x7f, 0x5b, 0x1e, 0x6e,
-	0x77, 0xf3, 0xbf, 0x29, 0xc6, 0xcf, 0xc8, 0xd1, 0xb2, 0xe9, 0x29, 0xb9, 0xbf, 0xda, 0x2f, 0xd0,
+	0xd6, 0x1d, 0xc4, 0xb6, 0x83, 0xf8, 0xdc, 0x41, 0xbc, 0x37, 0x90, 0x6b, 0x03, 0xb9, 0x35, 0x90,
-	0x1c, 0x16, 0x68, 0x3e, 0x16, 0x68, 0xde, 0x56, 0x68, 0xf7, 0x2b, 0xb4, 0x87, 0x15, 0xda, 0xcf,
+	0x5f, 0x0d, 0xe4, 0xc7, 0x37, 0x88, 0xa7, 0x8b, 0x51, 0xf3, 0x13, 0x00, 0x00, 0xff, 0xff, 0xd9,
-	0x15, 0xda, 0xf7, 0x2f, 0x68, 0x1e, 0xcf, 0x6a, 0xff, 0x77, 0x00, 0x00, 0x00, 0xff, 0xff, 0x86,
+	0x82, 0x09, 0xbe, 0x07, 0x01, 0x00, 0x00,
-	0xae, 0x35, 0x6c, 0x39, 0x01, 0x00, 0x00,
 }

vendor/k8s.io/apimachinery/pkg/runtime/schema/generated.proto

@@ -21,8 +21,7 @@ syntax = 'proto2';
 
 package k8s.io.apimachinery.pkg.runtime.schema;
 
-import "k8s.io/apimachinery/pkg/api/resource/generated.proto";
+import "k8s.io/apimachinery/pkg/util/intstr/generated.proto";
-import "k8s.io/kubernetes/pkg/util/intstr/generated.proto";
 
 // Package-wide variables from generator "generated".
 option go_package = "schema";

vendor/k8s.io/apimachinery/pkg/util/httpstream/spdy/connection.go

@@ -24,7 +24,7 @@ import (
 
 	"github.com/docker/spdystream"
 	"github.com/golang/glog"
-	"k8s.io/client-go/pkg/util/httpstream"
+	"k8s.io/apimachinery/pkg/util/httpstream"
 )
 
 // connection maintains state about a spdystream.Connection and its associated

vendor/k8s.io/apimachinery/pkg/util/httpstream/spdy/roundtripper.go

@@ -30,9 +30,10 @@ import (
 
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/serializer"
+	"k8s.io/apimachinery/pkg/util/httpstream"
 	"k8s.io/apimachinery/third_party/forked/golang/netutil"
-	"k8s.io/client-go/pkg/api"
-	"k8s.io/client-go/pkg/util/httpstream"
 )
 
 // SpdyRoundTripper knows how to upgrade an HTTP request to one that supports
@@ -251,7 +252,7 @@ func (s *SpdyRoundTripper) NewConnection(resp *http.Response) (httpstream.Connec
 			responseError = "unable to read error from server response"
 		} else {
 			// TODO: I don't belong here, I should be abstracted from this class
-			if obj, _, err := api.Codecs.UniversalDecoder().Decode(responseErrorBytes, nil, &metav1.Status{}); err == nil {
+			if obj, _, err := statusCodecs.UniversalDecoder().Decode(responseErrorBytes, nil, &metav1.Status{}); err == nil {
 				if status, ok := obj.(*metav1.Status); ok {
 					return nil, &apierrors.StatusError{ErrStatus: *status}
 				}
@@ -265,3 +266,15 @@ func (s *SpdyRoundTripper) NewConnection(resp *http.Response) (httpstream.Connec
 
 	return NewClientConnection(s.conn)
 }
+
+// statusScheme is private scheme for the decoding here until someone fixes the TODO in NewConnection
+var statusScheme = runtime.NewScheme()
+
+// ParameterCodec knows about query parameters used with the meta v1 API spec.
+var statusCodecs = serializer.NewCodecFactory(statusScheme)
+
+func init() {
+	statusScheme.AddUnversionedTypes(metav1.SchemeGroupVersion,
+		&metav1.Status{},
+	)
+}

vendor/k8s.io/apimachinery/pkg/util/httpstream/spdy/upgrade.go

@@ -21,8 +21,8 @@ import (
 	"net/http"
 	"strings"
 
+	"k8s.io/apimachinery/pkg/util/httpstream"
 	"k8s.io/apimachinery/pkg/util/runtime"
-	"k8s.io/client-go/pkg/util/httpstream"
 )
 
 const HeaderSpdy31 = "SPDY/3.1"

vendor/k8s.io/apimachinery/pkg/util/intstr/generated.pb.go

@@ -15,14 +15,14 @@ limitations under the License.
 */
 
 // Code generated by protoc-gen-gogo.
-// source: k8s.io/kubernetes/pkg/util/intstr/generated.proto
+// source: k8s.io/kubernetes/vendor/k8s.io/apimachinery/pkg/util/intstr/generated.proto
 // DO NOT EDIT!
 
 /*
 	Package intstr is a generated protocol buffer package.
 
 	It is generated from these files:
-		k8s.io/kubernetes/pkg/util/intstr/generated.proto
+		k8s.io/kubernetes/vendor/k8s.io/apimachinery/pkg/util/intstr/generated.proto
 
 	It has these top-level messages:
 		IntOrString
@@ -49,7 +49,7 @@ func (*IntOrString) ProtoMessage()               {}
 func (*IntOrString) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{0} }
 
 func init() {
-	proto.RegisterType((*IntOrString)(nil), "k8s.io.client-go.pkg.util.intstr.IntOrString")
+	proto.RegisterType((*IntOrString)(nil), "k8s.io.apimachinery.pkg.util.intstr.IntOrString")
 }
 func (m *IntOrString) Marshal() (data []byte, err error) {
 	size := m.Size()
@@ -352,22 +352,23 @@ var (
 )
 
 var fileDescriptorGenerated = []byte{
-	// 269 bytes of a gzipped FileDescriptorProto
+	// 288 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x44, 0x8f, 0x31, 0x4e, 0xc3, 0x30,
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x4c, 0x8f, 0x31, 0x4b, 0xf4, 0x30,
-	0x18, 0x85, 0x6d, 0x5a, 0x2a, 0x08, 0x12, 0x43, 0xc4, 0x50, 0x31, 0x38, 0x81, 0x01, 0x79, 0xc1,
+	0x1c, 0xc6, 0x93, 0xf7, 0xee, 0x3d, 0xb4, 0x82, 0x43, 0x71, 0x38, 0x1c, 0xd2, 0xa2, 0x20, 0x5d,
-	0x16, 0x1b, 0x62, 0xcc, 0xd6, 0x09, 0x29, 0x45, 0x0c, 0x6c, 0x0d, 0x18, 0x63, 0xa5, 0xd8, 0x96,
+	0x4c, 0x56, 0x71, 0xec, 0x76, 0x20, 0x08, 0x3d, 0x71, 0x70, 0x6b, 0xef, 0x62, 0x2e, 0xf4, 0x2e,
-	0xf3, 0x67, 0xe8, 0xd6, 0x23, 0xc0, 0xc6, 0xc8, 0x71, 0x32, 0x76, 0x64, 0x40, 0x15, 0x31, 0xb7,
+	0x09, 0xe9, 0xbf, 0x42, 0xb7, 0xfb, 0x08, 0xba, 0x39, 0xfa, 0x71, 0x3a, 0xde, 0xe8, 0x20, 0x87,
-	0x60, 0x42, 0x71, 0x22, 0x75, 0xb2, 0xdf, 0x7b, 0xdf, 0x67, 0xc9, 0xd1, 0x55, 0x79, 0x5d, 0x31,
+	0xad, 0xdf, 0xc2, 0x49, 0x9a, 0x16, 0x74, 0x4a, 0x9e, 0xe7, 0xf9, 0xfd, 0x02, 0xf1, 0x6e, 0xf2,
-	0x65, 0x78, 0x59, 0x17, 0xc2, 0x69, 0x01, 0xa2, 0xe2, 0xb6, 0x94, 0xbc, 0x06, 0xb5, 0xe4, 0x4a,
+	0xab, 0x82, 0x4a, 0xcd, 0xf2, 0x32, 0xe3, 0x56, 0x71, 0xe0, 0x05, 0x7b, 0xe2, 0x6a, 0xa9, 0x2d,
-	0x43, 0x05, 0x8e, 0x4b, 0xa1, 0x85, 0x5b, 0x80, 0x78, 0x62, 0xd6, 0x19, 0x30, 0xf1, 0x59, 0xaf,
+	0x1b, 0x86, 0xd4, 0xc8, 0x4d, 0xba, 0x58, 0x49, 0xc5, 0x6d, 0xc5, 0x4c, 0x2e, 0x58, 0x09, 0x72,
-	0xb0, 0x9d, 0xc2, 0x6c, 0x29, 0x59, 0xa7, 0xb0, 0x5e, 0x39, 0xbd, 0x94, 0x0a, 0x5e, 0xea, 0x82,
+	0xcd, 0xa4, 0x82, 0x02, 0x2c, 0x13, 0x5c, 0x71, 0x9b, 0x02, 0x5f, 0x52, 0x63, 0x35, 0x68, 0xff,
-	0x3d, 0x9a, 0x57, 0x2e, 0x8d, 0x34, 0x3c, 0x98, 0x45, 0xfd, 0x1c, 0x52, 0x08, 0xe1, 0xd6, 0xbf,
+	0xbc, 0x97, 0xe8, 0x5f, 0x89, 0x9a, 0x5c, 0xd0, 0x4e, 0xa2, 0xbd, 0x74, 0x7a, 0x29, 0x24, 0xac,
-	0x78, 0xfe, 0x8e, 0xa3, 0xa3, 0x99, 0x86, 0x5b, 0x37, 0x07, 0xa7, 0xb4, 0x8c, 0x69, 0x34, 0x86,
+	0xca, 0x8c, 0x2e, 0xf4, 0x86, 0x09, 0x2d, 0x34, 0x73, 0x6e, 0x56, 0x3e, 0xba, 0xe4, 0x82, 0xbb,
-	0x95, 0x15, 0x53, 0x9c, 0x62, 0x3a, 0xca, 0x4e, 0x9a, 0x6d, 0x82, 0xfc, 0x36, 0x19, 0xdf, 0xad,
+	0xf5, 0x6f, 0x9e, 0xbd, 0x60, 0xef, 0x68, 0xa6, 0xe0, 0xd6, 0xce, 0xc1, 0x4a, 0x25, 0xfc, 0xc8,
-	0xac, 0xf8, 0x1b, 0xce, 0x3c, 0x10, 0xf1, 0x45, 0x34, 0x51, 0x1a, 0xee, 0x17, 0xcb, 0xe9, 0x5e,
+	0x1b, 0x43, 0x65, 0xf8, 0x14, 0x87, 0x38, 0x1a, 0xc5, 0x27, 0xf5, 0x3e, 0x40, 0xed, 0x3e, 0x18,
-	0x8a, 0xe9, 0x7e, 0x76, 0x3c, 0xb0, 0x93, 0x59, 0x68, 0xf3, 0x61, 0xed, 0xb8, 0x0a, 0x5c, 0xc7,
+	0xdf, 0x55, 0x86, 0x7f, 0x0f, 0x67, 0xe2, 0x08, 0xff, 0xc2, 0x9b, 0x48, 0x05, 0xf7, 0xe9, 0x7a,
-	0x8d, 0x52, 0x4c, 0x0f, 0x77, 0xdc, 0x3c, 0xb4, 0xf9, 0xb0, 0xde, 0x1c, 0x7c, 0x7c, 0x26, 0x68,
+	0xfa, 0x2f, 0xc4, 0xd1, 0xff, 0xf8, 0x78, 0x60, 0x27, 0x33, 0xd7, 0x26, 0xc3, 0xda, 0x71, 0x05,
-	0xfd, 0x9d, 0xa2, 0x8c, 0x36, 0x2d, 0x41, 0x9b, 0x96, 0xa0, 0xaf, 0x96, 0xa0, 0xb5, 0x27, 0xb8,
+	0xd8, 0x8e, 0x1b, 0x85, 0x38, 0x3a, 0xfc, 0xe5, 0xe6, 0xae, 0x4d, 0x86, 0xf5, 0xfa, 0xe0, 0xf5,
-	0xf1, 0x04, 0x6f, 0x3c, 0xc1, 0x3f, 0x9e, 0xe0, 0xb7, 0x5f, 0x82, 0x1e, 0x26, 0xfd, 0x67, 0xff,
+	0x2d, 0x40, 0xdb, 0x8f, 0x10, 0xc5, 0x51, 0xdd, 0x10, 0xb4, 0x6b, 0x08, 0x7a, 0x6f, 0x08, 0xda,
-	0x03, 0x00, 0x00, 0xff, 0xff, 0x68, 0x57, 0xfb, 0xfa, 0x43, 0x01, 0x00, 0x00,
+	0xb6, 0x04, 0xd7, 0x2d, 0xc1, 0xbb, 0x96, 0xe0, 0xcf, 0x96, 0xe0, 0xe7, 0x2f, 0x82, 0x1e, 0x26,
+	0xfd, 0x67, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0xd6, 0x55, 0xdf, 0x2a, 0x60, 0x01, 0x00, 0x00,
 }

vendor/k8s.io/apimachinery/pkg/util/intstr/generated.proto

@@ -19,7 +19,7 @@ limitations under the License.
 
 syntax = 'proto2';
 
-package k8s.io.kubernetes.pkg.util.intstr;
+package k8s.io.apimachinery.pkg.util.intstr;
 
 // Package-wide variables from generator "generated".
 option go_package = "intstr";

vendor/k8s.io/apimachinery/pkg/util/runtime/runtime.go

@@ -19,6 +19,8 @@ package runtime
 import (
 	"fmt"
 	"runtime"
+	"sync"
+	"time"
 
 	"github.com/golang/glog"
 )
@@ -79,7 +81,18 @@ func getCallers(r interface{}) string {
 
 // ErrorHandlers is a list of functions which will be invoked when an unreturnable
 // error occurs.
-var ErrorHandlers = []func(error){logError}
+// TODO(lavalamp): for testability, this and the below HandleError function
+// should be packaged up into a testable and reusable object.
+var ErrorHandlers = []func(error){
+	logError,
+	(&rudimentaryErrorBackoff{
+		lastErrorTime: time.Now(),
+		// 1ms was the number folks were able to stomach as a global rate limit.
+		// If you need to log errors more than 1000 times a second you
+		// should probably consider fixing your code instead. :)
+		minPeriod: time.Millisecond,
+	}).OnError,
+}
 
 // HandlerError is a method to invoke when a non-user facing piece of code cannot
 // return an error and needs to indicate it has been ignored. Invoking this method
@@ -101,6 +114,26 @@ func logError(err error) {
 	glog.ErrorDepth(2, err)
 }
 
+type rudimentaryErrorBackoff struct {
+	minPeriod time.Duration // immutable
+	// TODO(lavalamp): use the clock for testability. Need to move that
+	// package for that to be accessible here.
+	lastErrorTimeLock sync.Mutex
+	lastErrorTime     time.Time
+}
+
+// OnError will block if it is called more often than the embedded period time.
+// This will prevent overly tight hot error loops.
+func (r *rudimentaryErrorBackoff) OnError(error) {
+	r.lastErrorTimeLock.Lock()
+	defer r.lastErrorTimeLock.Unlock()
+	d := time.Since(r.lastErrorTime)
+	if d < r.minPeriod {
+		time.Sleep(r.minPeriod - d)
+	}
+	r.lastErrorTime = time.Now()
+}
+
 // GetCaller returns the caller of the function that calls it.
 func GetCaller() string {
 	var pc [1]uintptr