From 332d88db1aaddd0b68bfcc62a6a9dc3ce53eed34 Mon Sep 17 00:00:00 2001 From: Joe Betz Date: Tue, 7 May 2019 13:36:44 -0700 Subject: [PATCH] Generate proto bindings for: Pass {Operation}Option to Webhooks --- .../v1beta1/zz_generated.conversion.go | 6 + pkg/apis/admission/zz_generated.deepcopy.go | 3 + .../api/admission/v1beta1/generated.pb.go | 160 +++++++++++------- .../api/admission/v1beta1/generated.proto | 11 +- .../v1beta1/types_swagger_doc_generated.go | 3 +- .../v1beta1/zz_generated.deepcopy.go | 1 + .../apiextensions/v1beta1/generated.proto | 2 +- 7 files changed, 124 insertions(+), 62 deletions(-) diff --git a/pkg/apis/admission/v1beta1/zz_generated.conversion.go b/pkg/apis/admission/v1beta1/zz_generated.conversion.go index 15dbf75d937..d018d6f5d43 100644 --- a/pkg/apis/admission/v1beta1/zz_generated.conversion.go +++ b/pkg/apis/admission/v1beta1/zz_generated.conversion.go @@ -90,6 +90,9 @@ func autoConvert_v1beta1_AdmissionRequest_To_admission_AdmissionRequest(in *v1be return err } out.DryRun = (*bool)(unsafe.Pointer(in.DryRun)) + if err := runtime.Convert_runtime_RawExtension_To_runtime_Object(&in.Options, &out.Options, s); err != nil { + return err + } return nil } @@ -117,6 +120,9 @@ func autoConvert_admission_AdmissionRequest_To_v1beta1_AdmissionRequest(in *admi return err } out.DryRun = (*bool)(unsafe.Pointer(in.DryRun)) + if err := runtime.Convert_runtime_Object_To_runtime_RawExtension(&in.Options, &out.Options, s); err != nil { + return err + } return nil } diff --git a/pkg/apis/admission/zz_generated.deepcopy.go b/pkg/apis/admission/zz_generated.deepcopy.go index 4c767f0dc7d..b68f0c67c22 100644 --- a/pkg/apis/admission/zz_generated.deepcopy.go +++ b/pkg/apis/admission/zz_generated.deepcopy.go @@ -42,6 +42,9 @@ func (in *AdmissionRequest) DeepCopyInto(out *AdmissionRequest) { *out = new(bool) **out = **in } + if in.Options != nil { + out.Options = in.Options.DeepCopyObject() + } return } diff --git a/staging/src/k8s.io/api/admission/v1beta1/generated.pb.go b/staging/src/k8s.io/api/admission/v1beta1/generated.pb.go index 4082082ff94..2eb7b86a197 100644 --- a/staging/src/k8s.io/api/admission/v1beta1/generated.pb.go +++ b/staging/src/k8s.io/api/admission/v1beta1/generated.pb.go @@ -158,6 +158,14 @@ func (m *AdmissionRequest) MarshalTo(dAtA []byte) (int, error) { } i++ } + dAtA[i] = 0x62 + i++ + i = encodeVarintGenerated(dAtA, i, uint64(m.Options.Size())) + n6, err := m.Options.MarshalTo(dAtA[i:]) + if err != nil { + return 0, err + } + i += n6 return i, nil } @@ -192,11 +200,11 @@ func (m *AdmissionResponse) MarshalTo(dAtA []byte) (int, error) { dAtA[i] = 0x1a i++ i = encodeVarintGenerated(dAtA, i, uint64(m.Result.Size())) - n6, err := m.Result.MarshalTo(dAtA[i:]) + n7, err := m.Result.MarshalTo(dAtA[i:]) if err != nil { return 0, err } - i += n6 + i += n7 } if m.Patch != nil { dAtA[i] = 0x22 @@ -254,21 +262,21 @@ func (m *AdmissionReview) MarshalTo(dAtA []byte) (int, error) { dAtA[i] = 0xa i++ i = encodeVarintGenerated(dAtA, i, uint64(m.Request.Size())) - n7, err := m.Request.MarshalTo(dAtA[i:]) + n8, err := m.Request.MarshalTo(dAtA[i:]) if err != nil { return 0, err } - i += n7 + i += n8 } if m.Response != nil { dAtA[i] = 0x12 i++ i = encodeVarintGenerated(dAtA, i, uint64(m.Response.Size())) - n8, err := m.Response.MarshalTo(dAtA[i:]) + n9, err := m.Response.MarshalTo(dAtA[i:]) if err != nil { return 0, err } - i += n8 + i += n9 } return i, nil } @@ -308,6 +316,8 @@ func (m *AdmissionRequest) Size() (n int) { if m.DryRun != nil { n += 2 } + l = m.Options.Size() + n += 1 + l + sovGenerated(uint64(l)) return n } @@ -383,6 +393,7 @@ func (this *AdmissionRequest) String() string { `Object:` + strings.Replace(strings.Replace(this.Object.String(), "RawExtension", "k8s_io_apimachinery_pkg_runtime.RawExtension", 1), `&`, ``, 1) + `,`, `OldObject:` + strings.Replace(strings.Replace(this.OldObject.String(), "RawExtension", "k8s_io_apimachinery_pkg_runtime.RawExtension", 1), `&`, ``, 1) + `,`, `DryRun:` + valueToStringGenerated(this.DryRun) + `,`, + `Options:` + strings.Replace(strings.Replace(this.Options.String(), "RawExtension", "k8s_io_apimachinery_pkg_runtime.RawExtension", 1), `&`, ``, 1) + `,`, `}`, }, "") return s @@ -776,6 +787,36 @@ func (m *AdmissionRequest) Unmarshal(dAtA []byte) error { } b := bool(v != 0) m.DryRun = &b + case 12: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Options", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowGenerated + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= (int(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthGenerated + } + postIndex := iNdEx + msglen + if postIndex > l { + return io.ErrUnexpectedEOF + } + if err := m.Options.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipGenerated(dAtA[iNdEx:]) @@ -1334,57 +1375,58 @@ func init() { } var fileDescriptorGenerated = []byte{ - // 821 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x54, 0xcf, 0x6f, 0xe3, 0x44, - 0x14, 0x8e, 0x37, 0x69, 0x12, 0x4f, 0x2a, 0x36, 0x3b, 0x80, 0x64, 0x45, 0xc8, 0x09, 0x3d, 0xa0, - 0x20, 0x6d, 0xc7, 0xb4, 0x82, 0x55, 0xb5, 0xe2, 0x12, 0xd3, 0x08, 0x55, 0x48, 0xdb, 0x6a, 0x76, - 0x83, 0x80, 0x03, 0xd2, 0xc4, 0x9e, 0x4d, 0x4c, 0xe2, 0x19, 0xe3, 0x99, 0x49, 0xc9, 0x0d, 0x71, - 0xe5, 0x82, 0xc4, 0x9f, 0xc4, 0xa5, 0xc7, 0x3d, 0xee, 0x29, 0xa2, 0xe1, 0xbf, 0xe8, 0x09, 0x79, - 0x3c, 0x8e, 0x43, 0xba, 0x85, 0x5d, 0xb4, 0x27, 0xfb, 0xfd, 0xf8, 0xbe, 0x37, 0xf3, 0xbd, 0x37, - 0x0f, 0x0c, 0x67, 0x27, 0x02, 0x45, 0xdc, 0x9b, 0xa9, 0x31, 0x4d, 0x19, 0x95, 0x54, 0x78, 0x0b, - 0xca, 0x42, 0x9e, 0x7a, 0x26, 0x40, 0x92, 0xc8, 0x23, 0x61, 0x1c, 0x09, 0x11, 0x71, 0xe6, 0x2d, - 0x8e, 0xc6, 0x54, 0x92, 0x23, 0x6f, 0x42, 0x19, 0x4d, 0x89, 0xa4, 0x21, 0x4a, 0x52, 0x2e, 0x39, - 0xfc, 0x20, 0xcf, 0x46, 0x24, 0x89, 0xd0, 0x26, 0x1b, 0x99, 0xec, 0xce, 0xe1, 0x24, 0x92, 0x53, - 0x35, 0x46, 0x01, 0x8f, 0xbd, 0x09, 0x9f, 0x70, 0x4f, 0x83, 0xc6, 0xea, 0xb9, 0xb6, 0xb4, 0xa1, - 0xff, 0x72, 0xb2, 0xce, 0xc3, 0xed, 0xd2, 0x4a, 0x4e, 0x29, 0x93, 0x51, 0x40, 0x64, 0x5e, 0x7f, - 0xb7, 0x74, 0xe7, 0xd3, 0x32, 0x3b, 0x26, 0xc1, 0x34, 0x62, 0x34, 0x5d, 0x7a, 0xc9, 0x6c, 0x92, - 0x39, 0x84, 0x17, 0x53, 0x49, 0x5e, 0x85, 0xf2, 0xee, 0x42, 0xa5, 0x8a, 0xc9, 0x28, 0xa6, 0xb7, - 0x00, 0x8f, 0xfe, 0x0b, 0x20, 0x82, 0x29, 0x8d, 0xc9, 0x2e, 0xee, 0xe0, 0xf7, 0x3a, 0x68, 0x0f, - 0x0a, 0x45, 0x30, 0xfd, 0x51, 0x51, 0x21, 0xa1, 0x0f, 0xaa, 0x2a, 0x0a, 0x1d, 0xab, 0x67, 0xf5, - 0x6d, 0xff, 0x93, 0xab, 0x55, 0xb7, 0xb2, 0x5e, 0x75, 0xab, 0xa3, 0xb3, 0xd3, 0x9b, 0x55, 0xf7, - 0xc3, 0xbb, 0x0a, 0xc9, 0x65, 0x42, 0x05, 0x1a, 0x9d, 0x9d, 0xe2, 0x0c, 0x0c, 0xbf, 0x01, 0xb5, - 0x59, 0xc4, 0x42, 0xe7, 0x5e, 0xcf, 0xea, 0xb7, 0x8e, 0x1f, 0xa1, 0xb2, 0x03, 0x1b, 0x18, 0x4a, - 0x66, 0x93, 0xcc, 0x21, 0x50, 0x26, 0x03, 0x5a, 0x1c, 0xa1, 0x2f, 0x53, 0xae, 0x92, 0xaf, 0x69, - 0x9a, 0x1d, 0xe6, 0xab, 0x88, 0x85, 0xfe, 0xbe, 0x29, 0x5e, 0xcb, 0x2c, 0xac, 0x19, 0xe1, 0x14, - 0x34, 0x53, 0x2a, 0xb8, 0x4a, 0x03, 0xea, 0x54, 0x35, 0xfb, 0xe3, 0x37, 0x67, 0xc7, 0x86, 0xc1, - 0x6f, 0x9b, 0x0a, 0xcd, 0xc2, 0x83, 0x37, 0xec, 0xf0, 0x33, 0xd0, 0x12, 0x6a, 0x5c, 0x04, 0x9c, - 0x9a, 0xd6, 0xe3, 0x5d, 0x03, 0x68, 0x3d, 0x2d, 0x43, 0x78, 0x3b, 0x0f, 0xf6, 0x40, 0x8d, 0x91, - 0x98, 0x3a, 0x7b, 0x3a, 0x7f, 0x73, 0x85, 0x27, 0x24, 0xa6, 0x58, 0x47, 0xa0, 0x07, 0xec, 0xec, - 0x2b, 0x12, 0x12, 0x50, 0xa7, 0xae, 0xd3, 0x1e, 0x98, 0x34, 0xfb, 0x49, 0x11, 0xc0, 0x65, 0x0e, - 0xfc, 0x1c, 0xd8, 0x3c, 0xc9, 0x1a, 0x17, 0x71, 0xe6, 0x34, 0x34, 0xc0, 0x2d, 0x00, 0xe7, 0x45, - 0xe0, 0x66, 0xdb, 0xc0, 0x25, 0x00, 0x3e, 0x03, 0x4d, 0x25, 0x68, 0x7a, 0xc6, 0x9e, 0x73, 0xa7, - 0xa9, 0x15, 0xfb, 0x08, 0x6d, 0xbf, 0x88, 0x7f, 0x0c, 0x71, 0xa6, 0xd4, 0xc8, 0x64, 0x97, 0xea, - 0x14, 0x1e, 0xbc, 0x61, 0x82, 0x23, 0x50, 0xe7, 0xe3, 0x1f, 0x68, 0x20, 0x1d, 0x5b, 0x73, 0x1e, - 0xde, 0xd9, 0x05, 0x33, 0x83, 0x08, 0x93, 0xcb, 0xe1, 0x4f, 0x92, 0xb2, 0xac, 0x01, 0xfe, 0x3b, - 0x86, 0xba, 0x7e, 0xae, 0x49, 0xb0, 0x21, 0x83, 0xdf, 0x03, 0x9b, 0xcf, 0xc3, 0xdc, 0xe9, 0x80, - 0xff, 0xc3, 0xbc, 0x91, 0xf2, 0xbc, 0xe0, 0xc1, 0x25, 0x25, 0x3c, 0x00, 0xf5, 0x30, 0x5d, 0x62, - 0xc5, 0x9c, 0x56, 0xcf, 0xea, 0x37, 0x7d, 0x90, 0x9d, 0xe1, 0x54, 0x7b, 0xb0, 0x89, 0x1c, 0xfc, - 0x52, 0x03, 0x0f, 0xb6, 0x5e, 0x85, 0x48, 0x38, 0x13, 0xf4, 0xad, 0x3c, 0x8b, 0x8f, 0x41, 0x83, - 0xcc, 0xe7, 0xfc, 0x92, 0xe6, 0x2f, 0xa3, 0xe9, 0xdf, 0x37, 0x3c, 0x8d, 0x41, 0xee, 0xc6, 0x45, - 0x1c, 0x5e, 0x80, 0xba, 0x90, 0x44, 0x2a, 0x61, 0xa6, 0xfc, 0xe1, 0xeb, 0x4d, 0xf9, 0x53, 0x8d, - 0xc9, 0xaf, 0x85, 0xa9, 0x50, 0x73, 0x89, 0x0d, 0x0f, 0xec, 0x82, 0xbd, 0x84, 0xc8, 0x60, 0xaa, - 0x27, 0x79, 0xdf, 0xb7, 0xd7, 0xab, 0xee, 0xde, 0x45, 0xe6, 0xc0, 0xb9, 0x1f, 0x9e, 0x00, 0x5b, - 0xff, 0x3c, 0x5b, 0x26, 0xc5, 0xf8, 0x76, 0x32, 0x21, 0x2f, 0x0a, 0xe7, 0xcd, 0xb6, 0x81, 0xcb, - 0x64, 0xf8, 0xab, 0x05, 0xda, 0x44, 0x85, 0x91, 0x1c, 0x30, 0xc6, 0xa5, 0x1e, 0x24, 0xe1, 0xd4, - 0x7b, 0xd5, 0x7e, 0xeb, 0x78, 0x88, 0xfe, 0x6d, 0xfb, 0xa2, 0x5b, 0x3a, 0xa3, 0xc1, 0x0e, 0xcf, - 0x90, 0xc9, 0x74, 0xe9, 0x3b, 0x46, 0xa8, 0xf6, 0x6e, 0x18, 0xdf, 0x2a, 0xdc, 0xf9, 0x02, 0xbc, - 0xff, 0x4a, 0x12, 0xd8, 0x06, 0xd5, 0x19, 0x5d, 0xe6, 0x2d, 0xc4, 0xd9, 0x2f, 0x7c, 0x0f, 0xec, - 0x2d, 0xc8, 0x5c, 0x51, 0xdd, 0x0e, 0x1b, 0xe7, 0xc6, 0xe3, 0x7b, 0x27, 0xd6, 0xc1, 0x1f, 0x16, - 0xb8, 0xbf, 0x75, 0xb8, 0x45, 0x44, 0x2f, 0xe1, 0x08, 0x34, 0xd2, 0x7c, 0x49, 0x6a, 0x8e, 0xd6, - 0x31, 0x7a, 0xed, 0xcb, 0x69, 0x94, 0xdf, 0xca, 0x5a, 0x6d, 0x0c, 0x5c, 0x70, 0xc1, 0x6f, 0xf5, - 0x4a, 0xd3, 0xb7, 0x37, 0x0b, 0xd3, 0x7b, 0x43, 0xd1, 0xfc, 0x7d, 0xb3, 0xc3, 0xb4, 0x85, 0x37, - 0x74, 0xfe, 0xe1, 0xd5, 0xb5, 0x5b, 0x79, 0x71, 0xed, 0x56, 0x5e, 0x5e, 0xbb, 0x95, 0x9f, 0xd7, - 0xae, 0x75, 0xb5, 0x76, 0xad, 0x17, 0x6b, 0xd7, 0x7a, 0xb9, 0x76, 0xad, 0x3f, 0xd7, 0xae, 0xf5, - 0xdb, 0x5f, 0x6e, 0xe5, 0xbb, 0x86, 0x21, 0xfe, 0x3b, 0x00, 0x00, 0xff, 0xff, 0xf4, 0xc2, 0x6f, - 0x1b, 0x71, 0x07, 0x00, 0x00, + // 840 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x54, 0xcf, 0x6f, 0x1b, 0x45, + 0x14, 0xf6, 0xd6, 0x8e, 0xed, 0x1d, 0x47, 0xd4, 0x1d, 0x40, 0x5a, 0x59, 0x68, 0x6d, 0x72, 0x40, + 0x41, 0x6a, 0x66, 0x49, 0x04, 0x55, 0x54, 0x71, 0xc9, 0x92, 0x08, 0x45, 0x48, 0x4d, 0x34, 0xad, + 0x51, 0xe1, 0x80, 0x34, 0xde, 0x9d, 0xda, 0x8b, 0xbd, 0x33, 0xcb, 0xce, 0x8c, 0x83, 0x6f, 0x88, + 0x2b, 0x17, 0xfe, 0x27, 0x2e, 0x39, 0xf6, 0xd8, 0x53, 0x44, 0xcc, 0x99, 0x7f, 0x20, 0x27, 0x34, + 0xb3, 0xb3, 0x5e, 0x93, 0x34, 0xd0, 0x46, 0x3d, 0xed, 0xbc, 0x1f, 0xdf, 0xf7, 0xde, 0x7c, 0x6f, + 0xdf, 0x80, 0xa3, 0xe9, 0xbe, 0x40, 0x09, 0x0f, 0xa6, 0x6a, 0x44, 0x73, 0x46, 0x25, 0x15, 0xc1, + 0x9c, 0xb2, 0x98, 0xe7, 0x81, 0x0d, 0x90, 0x2c, 0x09, 0x48, 0x9c, 0x26, 0x42, 0x24, 0x9c, 0x05, + 0xf3, 0xdd, 0x11, 0x95, 0x64, 0x37, 0x18, 0x53, 0x46, 0x73, 0x22, 0x69, 0x8c, 0xb2, 0x9c, 0x4b, + 0x0e, 0x3f, 0x2a, 0xb2, 0x11, 0xc9, 0x12, 0xb4, 0xca, 0x46, 0x36, 0xbb, 0xb7, 0x33, 0x4e, 0xe4, + 0x44, 0x8d, 0x50, 0xc4, 0xd3, 0x60, 0xcc, 0xc7, 0x3c, 0x30, 0xa0, 0x91, 0x7a, 0x61, 0x2c, 0x63, + 0x98, 0x53, 0x41, 0xd6, 0x7b, 0xb8, 0x5e, 0x5a, 0xc9, 0x09, 0x65, 0x32, 0x89, 0x88, 0x2c, 0xea, + 0x5f, 0x2f, 0xdd, 0xfb, 0xbc, 0xca, 0x4e, 0x49, 0x34, 0x49, 0x18, 0xcd, 0x17, 0x41, 0x36, 0x1d, + 0x6b, 0x87, 0x08, 0x52, 0x2a, 0xc9, 0xeb, 0x50, 0xc1, 0x6d, 0xa8, 0x5c, 0x31, 0x99, 0xa4, 0xf4, + 0x06, 0xe0, 0xd1, 0xff, 0x01, 0x44, 0x34, 0xa1, 0x29, 0xb9, 0x8e, 0xdb, 0xfa, 0xbb, 0x09, 0xba, + 0x07, 0xa5, 0x22, 0x98, 0xfe, 0xa4, 0xa8, 0x90, 0x30, 0x04, 0x75, 0x95, 0xc4, 0x9e, 0x33, 0x70, + 0xb6, 0xdd, 0xf0, 0xb3, 0xf3, 0x8b, 0x7e, 0x6d, 0x79, 0xd1, 0xaf, 0x0f, 0x8f, 0x0f, 0xaf, 0x2e, + 0xfa, 0x1f, 0xdf, 0x56, 0x48, 0x2e, 0x32, 0x2a, 0xd0, 0xf0, 0xf8, 0x10, 0x6b, 0x30, 0x7c, 0x0e, + 0x1a, 0xd3, 0x84, 0xc5, 0xde, 0xbd, 0x81, 0xb3, 0xdd, 0xd9, 0x7b, 0x84, 0xaa, 0x09, 0xac, 0x60, + 0x28, 0x9b, 0x8e, 0xb5, 0x43, 0x20, 0x2d, 0x03, 0x9a, 0xef, 0xa2, 0xaf, 0x73, 0xae, 0xb2, 0x6f, + 0x69, 0xae, 0x9b, 0xf9, 0x26, 0x61, 0x71, 0xb8, 0x69, 0x8b, 0x37, 0xb4, 0x85, 0x0d, 0x23, 0x9c, + 0x80, 0x76, 0x4e, 0x05, 0x57, 0x79, 0x44, 0xbd, 0xba, 0x61, 0x7f, 0xfc, 0xf6, 0xec, 0xd8, 0x32, + 0x84, 0x5d, 0x5b, 0xa1, 0x5d, 0x7a, 0xf0, 0x8a, 0x1d, 0x7e, 0x01, 0x3a, 0x42, 0x8d, 0xca, 0x80, + 0xd7, 0x30, 0x7a, 0xbc, 0x6f, 0x01, 0x9d, 0xa7, 0x55, 0x08, 0xaf, 0xe7, 0xc1, 0x01, 0x68, 0x30, + 0x92, 0x52, 0x6f, 0xc3, 0xe4, 0xaf, 0xae, 0xf0, 0x84, 0xa4, 0x14, 0x9b, 0x08, 0x0c, 0x80, 0xab, + 0xbf, 0x22, 0x23, 0x11, 0xf5, 0x9a, 0x26, 0xed, 0x81, 0x4d, 0x73, 0x9f, 0x94, 0x01, 0x5c, 0xe5, + 0xc0, 0x2f, 0x81, 0xcb, 0x33, 0x3d, 0xb8, 0x84, 0x33, 0xaf, 0x65, 0x00, 0x7e, 0x09, 0x38, 0x29, + 0x03, 0x57, 0xeb, 0x06, 0xae, 0x00, 0xf0, 0x19, 0x68, 0x2b, 0x41, 0xf3, 0x63, 0xf6, 0x82, 0x7b, + 0x6d, 0xa3, 0xd8, 0x27, 0x68, 0x7d, 0x23, 0xfe, 0xf5, 0x13, 0x6b, 0xa5, 0x86, 0x36, 0xbb, 0x52, + 0xa7, 0xf4, 0xe0, 0x15, 0x13, 0x1c, 0x82, 0x26, 0x1f, 0xfd, 0x48, 0x23, 0xe9, 0xb9, 0x86, 0x73, + 0xe7, 0xd6, 0x29, 0xd8, 0x7f, 0x10, 0x61, 0x72, 0x76, 0xf4, 0xb3, 0xa4, 0x4c, 0x0f, 0x20, 0x7c, + 0xcf, 0x52, 0x37, 0x4f, 0x0c, 0x09, 0xb6, 0x64, 0xf0, 0x07, 0xe0, 0xf2, 0x59, 0x5c, 0x38, 0x3d, + 0x70, 0x17, 0xe6, 0x95, 0x94, 0x27, 0x25, 0x0f, 0xae, 0x28, 0xe1, 0x16, 0x68, 0xc6, 0xf9, 0x02, + 0x2b, 0xe6, 0x75, 0x06, 0xce, 0x76, 0x3b, 0x04, 0xba, 0x87, 0x43, 0xe3, 0xc1, 0x36, 0x02, 0x9f, + 0x83, 0x16, 0xcf, 0xb4, 0x18, 0xc2, 0xdb, 0xbc, 0x4b, 0x07, 0xf7, 0x6d, 0x07, 0xad, 0x93, 0x82, + 0x05, 0x97, 0x74, 0x5b, 0xbf, 0x36, 0xc0, 0x83, 0xb5, 0x7d, 0x13, 0x19, 0x67, 0x82, 0xbe, 0x93, + 0x85, 0xfb, 0x14, 0xb4, 0xc8, 0x6c, 0xc6, 0xcf, 0x68, 0xb1, 0x73, 0xed, 0xaa, 0x89, 0x83, 0xc2, + 0x8d, 0xcb, 0x38, 0x3c, 0x05, 0x4d, 0x21, 0x89, 0x54, 0xc2, 0xee, 0xcf, 0xc3, 0x37, 0xdb, 0x9f, + 0xa7, 0x06, 0x53, 0x08, 0x86, 0xa9, 0x50, 0x33, 0x89, 0x2d, 0x0f, 0xec, 0x83, 0x8d, 0x8c, 0xc8, + 0x68, 0x62, 0x76, 0x64, 0x33, 0x74, 0x97, 0x17, 0xfd, 0x8d, 0x53, 0xed, 0xc0, 0x85, 0x1f, 0xee, + 0x03, 0xd7, 0x1c, 0x9e, 0x2d, 0xb2, 0x72, 0x31, 0x7a, 0x7a, 0x44, 0xa7, 0xa5, 0xf3, 0x6a, 0xdd, + 0xc0, 0x55, 0x32, 0xfc, 0xcd, 0x01, 0x5d, 0xa2, 0xe2, 0x44, 0x1e, 0x30, 0xc6, 0x25, 0x29, 0xa6, + 0xd2, 0x1c, 0xd4, 0xb7, 0x3b, 0x7b, 0x47, 0xe8, 0xbf, 0xde, 0x75, 0x74, 0x43, 0x67, 0x74, 0x70, + 0x8d, 0xe7, 0x88, 0xc9, 0x7c, 0x11, 0x7a, 0x56, 0xa8, 0xee, 0xf5, 0x30, 0xbe, 0x51, 0xb8, 0xf7, + 0x15, 0xf8, 0xf0, 0xb5, 0x24, 0xb0, 0x0b, 0xea, 0x53, 0xba, 0x28, 0x46, 0x88, 0xf5, 0x11, 0x7e, + 0x00, 0x36, 0xe6, 0x64, 0xa6, 0xa8, 0x19, 0x87, 0x8b, 0x0b, 0xe3, 0xf1, 0xbd, 0x7d, 0x67, 0xeb, + 0x0f, 0x07, 0xdc, 0x5f, 0x6b, 0x6e, 0x9e, 0xd0, 0x33, 0x38, 0x04, 0xad, 0xbc, 0x78, 0x7e, 0x0d, + 0x47, 0x67, 0x0f, 0xbd, 0xf1, 0xe5, 0x0c, 0x2a, 0xec, 0xe8, 0x51, 0x5b, 0x03, 0x97, 0x5c, 0xf0, + 0x3b, 0xf3, 0x58, 0x9a, 0xdb, 0xdb, 0xa7, 0x38, 0x78, 0x4b, 0xd1, 0xc2, 0x4d, 0xfb, 0x3a, 0x1a, + 0x0b, 0xaf, 0xe8, 0xc2, 0x9d, 0xf3, 0x4b, 0xbf, 0xf6, 0xf2, 0xd2, 0xaf, 0xbd, 0xba, 0xf4, 0x6b, + 0xbf, 0x2c, 0x7d, 0xe7, 0x7c, 0xe9, 0x3b, 0x2f, 0x97, 0xbe, 0xf3, 0x6a, 0xe9, 0x3b, 0x7f, 0x2e, + 0x7d, 0xe7, 0xf7, 0xbf, 0xfc, 0xda, 0xf7, 0x2d, 0x4b, 0xfc, 0x4f, 0x00, 0x00, 0x00, 0xff, 0xff, + 0x9a, 0x46, 0xfc, 0x70, 0xcb, 0x07, 0x00, 0x00, } diff --git a/staging/src/k8s.io/api/admission/v1beta1/generated.proto b/staging/src/k8s.io/api/admission/v1beta1/generated.proto index 451d4c9ad77..9bf414c1f47 100644 --- a/staging/src/k8s.io/api/admission/v1beta1/generated.proto +++ b/staging/src/k8s.io/api/admission/v1beta1/generated.proto @@ -60,7 +60,8 @@ message AdmissionRequest { // +optional optional string namespace = 6; - // Operation is the operation being performed + // Operation is the operation being performed. This may be different than the operation + // requested. e.g. a patch can result in either a CREATE or UPDATE Operation. optional string operation = 7; // UserInfo is information about the requesting user @@ -78,6 +79,14 @@ message AdmissionRequest { // Defaults to false. // +optional optional bool dryRun = 11; + + // Options is the operation option structure of the operation being performed. + // e.g. `meta.k8s.io/v1.DeleteOptions` or `meta.k8s.io/v1.CreateOptions`. This may be + // different than the options the caller provided. e.g. for a patch request the performed + // Operation might be a CREATE, in which case the Options will a + // `meta.k8s.io/v1.CreateOptions` even though the caller provided `meta.k8s.io/v1.PatchOptions`. + // +optional + optional k8s.io.apimachinery.pkg.runtime.RawExtension options = 12; } // AdmissionResponse describes an admission response. diff --git a/staging/src/k8s.io/api/admission/v1beta1/types_swagger_doc_generated.go b/staging/src/k8s.io/api/admission/v1beta1/types_swagger_doc_generated.go index 8a938db3b4a..700b5f9e4a1 100644 --- a/staging/src/k8s.io/api/admission/v1beta1/types_swagger_doc_generated.go +++ b/staging/src/k8s.io/api/admission/v1beta1/types_swagger_doc_generated.go @@ -35,11 +35,12 @@ var map_AdmissionRequest = map[string]string{ "subResource": "SubResource is the name of the subresource being requested. This is a different resource, scoped to the parent resource, but it may have a different kind. For instance, /pods has the resource \"pods\" and the kind \"Pod\", while /pods/foo/status has the resource \"pods\", the sub resource \"status\", and the kind \"Pod\" (because status operates on pods). The binding resource for a pod though may be /pods/foo/binding, which has resource \"pods\", subresource \"binding\", and kind \"Binding\".", "name": "Name is the name of the object as presented in the request. On a CREATE operation, the client may omit name and rely on the server to generate the name. If that is the case, this method will return the empty string.", "namespace": "Namespace is the namespace associated with the request (if any).", - "operation": "Operation is the operation being performed", + "operation": "Operation is the operation being performed. This may be different than the operation requested. e.g. a patch can result in either a CREATE or UPDATE Operation.", "userInfo": "UserInfo is information about the requesting user", "object": "Object is the object from the incoming request prior to default values being applied", "oldObject": "OldObject is the existing object. Only populated for UPDATE requests.", "dryRun": "DryRun indicates that modifications will definitely not be persisted for this request. Defaults to false.", + "options": "Options is the operation option structure of the operation being performed. e.g. `meta.k8s.io/v1.DeleteOptions` or `meta.k8s.io/v1.CreateOptions`. This may be different than the options the caller provided. e.g. for a patch request the performed Operation might be a CREATE, in which case the Options will a `meta.k8s.io/v1.CreateOptions` even though the caller provided `meta.k8s.io/v1.PatchOptions`.", } func (AdmissionRequest) SwaggerDoc() map[string]string { diff --git a/staging/src/k8s.io/api/admission/v1beta1/zz_generated.deepcopy.go b/staging/src/k8s.io/api/admission/v1beta1/zz_generated.deepcopy.go index 2b4352a9482..5bafcbdc5f9 100644 --- a/staging/src/k8s.io/api/admission/v1beta1/zz_generated.deepcopy.go +++ b/staging/src/k8s.io/api/admission/v1beta1/zz_generated.deepcopy.go @@ -38,6 +38,7 @@ func (in *AdmissionRequest) DeepCopyInto(out *AdmissionRequest) { *out = new(bool) **out = **in } + in.Options.DeepCopyInto(&out.Options) return } diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1/generated.proto b/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1/generated.proto index a0c23a44f56..011cee45521 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1/generated.proto +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1/generated.proto @@ -46,7 +46,7 @@ message ConversionRequest { // ConversionResponse describes a conversion response. message ConversionResponse { // `uid` is an identifier for the individual request/response. - // This should be copied over from the corresponding AdmissionRequest. + // This should be copied over from the corresponding ConversionRequest. optional string uid = 1; // `convertedObjects` is the list of converted version of `request.objects` if the `result` is successful otherwise empty.