Vendor: Update k8s version

Signed-off-by: Michał Żyłowski <michal.zylowski@intel.com>
This commit is contained in:
Michał Żyłowski 2017-02-03 14:41:32 +01:00
parent dfa93414c5
commit 52baf68d50
3756 changed files with 113013 additions and 92675 deletions

View file

@ -24,7 +24,6 @@ go_library(
],
tags = ["automanaged"],
deps = [
"//pkg/api/v1:go_default_library",
"//pkg/apis/authentication:go_default_library",
"//vendor:github.com/gogo/protobuf/proto",
"//vendor:github.com/gogo/protobuf/sortkeys",

View file

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

View file

@ -45,7 +45,7 @@ message ExtraValue {
// plugin in the kube-apiserver.
message TokenReview {
// +optional
optional k8s.io.kubernetes.pkg.api.v1.ObjectMeta metadata = 1;
optional k8s.io.apimachinery.pkg.apis.meta.v1.ObjectMeta metadata = 1;
// Spec holds information about the request being evaluated
optional TokenReviewSpec spec = 2;

View file

@ -20,7 +20,6 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/kubernetes/pkg/api/v1"
)
// GroupName is the group name use in this package
@ -42,12 +41,8 @@ var (
// Adds the list of known types to api.Scheme.
func addKnownTypes(scheme *runtime.Scheme) error {
scheme.AddKnownTypes(SchemeGroupVersion,
&v1.ListOptions{},
&v1.DeleteOptions{},
&metav1.ExportOptions{},
&metav1.GetOptions{},
&TokenReview{},
)
metav1.AddToGroupVersion(scheme, SchemeGroupVersion)
return nil
}

View file

@ -26,8 +26,7 @@ import (
"fmt"
codec1978 "github.com/ugorji/go/codec"
pkg1_v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
pkg3_types "k8s.io/apimachinery/pkg/types"
pkg2_v1 "k8s.io/kubernetes/pkg/api/v1"
pkg2_types "k8s.io/apimachinery/pkg/types"
"reflect"
"runtime"
time "time"
@ -64,10 +63,9 @@ func init() {
}
if false { // reference the types, but skip this branch at build/run time
var v0 pkg1_v1.TypeMeta
var v1 pkg3_types.UID
var v2 pkg2_v1.ObjectMeta
var v3 time.Time
_, _, _, _ = v0, v1, v2, v3
var v1 pkg2_types.UID
var v2 time.Time
_, _, _ = v0, v1, v2
}
}
@ -159,7 +157,13 @@ func (x *TokenReview) CodecEncodeSelf(e *codec1978.Encoder) {
z.EncSendContainerState(codecSelfer_containerArrayElem1234)
if yyq2[2] {
yy10 := &x.ObjectMeta
yy10.CodecEncodeSelf(e)
yym11 := z.EncBinary()
_ = yym11
if false {
} else if z.HasExtensions() && z.EncExt(yy10) {
} else {
z.EncFallback(yy10)
}
} else {
r.EncodeNil()
}
@ -169,7 +173,13 @@ func (x *TokenReview) CodecEncodeSelf(e *codec1978.Encoder) {
r.EncodeString(codecSelferC_UTF81234, string("metadata"))
z.EncSendContainerState(codecSelfer_containerMapValue1234)
yy12 := &x.ObjectMeta
yy12.CodecEncodeSelf(e)
yym13 := z.EncBinary()
_ = yym13
if false {
} else if z.HasExtensions() && z.EncExt(yy12) {
} else {
z.EncFallback(yy12)
}
}
}
if yyr2 || yy2arr2 {
@ -287,24 +297,30 @@ func (x *TokenReview) codecDecodeSelfFromMap(l int, d *codec1978.Decoder) {
}
case "metadata":
if r.TryDecodeAsNil() {
x.ObjectMeta = pkg2_v1.ObjectMeta{}
x.ObjectMeta = pkg1_v1.ObjectMeta{}
} else {
yyv8 := &x.ObjectMeta
yyv8.CodecDecodeSelf(d)
yym9 := z.DecBinary()
_ = yym9
if false {
} else if z.HasExtensions() && z.DecExt(yyv8) {
} else {
z.DecFallback(yyv8, false)
}
}
case "spec":
if r.TryDecodeAsNil() {
x.Spec = TokenReviewSpec{}
} else {
yyv9 := &x.Spec
yyv9.CodecDecodeSelf(d)
yyv10 := &x.Spec
yyv10.CodecDecodeSelf(d)
}
case "status":
if r.TryDecodeAsNil() {
x.Status = TokenReviewStatus{}
} else {
yyv10 := &x.Status
yyv10.CodecDecodeSelf(d)
yyv11 := &x.Status
yyv11.CodecDecodeSelf(d)
}
default:
z.DecStructFieldNotFound(-1, yys3)
@ -317,16 +333,16 @@ func (x *TokenReview) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
var h codecSelfer1234
z, r := codec1978.GenHelperDecoder(d)
_, _, _ = h, z, r
var yyj11 int
var yyb11 bool
var yyhl11 bool = l >= 0
yyj11++
if yyhl11 {
yyb11 = yyj11 > l
var yyj12 int
var yyb12 bool
var yyhl12 bool = l >= 0
yyj12++
if yyhl12 {
yyb12 = yyj12 > l
} else {
yyb11 = r.CheckBreak()
yyb12 = r.CheckBreak()
}
if yyb11 {
if yyb12 {
z.DecSendContainerState(codecSelfer_containerArrayEnd1234)
return
}
@ -334,21 +350,21 @@ func (x *TokenReview) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
if r.TryDecodeAsNil() {
x.Kind = ""
} else {
yyv12 := &x.Kind
yym13 := z.DecBinary()
_ = yym13
yyv13 := &x.Kind
yym14 := z.DecBinary()
_ = yym14
if false {
} else {
*((*string)(yyv12)) = r.DecodeString()
*((*string)(yyv13)) = r.DecodeString()
}
}
yyj11++
if yyhl11 {
yyb11 = yyj11 > l
yyj12++
if yyhl12 {
yyb12 = yyj12 > l
} else {
yyb11 = r.CheckBreak()
yyb12 = r.CheckBreak()
}
if yyb11 {
if yyb12 {
z.DecSendContainerState(codecSelfer_containerArrayEnd1234)
return
}
@ -356,38 +372,44 @@ func (x *TokenReview) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
if r.TryDecodeAsNil() {
x.APIVersion = ""
} else {
yyv14 := &x.APIVersion
yym15 := z.DecBinary()
_ = yym15
yyv15 := &x.APIVersion
yym16 := z.DecBinary()
_ = yym16
if false {
} else {
*((*string)(yyv14)) = r.DecodeString()
*((*string)(yyv15)) = r.DecodeString()
}
}
yyj11++
if yyhl11 {
yyb11 = yyj11 > l
yyj12++
if yyhl12 {
yyb12 = yyj12 > l
} else {
yyb11 = r.CheckBreak()
yyb12 = r.CheckBreak()
}
if yyb11 {
if yyb12 {
z.DecSendContainerState(codecSelfer_containerArrayEnd1234)
return
}
z.DecSendContainerState(codecSelfer_containerArrayElem1234)
if r.TryDecodeAsNil() {
x.ObjectMeta = pkg2_v1.ObjectMeta{}
x.ObjectMeta = pkg1_v1.ObjectMeta{}
} else {
yyv16 := &x.ObjectMeta
yyv16.CodecDecodeSelf(d)
yyv17 := &x.ObjectMeta
yym18 := z.DecBinary()
_ = yym18
if false {
} else if z.HasExtensions() && z.DecExt(yyv17) {
} else {
z.DecFallback(yyv17, false)
}
}
yyj11++
if yyhl11 {
yyb11 = yyj11 > l
yyj12++
if yyhl12 {
yyb12 = yyj12 > l
} else {
yyb11 = r.CheckBreak()
yyb12 = r.CheckBreak()
}
if yyb11 {
if yyb12 {
z.DecSendContainerState(codecSelfer_containerArrayEnd1234)
return
}
@ -395,16 +417,16 @@ func (x *TokenReview) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
if r.TryDecodeAsNil() {
x.Spec = TokenReviewSpec{}
} else {
yyv17 := &x.Spec
yyv17.CodecDecodeSelf(d)
yyv19 := &x.Spec
yyv19.CodecDecodeSelf(d)
}
yyj11++
if yyhl11 {
yyb11 = yyj11 > l
yyj12++
if yyhl12 {
yyb12 = yyj12 > l
} else {
yyb11 = r.CheckBreak()
yyb12 = r.CheckBreak()
}
if yyb11 {
if yyb12 {
z.DecSendContainerState(codecSelfer_containerArrayEnd1234)
return
}
@ -412,21 +434,21 @@ func (x *TokenReview) codecDecodeSelfFromArray(l int, d *codec1978.Decoder) {
if r.TryDecodeAsNil() {
x.Status = TokenReviewStatus{}
} else {
yyv18 := &x.Status
yyv18.CodecDecodeSelf(d)
yyv20 := &x.Status
yyv20.CodecDecodeSelf(d)
}
for {
yyj11++
if yyhl11 {
yyb11 = yyj11 > l
yyj12++
if yyhl12 {
yyb12 = yyj12 > l
} else {
yyb11 = r.CheckBreak()
yyb12 = r.CheckBreak()
}
if yyb11 {
if yyb12 {
break
}
z.DecSendContainerState(codecSelfer_containerArrayElem1234)
z.DecStructFieldNotFound(yyj11-1, "")
z.DecStructFieldNotFound(yyj12-1, "")
}
z.DecSendContainerState(codecSelfer_containerArrayEnd1234)
}

View file

@ -20,7 +20,6 @@ import (
"fmt"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/kubernetes/pkg/api/v1"
)
// +genclient=true
@ -33,7 +32,7 @@ import (
type TokenReview struct {
metav1.TypeMeta `json:",inline"`
// +optional
v1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"`
// Spec holds information about the request being evaluated
Spec TokenReviewSpec `json:"spec" protobuf:"bytes,2,opt,name=spec"`

View file

@ -47,10 +47,7 @@ func RegisterConversions(scheme *runtime.Scheme) error {
}
func autoConvert_v1beta1_TokenReview_To_authentication_TokenReview(in *TokenReview, out *authentication.TokenReview, s conversion.Scope) error {
// TODO: Inefficient conversion - can we improve it?
if err := s.Convert(&in.ObjectMeta, &out.ObjectMeta, 0); err != nil {
return err
}
out.ObjectMeta = in.ObjectMeta
if err := Convert_v1beta1_TokenReviewSpec_To_authentication_TokenReviewSpec(&in.Spec, &out.Spec, s); err != nil {
return err
}
@ -65,10 +62,7 @@ func Convert_v1beta1_TokenReview_To_authentication_TokenReview(in *TokenReview,
}
func autoConvert_authentication_TokenReview_To_v1beta1_TokenReview(in *authentication.TokenReview, out *TokenReview, s conversion.Scope) error {
// TODO: Inefficient conversion - can we improve it?
if err := s.Convert(&in.ObjectMeta, &out.ObjectMeta, 0); err != nil {
return err
}
out.ObjectMeta = in.ObjectMeta
if err := Convert_authentication_TokenReviewSpec_To_v1beta1_TokenReviewSpec(&in.Spec, &out.Spec, s); err != nil {
return err
}

View file

@ -21,9 +21,9 @@ limitations under the License.
package v1beta1
import (
v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
conversion "k8s.io/apimachinery/pkg/conversion"
runtime "k8s.io/apimachinery/pkg/runtime"
v1 "k8s.io/kubernetes/pkg/api/v1"
reflect "reflect"
)
@ -47,8 +47,10 @@ func DeepCopy_v1beta1_TokenReview(in interface{}, out interface{}, c *conversion
in := in.(*TokenReview)
out := out.(*TokenReview)
*out = *in
if err := v1.DeepCopy_v1_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, c); err != nil {
if newVal, err := c.DeepCopy(&in.ObjectMeta); err != nil {
return err
} else {
out.ObjectMeta = *newVal.(*v1.ObjectMeta)
}
if err := DeepCopy_v1beta1_TokenReviewStatus(&in.Status, &out.Status, c); err != nil {
return err