Fix apiserver example2 to update gen'ed protobufs

regen apiserver example2

staging/src/k8s.io/apiserver/pkg/apis/example2/v1/doc.go

@@ -19,6 +19,7 @@ limitations under the License.
 // +k8s:conversion-gen=k8s.io/apiserver/pkg/apis/example
 // +k8s:openapi-gen=false
 // +k8s:defaulter-gen=TypeMeta
+// +k8s:protobuf-gen=package
 
 // +groupName=example2.apiserver.k8s.io
 

staging/src/k8s.io/apiserver/pkg/apis/example2/v1/generated.pb.go

@@ -17,29 +17,20 @@ limitations under the License.
 // Code generated by protoc-gen-gogo. DO NOT EDIT.
 // source: k8s.io/kubernetes/vendor/k8s.io/apiserver/pkg/apis/example2/v1/generated.proto
 
-/*
-Package v1 is a generated protocol buffer package.
-
-It is generated from these files:
-
-	k8s.io/kubernetes/vendor/k8s.io/apiserver/pkg/apis/example2/v1/generated.proto
-
-It has these top-level messages:
-
-	ReplicaSet
-	ReplicaSetSpec
-	ReplicaSetStatus
-*/
 package v1
 
-import proto "github.com/gogo/protobuf/proto"
+import (
-import fmt "fmt"
+	fmt "fmt"
-import math "math"
 
-import strings "strings"
+	io "io"
-import reflect "reflect"
 
-import io "io"
+	proto "github.com/gogo/protobuf/proto"
+
+	math "math"
+	math_bits "math/bits"
+	reflect "reflect"
+	strings "strings"
+)
 
 // Reference imports to suppress errors if they are not otherwise used.
 var _ = proto.Marshal
@@ -50,29 +41,136 @@ var _ = math.Inf
 // is compatible with the proto package it is being compiled against.
 // A compilation error at this line likely means your copy of the
 // proto package needs to be updated.
-const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package
+const _ = proto.GoGoProtoPackageIsVersion3 // please upgrade the proto package
 
-func (m *ReplicaSet) Reset()                    { *m = ReplicaSet{} }
+func (m *ReplicaSet) Reset()      { *m = ReplicaSet{} }
-func (*ReplicaSet) ProtoMessage()               {}
+func (*ReplicaSet) ProtoMessage() {}
-func (*ReplicaSet) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{0} }
+func (*ReplicaSet) Descriptor() ([]byte, []int) {
+	return fileDescriptor_00c750f9eec7b27d, []int{0}
+}
+func (m *ReplicaSet) XXX_Unmarshal(b []byte) error {
+	return m.Unmarshal(b)
+}
+func (m *ReplicaSet) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	b = b[:cap(b)]
+	n, err := m.MarshalToSizedBuffer(b)
+	if err != nil {
+		return nil, err
+	}
+	return b[:n], nil
+}
+func (m *ReplicaSet) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ReplicaSet.Merge(m, src)
+}
+func (m *ReplicaSet) XXX_Size() int {
+	return m.Size()
+}
+func (m *ReplicaSet) XXX_DiscardUnknown() {
+	xxx_messageInfo_ReplicaSet.DiscardUnknown(m)
+}
 
-func (m *ReplicaSetSpec) Reset()                    { *m = ReplicaSetSpec{} }
+var xxx_messageInfo_ReplicaSet proto.InternalMessageInfo
-func (*ReplicaSetSpec) ProtoMessage()               {}
-func (*ReplicaSetSpec) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{1} }
 
-func (m *ReplicaSetStatus) Reset()                    { *m = ReplicaSetStatus{} }
+func (m *ReplicaSetSpec) Reset()      { *m = ReplicaSetSpec{} }
-func (*ReplicaSetStatus) ProtoMessage()               {}
+func (*ReplicaSetSpec) ProtoMessage() {}
-func (*ReplicaSetStatus) Descriptor() ([]byte, []int) { return fileDescriptorGenerated, []int{2} }
+func (*ReplicaSetSpec) Descriptor() ([]byte, []int) {
+	return fileDescriptor_00c750f9eec7b27d, []int{1}
+}
+func (m *ReplicaSetSpec) XXX_Unmarshal(b []byte) error {
+	return m.Unmarshal(b)
+}
+func (m *ReplicaSetSpec) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	b = b[:cap(b)]
+	n, err := m.MarshalToSizedBuffer(b)
+	if err != nil {
+		return nil, err
+	}
+	return b[:n], nil
+}
+func (m *ReplicaSetSpec) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ReplicaSetSpec.Merge(m, src)
+}
+func (m *ReplicaSetSpec) XXX_Size() int {
+	return m.Size()
+}
+func (m *ReplicaSetSpec) XXX_DiscardUnknown() {
+	xxx_messageInfo_ReplicaSetSpec.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ReplicaSetSpec proto.InternalMessageInfo
+
+func (m *ReplicaSetStatus) Reset()      { *m = ReplicaSetStatus{} }
+func (*ReplicaSetStatus) ProtoMessage() {}
+func (*ReplicaSetStatus) Descriptor() ([]byte, []int) {
+	return fileDescriptor_00c750f9eec7b27d, []int{2}
+}
+func (m *ReplicaSetStatus) XXX_Unmarshal(b []byte) error {
+	return m.Unmarshal(b)
+}
+func (m *ReplicaSetStatus) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
+	b = b[:cap(b)]
+	n, err := m.MarshalToSizedBuffer(b)
+	if err != nil {
+		return nil, err
+	}
+	return b[:n], nil
+}
+func (m *ReplicaSetStatus) XXX_Merge(src proto.Message) {
+	xxx_messageInfo_ReplicaSetStatus.Merge(m, src)
+}
+func (m *ReplicaSetStatus) XXX_Size() int {
+	return m.Size()
+}
+func (m *ReplicaSetStatus) XXX_DiscardUnknown() {
+	xxx_messageInfo_ReplicaSetStatus.DiscardUnknown(m)
+}
+
+var xxx_messageInfo_ReplicaSetStatus proto.InternalMessageInfo
 
 func init() {
 	proto.RegisterType((*ReplicaSet)(nil), "k8s.io.apiserver.pkg.apis.example2.v1.ReplicaSet")
 	proto.RegisterType((*ReplicaSetSpec)(nil), "k8s.io.apiserver.pkg.apis.example2.v1.ReplicaSetSpec")
 	proto.RegisterType((*ReplicaSetStatus)(nil), "k8s.io.apiserver.pkg.apis.example2.v1.ReplicaSetStatus")
 }
+
+func init() {
+	proto.RegisterFile("k8s.io/kubernetes/vendor/k8s.io/apiserver/pkg/apis/example2/v1/generated.proto", fileDescriptor_00c750f9eec7b27d)
+}
+
+var fileDescriptor_00c750f9eec7b27d = []byte{
+	// 403 bytes of a gzipped FileDescriptorProto
+	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x92, 0x4f, 0x8b, 0xda, 0x40,
+	0x18, 0xc6, 0x13, 0x6b, 0x45, 0xa6, 0x22, 0x92, 0x93, 0x78, 0x18, 0x8b, 0x20, 0x78, 0x68, 0x67,
+	0xaa, 0xf4, 0x1f, 0x3d, 0x95, 0x5c, 0x4b, 0x5b, 0x88, 0x87, 0x42, 0x2f, 0xed, 0x24, 0xbe, 0x8d,
+	0x69, 0x4c, 0x32, 0xcc, 0x4c, 0x42, 0x7b, 0xeb, 0x47, 0xe8, 0xc7, 0xe8, 0x47, 0xf1, 0xe8, 0xd1,
+	0x93, 0xd4, 0xec, 0x17, 0x59, 0x9c, 0x64, 0x13, 0x56, 0x5d, 0xd6, 0xbd, 0xe5, 0x99, 0x99, 0xdf,
+	0xef, 0x7d, 0x78, 0x09, 0xfa, 0x14, 0xbe, 0x95, 0x24, 0x48, 0x68, 0x98, 0xba, 0x20, 0x62, 0x50,
+	0x20, 0x69, 0x06, 0xf1, 0x22, 0x11, 0xb4, 0xbc, 0x60, 0x3c, 0x90, 0x20, 0x32, 0x10, 0x94, 0x87,
+	0xbe, 0x4e, 0x14, 0x7e, 0xb1, 0x88, 0xaf, 0x60, 0x46, 0xb3, 0x29, 0xf5, 0x21, 0x06, 0xc1, 0x14,
+	0x2c, 0x08, 0x17, 0x89, 0x4a, 0xac, 0x71, 0x81, 0x91, 0x0a, 0x23, 0x3c, 0xf4, 0x75, 0x22, 0x37,
+	0x18, 0xc9, 0xa6, 0x83, 0xe7, 0x7e, 0xa0, 0x96, 0xa9, 0x4b, 0xbc, 0x24, 0xa2, 0x7e, 0xe2, 0x27,
+	0x54, 0xd3, 0x6e, 0xfa, 0x43, 0x27, 0x1d, 0xf4, 0x57, 0x61, 0x1d, 0xbc, 0xac, 0xcb, 0x44, 0xcc,
+	0x5b, 0x06, 0x31, 0x88, 0xdf, 0x75, 0x9f, 0x08, 0x14, 0x3b, 0xd3, 0x65, 0x40, 0xef, 0xa2, 0x44,
+	0x1a, 0xab, 0x20, 0x82, 0x13, 0xe0, 0xf5, 0x7d, 0x80, 0xf4, 0x96, 0x10, 0xb1, 0x63, 0x6e, 0xf4,
+	0xaf, 0x81, 0x90, 0x03, 0x7c, 0x15, 0x78, 0x6c, 0x0e, 0xca, 0xfa, 0x8e, 0xda, 0x87, 0x4a, 0x0b,
+	0xa6, 0x58, 0xdf, 0x7c, 0x6a, 0x4e, 0x9e, 0xcc, 0x5e, 0x90, 0x7a, 0x2d, 0x95, 0xb9, 0xde, 0xcc,
+	0xe1, 0x35, 0xc9, 0xa6, 0xe4, 0xb3, 0xfb, 0x13, 0x3c, 0xf5, 0x11, 0x14, 0xb3, 0xad, 0xf5, 0x6e,
+	0x68, 0xe4, 0xbb, 0x21, 0xaa, 0xcf, 0x9c, 0xca, 0x6a, 0x7d, 0x41, 0x4d, 0xc9, 0xc1, 0xeb, 0x37,
+	0xb4, 0xfd, 0x15, 0xb9, 0x68, 0xe9, 0xa4, 0xae, 0x38, 0xe7, 0xe0, 0xd9, 0x9d, 0x72, 0x44, 0xf3,
+	0x90, 0x1c, 0x2d, 0xb4, 0xbe, 0xa1, 0x96, 0x54, 0x4c, 0xa5, 0xb2, 0xff, 0x48, 0xab, 0xdf, 0x3c,
+	0x5c, 0xad, 0x71, 0xbb, 0x5b, 0xca, 0x5b, 0x45, 0x76, 0x4a, 0xed, 0xe8, 0x1d, 0xea, 0xde, 0xae,
+	0x61, 0x4d, 0x50, 0x5b, 0x14, 0x27, 0x52, 0x6f, 0xeb, 0xb1, 0xdd, 0xc9, 0x77, 0xc3, 0x76, 0xf9,
+	0x4a, 0x3a, 0xd5, 0xed, 0xe8, 0x3d, 0xea, 0x1d, 0xcf, 0xb1, 0x9e, 0x9d, 0xd0, 0xbd, 0x72, 0xf2,
+	0x19, 0x83, 0xfd, 0x61, 0xbd, 0xc7, 0xc6, 0x66, 0x8f, 0x8d, 0xed, 0x1e, 0x1b, 0x7f, 0x72, 0x6c,
+	0xae, 0x73, 0x6c, 0x6e, 0x72, 0x6c, 0x6e, 0x73, 0x6c, 0xfe, 0xcf, 0xb1, 0xf9, 0xf7, 0x0a, 0x1b,
+	0x5f, 0xc7, 0x17, 0xfd, 0xfa, 0xd7, 0x01, 0x00, 0x00, 0xff, 0xff, 0xd0, 0x3b, 0x9b, 0x9e, 0x3b,
+	0x03, 0x00, 0x00,
+}
+
 func (m *ReplicaSet) Marshal() (dAtA []byte, err error) {
 	size := m.Size()
 	dAtA = make([]byte, size)
-	n, err := m.MarshalTo(dAtA)
+	n, err := m.MarshalToSizedBuffer(dAtA[:size])
 	if err != nil {
 		return nil, err
 	}
@@ -80,41 +178,52 @@ func (m *ReplicaSet) Marshal() (dAtA []byte, err error) {
 }
 
 func (m *ReplicaSet) MarshalTo(dAtA []byte) (int, error) {
-	var i int
+	size := m.Size()
+	return m.MarshalToSizedBuffer(dAtA[:size])
+}
+
+func (m *ReplicaSet) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+	i := len(dAtA)
 	_ = i
 	var l int
 	_ = l
-	dAtA[i] = 0xa
+	{
-	i++
+		size, err := m.Status.MarshalToSizedBuffer(dAtA[:i])
-	i = encodeVarintGenerated(dAtA, i, uint64(m.ObjectMeta.Size()))
+		if err != nil {
-	n1, err := m.ObjectMeta.MarshalTo(dAtA[i:])
+			return 0, err
-	if err != nil {
+		}
-		return 0, err
+		i -= size
+		i = encodeVarintGenerated(dAtA, i, uint64(size))
 	}
-	i += n1
+	i--
-	dAtA[i] = 0x12
-	i++
-	i = encodeVarintGenerated(dAtA, i, uint64(m.Spec.Size()))
-	n2, err := m.Spec.MarshalTo(dAtA[i:])
-	if err != nil {
-		return 0, err
-	}
-	i += n2
 	dAtA[i] = 0x1a
-	i++
+	{
-	i = encodeVarintGenerated(dAtA, i, uint64(m.Status.Size()))
+		size, err := m.Spec.MarshalToSizedBuffer(dAtA[:i])
-	n3, err := m.Status.MarshalTo(dAtA[i:])
+		if err != nil {
-	if err != nil {
+			return 0, err
-		return 0, err
+		}
+		i -= size
+		i = encodeVarintGenerated(dAtA, i, uint64(size))
 	}
-	i += n3
+	i--
-	return i, nil
+	dAtA[i] = 0x12
+	{
+		size, err := m.ObjectMeta.MarshalToSizedBuffer(dAtA[:i])
+		if err != nil {
+			return 0, err
+		}
+		i -= size
+		i = encodeVarintGenerated(dAtA, i, uint64(size))
+	}
+	i--
+	dAtA[i] = 0xa
+	return len(dAtA) - i, nil
 }
 
 func (m *ReplicaSetSpec) Marshal() (dAtA []byte, err error) {
 	size := m.Size()
 	dAtA = make([]byte, size)
-	n, err := m.MarshalTo(dAtA)
+	n, err := m.MarshalToSizedBuffer(dAtA[:size])
 	if err != nil {
 		return nil, err
 	}
@@ -122,22 +231,27 @@ func (m *ReplicaSetSpec) Marshal() (dAtA []byte, err error) {
 }
 
 func (m *ReplicaSetSpec) MarshalTo(dAtA []byte) (int, error) {
-	var i int
+	size := m.Size()
+	return m.MarshalToSizedBuffer(dAtA[:size])
+}
+
+func (m *ReplicaSetSpec) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+	i := len(dAtA)
 	_ = i
 	var l int
 	_ = l
 	if m.Replicas != nil {
-		dAtA[i] = 0x8
-		i++
 		i = encodeVarintGenerated(dAtA, i, uint64(*m.Replicas))
+		i--
+		dAtA[i] = 0x8
 	}
-	return i, nil
+	return len(dAtA) - i, nil
 }
 
 func (m *ReplicaSetStatus) Marshal() (dAtA []byte, err error) {
 	size := m.Size()
 	dAtA = make([]byte, size)
-	n, err := m.MarshalTo(dAtA)
+	n, err := m.MarshalToSizedBuffer(dAtA[:size])
 	if err != nil {
 		return nil, err
 	}
@@ -145,26 +259,36 @@ func (m *ReplicaSetStatus) Marshal() (dAtA []byte, err error) {
 }
 
 func (m *ReplicaSetStatus) MarshalTo(dAtA []byte) (int, error) {
-	var i int
+	size := m.Size()
+	return m.MarshalToSizedBuffer(dAtA[:size])
+}
+
+func (m *ReplicaSetStatus) MarshalToSizedBuffer(dAtA []byte) (int, error) {
+	i := len(dAtA)
 	_ = i
 	var l int
 	_ = l
-	dAtA[i] = 0x8
-	i++
 	i = encodeVarintGenerated(dAtA, i, uint64(m.Replicas))
-	return i, nil
+	i--
+	dAtA[i] = 0x8
+	return len(dAtA) - i, nil
 }
 
 func encodeVarintGenerated(dAtA []byte, offset int, v uint64) int {
+	offset -= sovGenerated(v)
+	base := offset
 	for v >= 1<<7 {
 		dAtA[offset] = uint8(v&0x7f | 0x80)
 		v >>= 7
 		offset++
 	}
 	dAtA[offset] = uint8(v)
-	return offset + 1
+	return base
 }
 func (m *ReplicaSet) Size() (n int) {
+	if m == nil {
+		return 0
+	}
 	var l int
 	_ = l
 	l = m.ObjectMeta.Size()
@@ -177,6 +301,9 @@ func (m *ReplicaSet) Size() (n int) {
 }
 
 func (m *ReplicaSetSpec) Size() (n int) {
+	if m == nil {
+		return 0
+	}
 	var l int
 	_ = l
 	if m.Replicas != nil {
@@ -186,6 +313,9 @@ func (m *ReplicaSetSpec) Size() (n int) {
 }
 
 func (m *ReplicaSetStatus) Size() (n int) {
+	if m == nil {
+		return 0
+	}
 	var l int
 	_ = l
 	n += 1 + sovGenerated(uint64(m.Replicas))
@@ -193,14 +323,7 @@ func (m *ReplicaSetStatus) Size() (n int) {
 }
 
 func sovGenerated(x uint64) (n int) {
-	for {
+	return (math_bits.Len64(x|1) + 6) / 7
-		n++
-		x >>= 7
-		if x == 0 {
-			break
-		}
-	}
-	return n
 }
 func sozGenerated(x uint64) (n int) {
 	return sovGenerated(uint64((x << 1) ^ uint64((int64(x) >> 63))))
@@ -210,7 +333,7 @@ func (this *ReplicaSet) String() string {
 		return "nil"
 	}
 	s := strings.Join([]string{`&ReplicaSet{`,
-		`ObjectMeta:` + strings.Replace(strings.Replace(this.ObjectMeta.String(), "ObjectMeta", "k8s_io_apimachinery_pkg_apis_meta_v1.ObjectMeta", 1), `&`, ``, 1) + `,`,
+		`ObjectMeta:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.ObjectMeta), "ObjectMeta", "v1.ObjectMeta", 1), `&`, ``, 1) + `,`,
 		`Spec:` + strings.Replace(strings.Replace(this.Spec.String(), "ReplicaSetSpec", "ReplicaSetSpec", 1), `&`, ``, 1) + `,`,
 		`Status:` + strings.Replace(strings.Replace(this.Status.String(), "ReplicaSetStatus", "ReplicaSetStatus", 1), `&`, ``, 1) + `,`,
 		`}`,
@@ -260,7 +383,7 @@ func (m *ReplicaSet) Unmarshal(dAtA []byte) error {
 			}
 			b := dAtA[iNdEx]
 			iNdEx++
-			wire |= (uint64(b) & 0x7F) << shift
+			wire |= uint64(b&0x7F) << shift
 			if b < 0x80 {
 				break
 			}
@@ -288,7 +411,7 @@ func (m *ReplicaSet) Unmarshal(dAtA []byte) error {
 				}
 				b := dAtA[iNdEx]
 				iNdEx++
-				msglen |= (int(b) & 0x7F) << shift
+				msglen |= int(b&0x7F) << shift
 				if b < 0x80 {
 					break
 				}
@@ -297,6 +420,9 @@ func (m *ReplicaSet) Unmarshal(dAtA []byte) error {
 				return ErrInvalidLengthGenerated
 			}
 			postIndex := iNdEx + msglen
+			if postIndex < 0 {
+				return ErrInvalidLengthGenerated
+			}
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -318,7 +444,7 @@ func (m *ReplicaSet) Unmarshal(dAtA []byte) error {
 				}
 				b := dAtA[iNdEx]
 				iNdEx++
-				msglen |= (int(b) & 0x7F) << shift
+				msglen |= int(b&0x7F) << shift
 				if b < 0x80 {
 					break
 				}
@@ -327,6 +453,9 @@ func (m *ReplicaSet) Unmarshal(dAtA []byte) error {
 				return ErrInvalidLengthGenerated
 			}
 			postIndex := iNdEx + msglen
+			if postIndex < 0 {
+				return ErrInvalidLengthGenerated
+			}
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -348,7 +477,7 @@ func (m *ReplicaSet) Unmarshal(dAtA []byte) error {
 				}
 				b := dAtA[iNdEx]
 				iNdEx++
-				msglen |= (int(b) & 0x7F) << shift
+				msglen |= int(b&0x7F) << shift
 				if b < 0x80 {
 					break
 				}
@@ -357,6 +486,9 @@ func (m *ReplicaSet) Unmarshal(dAtA []byte) error {
 				return ErrInvalidLengthGenerated
 			}
 			postIndex := iNdEx + msglen
+			if postIndex < 0 {
+				return ErrInvalidLengthGenerated
+			}
 			if postIndex > l {
 				return io.ErrUnexpectedEOF
 			}
@@ -370,7 +502,7 @@ func (m *ReplicaSet) Unmarshal(dAtA []byte) error {
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthGenerated
 			}
 			if (iNdEx + skippy) > l {
@@ -400,7 +532,7 @@ func (m *ReplicaSetSpec) Unmarshal(dAtA []byte) error {
 			}
 			b := dAtA[iNdEx]
 			iNdEx++
-			wire |= (uint64(b) & 0x7F) << shift
+			wire |= uint64(b&0x7F) << shift
 			if b < 0x80 {
 				break
 			}
@@ -428,7 +560,7 @@ func (m *ReplicaSetSpec) Unmarshal(dAtA []byte) error {
 				}
 				b := dAtA[iNdEx]
 				iNdEx++
-				v |= (int32(b) & 0x7F) << shift
+				v |= int32(b&0x7F) << shift
 				if b < 0x80 {
 					break
 				}
@@ -440,7 +572,7 @@ func (m *ReplicaSetSpec) Unmarshal(dAtA []byte) error {
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthGenerated
 			}
 			if (iNdEx + skippy) > l {
@@ -470,7 +602,7 @@ func (m *ReplicaSetStatus) Unmarshal(dAtA []byte) error {
 			}
 			b := dAtA[iNdEx]
 			iNdEx++
-			wire |= (uint64(b) & 0x7F) << shift
+			wire |= uint64(b&0x7F) << shift
 			if b < 0x80 {
 				break
 			}
@@ -498,7 +630,7 @@ func (m *ReplicaSetStatus) Unmarshal(dAtA []byte) error {
 				}
 				b := dAtA[iNdEx]
 				iNdEx++
-				m.Replicas |= (int32(b) & 0x7F) << shift
+				m.Replicas |= int32(b&0x7F) << shift
 				if b < 0x80 {
 					break
 				}
@@ -509,7 +641,7 @@ func (m *ReplicaSetStatus) Unmarshal(dAtA []byte) error {
 			if err != nil {
 				return err
 			}
-			if skippy < 0 {
+			if (skippy < 0) || (iNdEx+skippy) < 0 {
 				return ErrInvalidLengthGenerated
 			}
 			if (iNdEx + skippy) > l {
@@ -527,6 +659,7 @@ func (m *ReplicaSetStatus) Unmarshal(dAtA []byte) error {
 func skipGenerated(dAtA []byte) (n int, err error) {
 	l := len(dAtA)
 	iNdEx := 0
+	depth := 0
 	for iNdEx < l {
 		var wire uint64
 		for shift := uint(0); ; shift += 7 {
@@ -558,10 +691,8 @@ func skipGenerated(dAtA []byte) (n int, err error) {
 					break
 				}
 			}
-			return iNdEx, nil
 		case 1:
 			iNdEx += 8
-			return iNdEx, nil
 		case 2:
 			var length int
 			for shift := uint(0); ; shift += 7 {
@@ -578,86 +709,34 @@ func skipGenerated(dAtA []byte) (n int, err error) {
 					break
 				}
 			}
-			iNdEx += length
 			if length < 0 {
 				return 0, ErrInvalidLengthGenerated
 			}
-			return iNdEx, nil
+			iNdEx += length
 		case 3:
-			for {
+			depth++
-				var innerWire uint64
-				var start int = iNdEx
-				for shift := uint(0); ; shift += 7 {
-					if shift >= 64 {
-						return 0, ErrIntOverflowGenerated
-					}
-					if iNdEx >= l {
-						return 0, io.ErrUnexpectedEOF
-					}
-					b := dAtA[iNdEx]
-					iNdEx++
-					innerWire |= (uint64(b) & 0x7F) << shift
-					if b < 0x80 {
-						break
-					}
-				}
-				innerWireType := int(innerWire & 0x7)
-				if innerWireType == 4 {
-					break
-				}
-				next, err := skipGenerated(dAtA[start:])
-				if err != nil {
-					return 0, err
-				}
-				iNdEx = start + next
-			}
-			return iNdEx, nil
 		case 4:
-			return iNdEx, nil
+			if depth == 0 {
+				return 0, ErrUnexpectedEndOfGroupGenerated
+			}
+			depth--
 		case 5:
 			iNdEx += 4
-			return iNdEx, nil
 		default:
 			return 0, fmt.Errorf("proto: illegal wireType %d", wireType)
 		}
+		if iNdEx < 0 {
+			return 0, ErrInvalidLengthGenerated
+		}
+		if depth == 0 {
+			return iNdEx, nil
+		}
 	}
-	panic("unreachable")
+	return 0, io.ErrUnexpectedEOF
 }
 
 var (
-	ErrInvalidLengthGenerated = fmt.Errorf("proto: negative length found during unmarshaling")
+	ErrInvalidLengthGenerated        = fmt.Errorf("proto: negative length found during unmarshaling")
-	ErrIntOverflowGenerated   = fmt.Errorf("proto: integer overflow")
+	ErrIntOverflowGenerated          = fmt.Errorf("proto: integer overflow")
+	ErrUnexpectedEndOfGroupGenerated = fmt.Errorf("proto: unexpected end of group")
 )
-
-func init() {
-	proto.RegisterFile("k8s.io/kubernetes/vendor/k8s.io/apiserver/pkg/apis/example2/v1/generated.proto", fileDescriptorGenerated)
-}
-
-var fileDescriptorGenerated = []byte{
-	// 400 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x90, 0x3f, 0x8f, 0xda, 0x30,
-	0x18, 0xc6, 0x13, 0x4a, 0x11, 0x72, 0x11, 0x42, 0x99, 0x10, 0x83, 0xa9, 0x90, 0x2a, 0x31, 0xb4,
-	0x76, 0x83, 0xfa, 0x4f, 0x9d, 0xaa, 0xec, 0x6d, 0xa5, 0x30, 0x54, 0xea, 0xd2, 0x3a, 0xe1, 0x6d,
-	0x48, 0x43, 0x12, 0xcb, 0x76, 0xa2, 0x76, 0xeb, 0x47, 0xe8, 0xc7, 0xb8, 0x8f, 0xc2, 0xc8, 0xc8,
-	0x84, 0x8e, 0xdc, 0x17, 0x39, 0xe1, 0xe4, 0x12, 0x1d, 0x70, 0xba, 0xbb, 0xcd, 0x8f, 0xed, 0xdf,
-	0xef, 0x7d, 0xf4, 0xa2, 0x2f, 0xd1, 0x07, 0x49, 0xc2, 0x94, 0x46, 0x99, 0x07, 0x22, 0x01, 0x05,
-	0x92, 0xe6, 0x90, 0x2c, 0x52, 0x41, 0xab, 0x07, 0xc6, 0x43, 0x09, 0x22, 0x07, 0x41, 0x79, 0x14,
-	0xe8, 0x44, 0xe1, 0x0f, 0x8b, 0xf9, 0x0a, 0x66, 0x34, 0xb7, 0x69, 0x00, 0x09, 0x08, 0xa6, 0x60,
-	0x41, 0xb8, 0x48, 0x55, 0x6a, 0xbd, 0x28, 0x31, 0x52, 0x63, 0x84, 0x47, 0x81, 0x4e, 0xe4, 0x06,
-	0x23, 0xb9, 0x3d, 0x7a, 0x15, 0x84, 0x6a, 0x99, 0x79, 0xc4, 0x4f, 0x63, 0x1a, 0xa4, 0x41, 0x4a,
-	0x35, 0xed, 0x65, 0xbf, 0x74, 0xd2, 0x41, 0x9f, 0x4a, 0xeb, 0xe8, 0x4d, 0x53, 0x26, 0x66, 0xfe,
-	0x32, 0x4c, 0x40, 0xfc, 0x6d, 0xfa, 0xc4, 0xa0, 0xd8, 0x99, 0x2e, 0x23, 0x7a, 0x17, 0x25, 0xb2,
-	0x44, 0x85, 0x31, 0x9c, 0x00, 0xef, 0xee, 0x03, 0xa4, 0xbf, 0x84, 0x98, 0x1d, 0x73, 0x93, 0x8b,
-	0x16, 0x42, 0x2e, 0xf0, 0x55, 0xe8, 0xb3, 0x39, 0x28, 0xeb, 0x27, 0xea, 0x1e, 0x2a, 0x2d, 0x98,
-	0x62, 0x43, 0xf3, 0xb9, 0x39, 0x7d, 0x36, 0x7b, 0x4d, 0x9a, 0xb5, 0xd4, 0xe6, 0x66, 0x33, 0x87,
-	0xdf, 0x24, 0xb7, 0xc9, 0x57, 0xef, 0x37, 0xf8, 0xea, 0x33, 0x28, 0xe6, 0x58, 0xeb, 0xdd, 0xd8,
-	0x28, 0x76, 0x63, 0xd4, 0xdc, 0xb9, 0xb5, 0xd5, 0xfa, 0x86, 0xda, 0x92, 0x83, 0x3f, 0x6c, 0x69,
-	0xfb, 0x5b, 0xf2, 0xa0, 0xa5, 0x93, 0xa6, 0xe2, 0x9c, 0x83, 0xef, 0xf4, 0xaa, 0x11, 0xed, 0x43,
-	0x72, 0xb5, 0xd0, 0xfa, 0x81, 0x3a, 0x52, 0x31, 0x95, 0xc9, 0xe1, 0x13, 0xad, 0x7e, 0xff, 0x78,
-	0xb5, 0xc6, 0x9d, 0x7e, 0x25, 0xef, 0x94, 0xd9, 0xad, 0xb4, 0x93, 0x8f, 0xa8, 0x7f, 0xbb, 0x86,
-	0x35, 0x45, 0x5d, 0x51, 0xde, 0x48, 0xbd, 0xad, 0xa7, 0x4e, 0xaf, 0xd8, 0x8d, 0xbb, 0xd5, 0x2f,
-	0xe9, 0xd6, 0xaf, 0x93, 0x4f, 0x68, 0x70, 0x3c, 0xc7, 0x7a, 0x79, 0x42, 0x0f, 0xaa, 0xc9, 0x67,
-	0x0c, 0xce, 0x74, 0xbd, 0xc7, 0xc6, 0x66, 0x8f, 0x8d, 0xed, 0x1e, 0x1b, 0xff, 0x0a, 0x6c, 0xae,
-	0x0b, 0x6c, 0x6e, 0x0a, 0x6c, 0x6e, 0x0b, 0x6c, 0x5e, 0x16, 0xd8, 0xfc, 0x7f, 0x85, 0x8d, 0xef,
-	0xad, 0xdc, 0xbe, 0x0e, 0x00, 0x00, 0xff, 0xff, 0x03, 0x3d, 0xdb, 0x1b, 0x18, 0x03, 0x00, 0x00,
-}

staging/src/k8s.io/apiserver/pkg/apis/example2/v1/generated.proto

@@ -26,18 +26,18 @@ import "k8s.io/apimachinery/pkg/runtime/generated.proto";
 import "k8s.io/apimachinery/pkg/runtime/schema/generated.proto";
 
 // Package-wide variables from generator "generated".
-option go_package = "v1";
+option go_package = "k8s.io/apiserver/pkg/apis/example2/v1";
 
 // ReplicaSet ensures that a specified number of pod replicas are running at any given time.
 message ReplicaSet {
   // If the Labels of a ReplicaSet are empty, they are defaulted to
   // be the same as the Pod(s) that the ReplicaSet manages.
-  // Standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#metadata
+  // Standard object's metadata. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata
   // +optional
   optional k8s.io.apimachinery.pkg.apis.meta.v1.ObjectMeta metadata = 1;
 
   // Spec defines the specification of the desired behavior of the ReplicaSet.
-  // More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#spec-and-status
+  // More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#spec-and-status
   // +optional
   optional ReplicaSetSpec spec = 2;
 
@@ -45,7 +45,7 @@ message ReplicaSet {
   // This data may be out of date by some window of time.
   // Populated by the system.
   // Read-only.
-  // More info: https://git.k8s.io/community/contributors/devel/api-conventions.md#spec-and-status
+  // More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#spec-and-status
   // +optional
   optional ReplicaSetStatus status = 3;
 }