From 6ae239a9cc3b51355414baec0811aaa77e34e8b6 Mon Sep 17 00:00:00 2001 From: Clayton Coleman Date: Sat, 28 Jul 2018 15:52:35 -0400 Subject: [PATCH 1/2] Images are themselves manifests, and reference a config blob The naming of the nested field was wrong (this known as the image "config") and we need to correct it. An OpenShift image is always a manifest. --- image/v1/generated.pb.go | 324 ++++++++++++------------ image/v1/generated.proto | 8 +- image/v1/types.go | 8 +- image/v1/types_swagger_doc_generated.go | 8 +- image/v1/zz_generated.deepcopy.go | 4 +- 5 files changed, 176 insertions(+), 176 deletions(-) diff --git a/image/v1/generated.pb.go b/image/v1/generated.pb.go index cec6c04de6f..46b27339afc 100644 --- a/image/v1/generated.pb.go +++ b/image/v1/generated.pb.go @@ -399,11 +399,11 @@ func (m *ImageBlobReferences) MarshalTo(dAtA []byte) (int, error) { i += copy(dAtA[i:], s) } } - if m.Manifest != nil { + if m.Config != nil { dAtA[i] = 0x12 i++ - i = encodeVarintGenerated(dAtA, i, uint64(len(*m.Manifest))) - i += copy(dAtA[i:], *m.Manifest) + i = encodeVarintGenerated(dAtA, i, uint64(len(*m.Config))) + i += copy(dAtA[i:], *m.Config) } return i, nil } @@ -1889,8 +1889,8 @@ func (m *ImageBlobReferences) Size() (n int) { n += 1 + l + sovGenerated(uint64(l)) } } - if m.Manifest != nil { - l = len(*m.Manifest) + if m.Config != nil { + l = len(*m.Config) n += 1 + l + sovGenerated(uint64(l)) } return n @@ -2429,7 +2429,7 @@ func (this *ImageBlobReferences) String() string { } s := strings.Join([]string{`&ImageBlobReferences{`, `Layers:` + fmt.Sprintf("%v", this.Layers) + `,`, - `Manifest:` + valueToStringGenerated(this.Manifest) + `,`, + `Config:` + valueToStringGenerated(this.Config) + `,`, `}`, }, "") return s @@ -3464,7 +3464,7 @@ func (m *ImageBlobReferences) Unmarshal(dAtA []byte) error { iNdEx = postIndex case 2: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Manifest", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field Config", wireType) } var stringLen uint64 for shift := uint(0); ; shift += 7 { @@ -3490,7 +3490,7 @@ func (m *ImageBlobReferences) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } s := string(dAtA[iNdEx:postIndex]) - m.Manifest = &s + m.Config = &s iNdEx = postIndex default: iNdEx = preIndex @@ -8469,158 +8469,158 @@ func init() { } var fileDescriptorGenerated = []byte{ - // 2445 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x5a, 0x4f, 0x6c, 0xdb, 0xc8, - 0xd5, 0x0f, 0x45, 0x49, 0x96, 0x9f, 0x1d, 0x3b, 0x9e, 0xc4, 0x59, 0xad, 0x92, 0xb5, 0xbd, 0xcc, - 0x97, 0x20, 0x5f, 0x9b, 0xa5, 0x6a, 0x6f, 0x76, 0x9b, 0xa4, 0x40, 0x77, 0xa3, 0x28, 0x0d, 0xd4, - 0xda, 0x8d, 0x77, 0xac, 0xe6, 0x10, 0xa4, 0x40, 0x69, 0x6a, 0x4c, 0x4f, 0x2d, 0x91, 0x2a, 0x49, - 0x79, 0xd7, 0x41, 0x0b, 0xf4, 0x50, 0x2c, 0xf6, 0xd0, 0x43, 0x7b, 0xde, 0x63, 0xb1, 0x28, 0x7a, - 0x2e, 0x5a, 0xf4, 0xde, 0x16, 0x08, 0x7a, 0xe9, 0x62, 0x7b, 0xd9, 0x4b, 0x8d, 0x46, 0xed, 0xb9, - 0xb7, 0x5e, 0xf6, 0x54, 0xcc, 0x70, 0x48, 0x0e, 0x29, 0xca, 0xa6, 0xd2, 0xd8, 0x68, 0x6f, 0xe2, - 0xcc, 0x7b, 0xbf, 0xf7, 0xf8, 0xde, 0xbc, 0x3f, 0xf3, 0x28, 0x58, 0xb5, 0xa8, 0xbf, 0x3b, 0xd8, - 0xd6, 0x4d, 0xa7, 0x57, 0x77, 0xfa, 0xc4, 0xf6, 0x76, 0xe9, 0x8e, 0x5f, 0x37, 0xfa, 0xb4, 0x4e, - 0x7b, 0x86, 0x45, 0xea, 0xfb, 0xab, 0x75, 0x8b, 0xd8, 0xc4, 0x35, 0x7c, 0xd2, 0xd1, 0xfb, 0xae, - 0xe3, 0x3b, 0xe8, 0xf5, 0x98, 0x45, 0x8f, 0x58, 0x74, 0xa3, 0x4f, 0x75, 0xce, 0xa2, 0xef, 0xaf, - 0xd6, 0xde, 0x90, 0x50, 0x2d, 0xc7, 0x72, 0xea, 0x9c, 0x73, 0x7b, 0xb0, 0xc3, 0x9f, 0xf8, 0x03, - 0xff, 0x15, 0x20, 0xd6, 0xb4, 0xbd, 0x5b, 0x9e, 0x4e, 0x1d, 0x2e, 0xd6, 0x74, 0xdc, 0x2c, 0xa9, - 0xb5, 0x9b, 0x31, 0x4d, 0xcf, 0x30, 0x77, 0xa9, 0x4d, 0xdc, 0x83, 0x7a, 0x7f, 0xcf, 0x62, 0x0b, - 0x5e, 0xbd, 0x47, 0x7c, 0x23, 0x8b, 0xab, 0x3e, 0x8e, 0xcb, 0x1d, 0xd8, 0x3e, 0xed, 0x91, 0x11, - 0x86, 0xb7, 0x8f, 0x63, 0xf0, 0xcc, 0x5d, 0xd2, 0x33, 0x46, 0xf8, 0xde, 0x1c, 0xc7, 0x37, 0xf0, - 0x69, 0xb7, 0x4e, 0x6d, 0xdf, 0xf3, 0xdd, 0x34, 0x93, 0xf6, 0x99, 0x02, 0x17, 0x9a, 0x8e, 0xb9, - 0x47, 0xdc, 0x16, 0xb3, 0x1c, 0x26, 0x3b, 0xc4, 0x25, 0xb6, 0x49, 0xd0, 0x0d, 0xa8, 0xb8, 0xc4, - 0xa2, 0x9e, 0xef, 0x1e, 0x54, 0x95, 0x15, 0xe5, 0xfa, 0x74, 0xe3, 0xdc, 0xb3, 0xc3, 0xe5, 0x33, - 0xc3, 0xc3, 0xe5, 0x0a, 0x16, 0xeb, 0x38, 0xa2, 0x40, 0x75, 0x98, 0xb6, 0x8d, 0x1e, 0xf1, 0xfa, - 0x86, 0x49, 0xaa, 0x05, 0x4e, 0xbe, 0x20, 0xc8, 0xa7, 0xbf, 0x1d, 0x6e, 0xe0, 0x98, 0x06, 0xad, - 0x40, 0x91, 0x3d, 0x54, 0x55, 0x4e, 0x3b, 0x2b, 0x68, 0x8b, 0x8c, 0x16, 0xf3, 0x1d, 0xf4, 0x1a, - 0xa8, 0xbe, 0x61, 0x55, 0x8b, 0x9c, 0x60, 0x46, 0x10, 0xa8, 0x6d, 0xc3, 0xc2, 0x6c, 0x1d, 0xd5, - 0xa0, 0x40, 0x9b, 0xd5, 0x12, 0xdf, 0x05, 0xb1, 0x5b, 0x68, 0x35, 0x71, 0x81, 0x36, 0xb5, 0x3f, - 0x4f, 0x41, 0x89, 0xbf, 0x0e, 0xfa, 0x1e, 0x54, 0x98, 0x5f, 0x3a, 0x86, 0x6f, 0xf0, 0xb7, 0x98, - 0x59, 0xfb, 0x8a, 0x1e, 0x98, 0x49, 0x97, 0xcd, 0xa4, 0xf7, 0xf7, 0x2c, 0xb6, 0xe0, 0xe9, 0x8c, - 0x5a, 0xdf, 0x5f, 0xd5, 0x1f, 0x6e, 0x7f, 0x9f, 0x98, 0xfe, 0x06, 0xf1, 0x8d, 0x06, 0x12, 0xe8, - 0x10, 0xaf, 0xe1, 0x08, 0x15, 0x6d, 0xc2, 0x85, 0x4e, 0x86, 0xfd, 0x84, 0x11, 0x2e, 0x0b, 0xde, - 0x4c, 0x1b, 0xe3, 0x4c, 0x4e, 0xf4, 0x43, 0x38, 0x2f, 0xad, 0x6f, 0x84, 0xea, 0xab, 0x5c, 0xfd, - 0x37, 0xc6, 0xaa, 0x2f, 0x4e, 0x87, 0x8e, 0x8d, 0xf7, 0xef, 0x7f, 0xe0, 0x13, 0xdb, 0xa3, 0x8e, - 0xdd, 0xb8, 0x24, 0xe4, 0x9f, 0x6f, 0x8e, 0x22, 0xe2, 0x2c, 0x31, 0x68, 0x1b, 0x6a, 0x19, 0xcb, - 0x8f, 0x88, 0xcb, 0xf0, 0x84, 0x37, 0x34, 0x81, 0x5a, 0x6b, 0x8e, 0xa5, 0xc4, 0x47, 0xa0, 0xa0, - 0x8d, 0xe4, 0x1b, 0x1a, 0x36, 0xdd, 0x21, 0x9e, 0x2f, 0x9c, 0x99, 0xa9, 0xb2, 0x20, 0xc1, 0x59, - 0x7c, 0x68, 0x1f, 0x16, 0xa4, 0xe5, 0x75, 0xe3, 0x80, 0xb8, 0x5e, 0xb5, 0xbc, 0xa2, 0x72, 0x73, - 0x1d, 0x9b, 0x29, 0xf4, 0x98, 0xab, 0xf1, 0xaa, 0x90, 0xbd, 0xd0, 0x4c, 0xe3, 0xe1, 0x51, 0x11, - 0x88, 0x00, 0x78, 0xd4, 0xb2, 0x0d, 0x7f, 0xe0, 0x12, 0xaf, 0x3a, 0xc5, 0x05, 0xae, 0xe6, 0x15, - 0xb8, 0x15, 0x72, 0xc6, 0xe7, 0x2b, 0x5a, 0xf2, 0xb0, 0x04, 0x8c, 0x1e, 0xc2, 0xa2, 0x24, 0x3b, - 0x26, 0xaa, 0x56, 0x56, 0xd4, 0xeb, 0xb3, 0x8d, 0x57, 0x87, 0x87, 0xcb, 0x8b, 0xcd, 0x2c, 0x02, - 0x9c, 0xcd, 0x87, 0x76, 0xe1, 0x72, 0x86, 0x19, 0x37, 0x48, 0x87, 0x1a, 0xed, 0x83, 0x3e, 0xa9, - 0x4e, 0x73, 0x3f, 0xfc, 0x9f, 0x50, 0xeb, 0x72, 0xf3, 0x08, 0x5a, 0x7c, 0x24, 0x12, 0x7a, 0x90, - 0xf0, 0xcc, 0x3d, 0xc7, 0xde, 0xa1, 0x56, 0x15, 0x38, 0x7c, 0x96, 0xa9, 0x03, 0x02, 0x3c, 0xca, - 0xa3, 0x99, 0x70, 0x9e, 0x3f, 0x36, 0xba, 0xce, 0x76, 0x14, 0x29, 0x1e, 0xd2, 0xa0, 0xdc, 0x0d, - 0xdc, 0xad, 0xac, 0xa8, 0x2c, 0x11, 0x0c, 0x0f, 0x97, 0xcb, 0xc2, 0x61, 0x62, 0x07, 0x5d, 0x87, - 0x4a, 0x2f, 0x3c, 0x61, 0x41, 0x50, 0xce, 0xb2, 0x24, 0x16, 0x1d, 0xa9, 0x68, 0x57, 0xfb, 0xa3, - 0x0a, 0xf3, 0x5c, 0x4a, 0xab, 0xd7, 0x77, 0x5c, 0x7f, 0xab, 0x4f, 0x4c, 0x74, 0x1f, 0x8a, 0x3b, - 0xae, 0xd3, 0x13, 0xc9, 0xe3, 0x8a, 0x14, 0x7d, 0x3a, 0x2b, 0x13, 0x71, 0xaa, 0x88, 0xb4, 0x8a, - 0x93, 0xd9, 0x37, 0x5c, 0xa7, 0x87, 0x39, 0x3b, 0x7a, 0x17, 0x0a, 0xbe, 0xc3, 0xc5, 0xcf, 0xac, - 0x5d, 0xcf, 0x02, 0x59, 0x77, 0x4c, 0xa3, 0x9b, 0x46, 0x2a, 0xb3, 0x9c, 0xd6, 0x76, 0x70, 0xc1, - 0x77, 0x50, 0x17, 0x66, 0x29, 0x57, 0x6b, 0xd3, 0xe9, 0x52, 0xf3, 0x40, 0xa4, 0x83, 0xb5, 0x1c, - 0xc7, 0xad, 0x6d, 0x58, 0x2d, 0x89, 0xb3, 0x71, 0x41, 0xe8, 0x37, 0x2b, 0xaf, 0xe2, 0x04, 0x3a, - 0xba, 0x0b, 0xf3, 0xd4, 0x36, 0xbb, 0x83, 0x4e, 0x1c, 0x9d, 0x2c, 0xf4, 0x2b, 0x8d, 0x57, 0x04, - 0xf3, 0x7c, 0x2b, 0xb9, 0x8d, 0xd3, 0xf4, 0xe8, 0x03, 0x98, 0x77, 0xc3, 0x37, 0x11, 0x3a, 0x97, - 0xb8, 0xce, 0x6f, 0xe5, 0xd3, 0x19, 0x27, 0x99, 0x63, 0xc9, 0xa9, 0x0d, 0x9c, 0x16, 0xa3, 0xfd, - 0x45, 0x81, 0x05, 0xd9, 0x8f, 0xbe, 0xe1, 0x0f, 0x3c, 0xd4, 0x86, 0xb2, 0xc7, 0x7f, 0x09, 0x5f, - 0xde, 0xc8, 0x57, 0x08, 0x02, 0xee, 0xc6, 0x9c, 0x90, 0x5e, 0x0e, 0x9e, 0xb1, 0xc0, 0x42, 0x2d, - 0x28, 0x71, 0xa5, 0x23, 0xdf, 0xe6, 0x0c, 0xff, 0xc6, 0xf4, 0xf0, 0x70, 0x39, 0x28, 0x52, 0x38, - 0x40, 0x08, 0x0b, 0x9e, 0x9a, 0x5d, 0xf0, 0xb4, 0x0f, 0x15, 0x80, 0x38, 0xfb, 0x44, 0x05, 0x54, - 0x19, 0x5b, 0x40, 0xaf, 0x42, 0xd1, 0xa3, 0x4f, 0x03, 0xcd, 0xd4, 0xb8, 0x1c, 0x73, 0xf6, 0x2d, - 0xfa, 0x94, 0x60, 0xbe, 0xcd, 0x4a, 0x77, 0x2f, 0x0a, 0x7d, 0x35, 0x59, 0xba, 0xe3, 0x38, 0x8f, - 0x69, 0xb4, 0x0e, 0xcc, 0xc5, 0x7a, 0x34, 0x59, 0xcd, 0x78, 0x5d, 0x48, 0x52, 0xb8, 0xa4, 0xb3, - 0xc7, 0x4a, 0x29, 0xe4, 0x90, 0xf2, 0x3b, 0x05, 0xa6, 0x03, 0x31, 0xd4, 0xf3, 0xd1, 0x93, 0x91, - 0x3a, 0xae, 0xe7, 0x73, 0x1f, 0xe3, 0xe6, 0x55, 0x3c, 0xea, 0x5e, 0xc2, 0x15, 0xa9, 0x86, 0x6f, - 0x40, 0x89, 0xfa, 0xa4, 0xe7, 0x55, 0x0b, 0x3c, 0x87, 0xe7, 0x77, 0xe2, 0x59, 0x01, 0x5a, 0x6a, - 0x31, 0x76, 0x1c, 0xa0, 0x68, 0xb7, 0xc4, 0xf1, 0x5b, 0x77, 0x9c, 0xbd, 0x41, 0x5f, 0x44, 0xd4, - 0x15, 0x28, 0x75, 0x59, 0x8c, 0x73, 0x13, 0x57, 0x62, 0x4e, 0x1e, 0xf8, 0x38, 0xd8, 0xd3, 0x7e, - 0x5d, 0x16, 0xb6, 0x8d, 0xb2, 0xf5, 0x29, 0x74, 0x30, 0x2b, 0x50, 0xf4, 0x63, 0xaf, 0x44, 0x27, - 0x89, 0x3b, 0x84, 0xef, 0xa0, 0xab, 0x30, 0x65, 0x3a, 0xb6, 0x4f, 0x6c, 0x9f, 0x6b, 0x3f, 0xdb, - 0x98, 0x19, 0x1e, 0x2e, 0x4f, 0xdd, 0x0b, 0x96, 0x70, 0xb8, 0x87, 0x28, 0x80, 0xe9, 0xd8, 0x1d, - 0xea, 0x53, 0xc7, 0xf6, 0xaa, 0x45, 0x6e, 0xcb, 0x3c, 0xc1, 0x1e, 0xbd, 0xec, 0xbd, 0x90, 0x3b, - 0xd6, 0x38, 0x5a, 0xf2, 0xb0, 0x04, 0x8e, 0xbe, 0x06, 0x67, 0x39, 0x7b, 0xab, 0x43, 0x6c, 0x9f, - 0xfa, 0x07, 0xa2, 0x77, 0x58, 0x14, 0x6c, 0x67, 0x5b, 0xf2, 0x26, 0x4e, 0xd2, 0xa2, 0x1f, 0xc1, - 0x2c, 0x2b, 0xaf, 0xa4, 0x73, 0xaf, 0x6b, 0xd0, 0x5e, 0xd8, 0x2a, 0xdc, 0x9b, 0xb8, 0x72, 0x73, - 0xc5, 0x43, 0x94, 0xfb, 0xb6, 0xef, 0x4a, 0xb9, 0x55, 0xde, 0xc2, 0x09, 0x71, 0xe8, 0x3d, 0x98, - 0x32, 0x5d, 0xc2, 0x7a, 0xf0, 0xea, 0x14, 0x77, 0xe8, 0x97, 0xf2, 0x39, 0xb4, 0x4d, 0x7b, 0x44, - 0x58, 0x3e, 0x60, 0xc7, 0x21, 0x0e, 0x0b, 0x0f, 0xea, 0x79, 0x03, 0xd2, 0x69, 0x1c, 0x54, 0x2b, - 0xb9, 0x0b, 0x43, 0xf4, 0x22, 0x2d, 0xc6, 0xeb, 0x06, 0x75, 0xb1, 0x25, 0x70, 0x70, 0x84, 0x88, - 0xbe, 0x1b, 0xa2, 0xb7, 0x1d, 0xde, 0x1b, 0xcc, 0xac, 0xbd, 0x39, 0x09, 0xfa, 0xd6, 0x80, 0x9f, - 0x3a, 0x19, 0xbe, 0xed, 0xe0, 0x08, 0xb2, 0xf6, 0x0e, 0x2c, 0x8c, 0x18, 0x12, 0x9d, 0x03, 0x75, - 0x8f, 0x88, 0x9b, 0x07, 0x66, 0x3f, 0xd1, 0x05, 0x28, 0xed, 0x1b, 0xdd, 0x81, 0x38, 0xa7, 0x38, - 0x78, 0xb8, 0x53, 0xb8, 0xa5, 0x68, 0xbf, 0x28, 0xc0, 0x4c, 0xe0, 0x19, 0xdf, 0x25, 0x46, 0xef, - 0x14, 0x42, 0xa6, 0x0d, 0x45, 0xaf, 0x4f, 0x4c, 0x91, 0xf4, 0xd7, 0x72, 0x9f, 0x1c, 0xae, 0x1f, - 0xeb, 0x2b, 0xe2, 0x30, 0x63, 0x4f, 0x98, 0xa3, 0xa1, 0x27, 0x51, 0x85, 0x0a, 0x8a, 0xfb, 0xcd, - 0x09, 0x71, 0x8f, 0xac, 0x54, 0xda, 0xef, 0x15, 0x38, 0x27, 0x51, 0x9f, 0xd6, 0xfd, 0x68, 0xe3, - 0x45, 0x0b, 0x64, 0x9c, 0x5b, 0xa5, 0x22, 0xa9, 0xfd, 0xa6, 0x20, 0x92, 0x6b, 0xf8, 0x16, 0xac, - 0xc2, 0x9f, 0xc2, 0x6b, 0x3c, 0x4e, 0x78, 0xfc, 0xd6, 0x64, 0x9e, 0x89, 0xfb, 0xc9, 0x4c, 0xbf, - 0x6f, 0xa7, 0xfc, 0x7e, 0xe7, 0x85, 0xd0, 0x8f, 0xf6, 0xfe, 0x4f, 0x0a, 0xb0, 0x98, 0xa9, 0x11, - 0xba, 0x06, 0xe5, 0xa0, 0xf5, 0xe3, 0x96, 0xab, 0xc4, 0x08, 0x01, 0x0d, 0x16, 0xbb, 0xc8, 0x02, - 0x70, 0x49, 0xdf, 0xf1, 0xa8, 0xef, 0xb8, 0x07, 0xc2, 0x0e, 0x5f, 0xcd, 0xa1, 0x29, 0x8e, 0x98, - 0x24, 0x33, 0xcc, 0x31, 0x43, 0xc7, 0x3b, 0x58, 0x82, 0x46, 0x8f, 0x99, 0x42, 0x86, 0x45, 0x98, - 0x39, 0xd4, 0x49, 0xc2, 0x4b, 0xc6, 0x8f, 0x5f, 0x82, 0x21, 0x61, 0x81, 0xa8, 0xfd, 0xb6, 0x00, - 0xaf, 0x8c, 0x31, 0x1d, 0xc2, 0x09, 0x43, 0xb0, 0x0e, 0x63, 0x22, 0x37, 0x04, 0x97, 0x8f, 0x94, - 0xd1, 0x68, 0x86, 0xd1, 0x6e, 0xbf, 0x88, 0xd1, 0x84, 0x77, 0x8f, 0x30, 0xdb, 0x93, 0x94, 0xd9, - 0x6e, 0x4e, 0x68, 0xb6, 0xd4, 0xf9, 0x49, 0x19, 0xee, 0x93, 0x62, 0x22, 0xee, 0xc4, 0x0d, 0xf8, - 0xe4, 0xe3, 0xae, 0x03, 0xa5, 0xed, 0xae, 0xb3, 0x1d, 0xb6, 0x66, 0xef, 0x4c, 0xe6, 0x93, 0x40, - 0x4d, 0x9d, 0xdd, 0x1a, 0x45, 0x81, 0x8e, 0xb2, 0x0a, 0x5f, 0xc3, 0x01, 0x38, 0xda, 0x4d, 0xd9, - 0xee, 0xdd, 0x17, 0x12, 0x13, 0x98, 0x2c, 0x90, 0x33, 0xc6, 0x8e, 0xb5, 0x3d, 0x80, 0x58, 0x9b, - 0x8c, 0x2a, 0xf7, 0x40, 0xae, 0x72, 0x13, 0x8c, 0x13, 0xa2, 0x66, 0x5c, 0x2a, 0x8c, 0xb5, 0x1f, - 0x88, 0xba, 0x38, 0x56, 0xda, 0x7a, 0x52, 0xda, 0xdb, 0xb9, 0x93, 0x73, 0xe2, 0x1a, 0x2e, 0xd7, - 0xe2, 0x3f, 0x28, 0xe2, 0x0e, 0x2d, 0x2c, 0x73, 0xf2, 0xcd, 0xfb, 0x56, 0xb2, 0x79, 0x9f, 0x34, - 0x6a, 0xb3, 0x5b, 0xf8, 0x7f, 0x28, 0x80, 0x24, 0xaa, 0x0d, 0xa3, 0xdf, 0xa7, 0xb6, 0xf5, 0x3f, - 0x57, 0x2e, 0x8f, 0xbb, 0x53, 0xfe, 0xaa, 0x90, 0xf0, 0x16, 0xaf, 0x07, 0x5b, 0x89, 0x71, 0x53, - 0x9c, 0x6c, 0xc4, 0x4d, 0xf3, 0x35, 0x01, 0xb2, 0xd8, 0xcc, 0x22, 0xc2, 0xd9, 0xbc, 0xe8, 0x3d, - 0x28, 0xfa, 0x86, 0x15, 0xfa, 0xa8, 0x3e, 0xe1, 0x04, 0x40, 0xba, 0x94, 0x18, 0x96, 0x87, 0x39, - 0x14, 0xb2, 0x61, 0xb6, 0x2b, 0x5d, 0xb0, 0x26, 0xed, 0x99, 0xe4, 0xcb, 0x59, 0xdc, 0xb6, 0xcb, - 0xab, 0x38, 0x81, 0xaf, 0xfd, 0x32, 0xd9, 0x79, 0x88, 0xa2, 0x71, 0x22, 0xd6, 0x7a, 0x94, 0xb0, - 0x56, 0x9e, 0x57, 0x62, 0xd7, 0xfe, 0x4e, 0xdb, 0xb0, 0xee, 0xef, 0x13, 0xdb, 0x67, 0x41, 0x92, - 0x69, 0x32, 0x02, 0x97, 0xfa, 0x83, 0xed, 0x2e, 0x35, 0x33, 0xb5, 0x11, 0xa7, 0xe4, 0x8a, 0x60, - 0xbc, 0xb4, 0x39, 0x9e, 0x14, 0x1f, 0x85, 0xa3, 0x7d, 0x5c, 0x0c, 0x6f, 0xb1, 0xdc, 0x52, 0x6d, - 0xe3, 0x34, 0x02, 0xe7, 0x9b, 0xc1, 0x49, 0x0f, 0xc2, 0x66, 0xe2, 0x03, 0x36, 0x95, 0xf8, 0xb6, - 0xb0, 0x06, 0x20, 0xbe, 0x93, 0x50, 0xc7, 0xe6, 0x66, 0x51, 0x63, 0xe9, 0x0f, 0xa2, 0x1d, 0x2c, - 0x51, 0xa1, 0xdd, 0x8c, 0xcb, 0xef, 0xcd, 0x7c, 0x6a, 0x70, 0xa7, 0xe5, 0xbf, 0xfb, 0x46, 0x29, - 0xa2, 0xf4, 0x52, 0x52, 0x44, 0x3a, 0x8e, 0xca, 0x27, 0x1c, 0x47, 0x7f, 0x4a, 0xa6, 0xd6, 0xb6, - 0x61, 0x9d, 0x42, 0x91, 0x78, 0x94, 0x2c, 0x12, 0xab, 0x93, 0x15, 0x89, 0xb6, 0x61, 0x8d, 0xa9, - 0x13, 0xff, 0x54, 0x60, 0x61, 0x24, 0xf6, 0xc2, 0xac, 0xab, 0x8c, 0xf9, 0x74, 0xb5, 0x99, 0x54, - 0xe6, 0xcb, 0x13, 0x9c, 0x92, 0x6c, 0x35, 0x52, 0x87, 0x4f, 0x3d, 0xb9, 0xc3, 0xa7, 0x7d, 0xa4, - 0xc2, 0x85, 0xac, 0x8e, 0xfe, 0x65, 0x0d, 0xca, 0xd3, 0x63, 0xee, 0xc2, 0x69, 0x8f, 0xb9, 0xd5, - 0xff, 0x7c, 0xcc, 0x5d, 0x3c, 0x9d, 0x31, 0xf7, 0x47, 0x05, 0xb8, 0x98, 0x7d, 0x4f, 0x38, 0xa1, - 0x59, 0x77, 0x7c, 0xc3, 0x28, 0xbc, 0xfc, 0x1b, 0x06, 0xba, 0x03, 0x73, 0x46, 0x27, 0x38, 0x66, - 0x46, 0x97, 0x15, 0x2d, 0x7e, 0x8e, 0xa7, 0x1b, 0x68, 0x78, 0xb8, 0x3c, 0x77, 0x37, 0xb1, 0x83, - 0x53, 0x94, 0xda, 0x67, 0x2a, 0xa0, 0xd1, 0x29, 0x22, 0xba, 0x23, 0x26, 0x9b, 0x41, 0x20, 0x5e, - 0x93, 0x27, 0x9b, 0x5f, 0x1c, 0x2e, 0x5f, 0x1c, 0xe5, 0x90, 0x66, 0x9e, 0xeb, 0x91, 0x09, 0x83, - 0xb9, 0xe8, 0xcd, 0xa4, 0x51, 0xbe, 0x38, 0x5c, 0xce, 0xf8, 0xcb, 0x80, 0x1e, 0x21, 0xa5, 0x4c, - 0x67, 0xc1, 0xd9, 0xae, 0xe1, 0xf9, 0x9b, 0xae, 0xb3, 0x4d, 0xda, 0x54, 0x7c, 0xf7, 0x9e, 0x6c, - 0xf2, 0x17, 0xcd, 0x36, 0xd7, 0x65, 0x20, 0x9c, 0xc4, 0x45, 0xfb, 0x80, 0xd8, 0x42, 0xdb, 0x35, - 0x6c, 0x2f, 0x78, 0x25, 0x26, 0xad, 0x38, 0xb1, 0xb4, 0x9a, 0x90, 0x86, 0xd6, 0x47, 0xd0, 0x70, - 0x86, 0x04, 0x74, 0x0d, 0xca, 0x2e, 0x31, 0x3c, 0xc7, 0x16, 0x93, 0xd8, 0xc8, 0xcb, 0x98, 0xaf, - 0x62, 0xb1, 0x8b, 0xfe, 0x1f, 0xa6, 0x7a, 0xc4, 0xf3, 0x58, 0xf9, 0x2a, 0x73, 0xc2, 0x79, 0x41, - 0x38, 0xb5, 0x11, 0x2c, 0xe3, 0x70, 0x5f, 0xfb, 0x50, 0x81, 0xd8, 0x45, 0xbc, 0xea, 0x52, 0xf3, - 0x7e, 0x30, 0xc1, 0xbd, 0x05, 0xb3, 0x8e, 0x6b, 0x19, 0x36, 0x7d, 0x1a, 0x94, 0xe8, 0xc0, 0xc1, - 0x51, 0xc4, 0x3f, 0x94, 0xf6, 0x70, 0x82, 0x92, 0x95, 0x76, 0xd3, 0xe9, 0xf5, 0x1c, 0x9b, 0x65, - 0x6d, 0xe1, 0x5a, 0x29, 0xe7, 0x85, 0x3b, 0x58, 0xa2, 0xd2, 0x3e, 0x51, 0x60, 0x3e, 0x35, 0x2b, - 0x45, 0x3f, 0x57, 0xe0, 0xa2, 0x97, 0xa9, 0x9c, 0x08, 0xb9, 0xdb, 0x93, 0x8c, 0x48, 0x13, 0x00, - 0x8d, 0x25, 0xa1, 0xcf, 0x98, 0xb7, 0xc7, 0x63, 0x04, 0x6b, 0x7f, 0x55, 0xe0, 0x5c, 0x7a, 0xea, - 0xfa, 0xdf, 0xa8, 0x28, 0x7a, 0x0b, 0x66, 0x82, 0xfe, 0xf1, 0x5b, 0xe4, 0xa0, 0xd5, 0x14, 0x5e, - 0x38, 0x2f, 0xc0, 0x66, 0x36, 0xe3, 0x2d, 0x2c, 0xd3, 0x69, 0x3f, 0x2d, 0x40, 0x25, 0xac, 0x58, - 0xe8, 0x3b, 0xf1, 0x14, 0x5d, 0x99, 0xf8, 0x74, 0x47, 0x87, 0x6e, 0x64, 0x92, 0xfe, 0xf2, 0xff, - 0xce, 0x71, 0x25, 0x6c, 0xd7, 0x82, 0xf6, 0x3a, 0xbb, 0x09, 0x4b, 0x76, 0x9c, 0xc5, 0x3c, 0x1d, - 0xa7, 0xf6, 0xb1, 0x0a, 0x0b, 0x23, 0x05, 0x1c, 0xdd, 0x4e, 0xe4, 0xbc, 0xab, 0xa9, 0x9c, 0xb7, - 0x38, 0xc2, 0x70, 0x62, 0x29, 0x2f, 0x3b, 0x13, 0xa9, 0xa7, 0x98, 0x89, 0x8a, 0x79, 0x33, 0x51, - 0xe9, 0xe8, 0x4c, 0x94, 0xf2, 0x4e, 0x39, 0x97, 0x77, 0xfa, 0x30, 0x9f, 0xea, 0x48, 0xd0, 0x0d, - 0xa8, 0x50, 0xdb, 0x23, 0xe6, 0xc0, 0x25, 0x62, 0xd6, 0x1a, 0xb5, 0xac, 0x2d, 0xb1, 0x8e, 0x23, - 0x0a, 0x54, 0x87, 0x69, 0xcf, 0xdc, 0x25, 0x9d, 0x41, 0x97, 0x74, 0xb8, 0x43, 0x2a, 0xf1, 0x17, - 0xd3, 0xad, 0x70, 0x03, 0xc7, 0x34, 0xda, 0xbf, 0x8a, 0x30, 0x2b, 0x37, 0x14, 0x39, 0x3e, 0x11, - 0xbf, 0x0f, 0x33, 0x86, 0x6d, 0x3b, 0xbe, 0x11, 0x34, 0x8e, 0x85, 0xdc, 0xc3, 0x2f, 0x59, 0x8e, - 0x7e, 0x37, 0x86, 0x08, 0x86, 0x5f, 0x51, 0x28, 0x4b, 0x3b, 0x58, 0x96, 0x84, 0xee, 0x8a, 0x6e, - 0x51, 0xcd, 0xdf, 0x2d, 0x56, 0x52, 0x9d, 0x62, 0x1d, 0xa6, 0xa3, 0x8e, 0x48, 0xfc, 0x39, 0x21, - 0xb2, 0x4f, 0x1c, 0x93, 0x31, 0x0d, 0xd2, 0x13, 0x5e, 0x2c, 0x71, 0x2f, 0xce, 0x1d, 0x71, 0xa3, - 0x4b, 0xb7, 0xa2, 0xe5, 0x13, 0x6d, 0x45, 0x33, 0xfa, 0xc8, 0xa9, 0x53, 0xe9, 0x23, 0x6b, 0x5f, - 0x87, 0x73, 0x69, 0x0f, 0x4e, 0xf4, 0xf9, 0x6d, 0x13, 0xd0, 0xa8, 0xfc, 0xe3, 0x7a, 0xaf, 0x51, - 0x8e, 0x38, 0x11, 0x35, 0xae, 0x3f, 0x7b, 0xbe, 0x74, 0xe6, 0xd3, 0xe7, 0x4b, 0x67, 0x3e, 0x7f, - 0xbe, 0x74, 0xe6, 0xc7, 0xc3, 0x25, 0xe5, 0xd9, 0x70, 0x49, 0xf9, 0x74, 0xb8, 0xa4, 0x7c, 0x3e, - 0x5c, 0x52, 0xfe, 0x36, 0x5c, 0x52, 0x7e, 0xf6, 0xf7, 0xa5, 0x33, 0x8f, 0x0b, 0xfb, 0xab, 0xff, - 0x0e, 0x00, 0x00, 0xff, 0xff, 0x09, 0x41, 0xe3, 0x7d, 0x3c, 0x2a, 0x00, 0x00, + // 2442 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x5a, 0x4f, 0x6c, 0x1c, 0x57, + 0x19, 0xcf, 0xec, 0xec, 0xae, 0xd7, 0x9f, 0x1d, 0x3b, 0x7e, 0x89, 0xdb, 0xed, 0x26, 0xb5, 0xdd, + 0x09, 0x89, 0x02, 0xa4, 0xb3, 0xd8, 0x4d, 0x4b, 0x12, 0x24, 0xda, 0x6c, 0x36, 0x44, 0x0b, 0x36, + 0x71, 0x9f, 0x97, 0x1c, 0xa2, 0x54, 0x62, 0x3c, 0xfb, 0x3c, 0x7e, 0x78, 0x77, 0x66, 0x99, 0x99, + 0x75, 0xeb, 0x08, 0x24, 0x0e, 0xa8, 0xea, 0x81, 0x03, 0x9c, 0x7b, 0x44, 0x15, 0xe2, 0x8c, 0x40, + 0xdc, 0x01, 0x29, 0xe2, 0x42, 0x55, 0x2e, 0xbd, 0x60, 0x91, 0x85, 0x33, 0x37, 0x2e, 0x3d, 0xa1, + 0xf7, 0xe6, 0xcd, 0xcc, 0x9b, 0xd9, 0x59, 0x7b, 0x36, 0xc4, 0x16, 0xdc, 0x76, 0xde, 0xfb, 0xbe, + 0xdf, 0xf7, 0xcd, 0xf7, 0xbd, 0xef, 0xcf, 0xfb, 0x66, 0x61, 0xd5, 0xa2, 0xfe, 0xee, 0x60, 0x5b, + 0x37, 0x9d, 0x5e, 0xdd, 0xe9, 0x13, 0xdb, 0xdb, 0xa5, 0x3b, 0x7e, 0xdd, 0xe8, 0xd3, 0x3a, 0xed, + 0x19, 0x16, 0xa9, 0xef, 0xaf, 0xd6, 0x2d, 0x62, 0x13, 0xd7, 0xf0, 0x49, 0x47, 0xef, 0xbb, 0x8e, + 0xef, 0xa0, 0xd7, 0x62, 0x16, 0x3d, 0x62, 0xd1, 0x8d, 0x3e, 0xd5, 0x39, 0x8b, 0xbe, 0xbf, 0x5a, + 0x7b, 0x5d, 0x42, 0xb5, 0x1c, 0xcb, 0xa9, 0x73, 0xce, 0xed, 0xc1, 0x0e, 0x7f, 0xe2, 0x0f, 0xfc, + 0x57, 0x80, 0x58, 0xd3, 0xf6, 0x6e, 0x7a, 0x3a, 0x75, 0xb8, 0x58, 0xd3, 0x71, 0xb3, 0xa4, 0xd6, + 0x6e, 0xc4, 0x34, 0x3d, 0xc3, 0xdc, 0xa5, 0x36, 0x71, 0x0f, 0xea, 0xfd, 0x3d, 0x8b, 0x2d, 0x78, + 0xf5, 0x1e, 0xf1, 0x8d, 0x2c, 0xae, 0xfa, 0x38, 0x2e, 0x77, 0x60, 0xfb, 0xb4, 0x47, 0x46, 0x18, + 0xde, 0x3a, 0x8e, 0xc1, 0x33, 0x77, 0x49, 0xcf, 0x18, 0xe1, 0x7b, 0x63, 0x1c, 0xdf, 0xc0, 0xa7, + 0xdd, 0x3a, 0xb5, 0x7d, 0xcf, 0x77, 0xd3, 0x4c, 0xda, 0x67, 0x0a, 0x5c, 0x68, 0x3a, 0xe6, 0x1e, + 0x71, 0x5b, 0xcc, 0x72, 0x98, 0xec, 0x10, 0x97, 0xd8, 0x26, 0x41, 0xd7, 0xa1, 0xe2, 0x12, 0x8b, + 0x7a, 0xbe, 0x7b, 0x50, 0x55, 0x56, 0x94, 0x6b, 0xd3, 0x8d, 0x73, 0x4f, 0x0f, 0x97, 0xcf, 0x0c, + 0x0f, 0x97, 0x2b, 0x58, 0xac, 0xe3, 0x88, 0x02, 0xd5, 0x61, 0xda, 0x36, 0x7a, 0xc4, 0xeb, 0x1b, + 0x26, 0xa9, 0x16, 0x38, 0xf9, 0x82, 0x20, 0x9f, 0xfe, 0x6e, 0xb8, 0x81, 0x63, 0x1a, 0xb4, 0x02, + 0x45, 0xf6, 0x50, 0x55, 0x39, 0xed, 0xac, 0xa0, 0x2d, 0x32, 0x5a, 0xcc, 0x77, 0xd0, 0xab, 0xa0, + 0xfa, 0x86, 0x55, 0x2d, 0x72, 0x82, 0x19, 0x41, 0xa0, 0xb6, 0x0d, 0x0b, 0xb3, 0x75, 0x54, 0x83, + 0x02, 0x6d, 0x56, 0x4b, 0x7c, 0x17, 0xc4, 0x6e, 0xa1, 0xd5, 0xc4, 0x05, 0xda, 0xd4, 0xfe, 0x32, + 0x05, 0x25, 0xfe, 0x3a, 0xe8, 0xfb, 0x50, 0x61, 0x7e, 0xe9, 0x18, 0xbe, 0xc1, 0xdf, 0x62, 0x66, + 0xed, 0x6b, 0x7a, 0x60, 0x26, 0x5d, 0x36, 0x93, 0xde, 0xdf, 0xb3, 0xd8, 0x82, 0xa7, 0x33, 0x6a, + 0x7d, 0x7f, 0x55, 0x7f, 0xb0, 0xfd, 0x03, 0x62, 0xfa, 0x1b, 0xc4, 0x37, 0x1a, 0x48, 0xa0, 0x43, + 0xbc, 0x86, 0x23, 0x54, 0xb4, 0x09, 0x17, 0x3a, 0x19, 0xf6, 0x13, 0x46, 0xb8, 0x24, 0x78, 0x33, + 0x6d, 0x8c, 0x33, 0x39, 0xd1, 0x8f, 0xe0, 0xbc, 0xb4, 0xbe, 0x11, 0xaa, 0xaf, 0x72, 0xf5, 0x5f, + 0x1f, 0xab, 0xbe, 0x38, 0x1d, 0x3a, 0x36, 0xde, 0xbf, 0xf7, 0x81, 0x4f, 0x6c, 0x8f, 0x3a, 0x76, + 0xe3, 0xa2, 0x90, 0x7f, 0xbe, 0x39, 0x8a, 0x88, 0xb3, 0xc4, 0xa0, 0x6d, 0xa8, 0x65, 0x2c, 0x3f, + 0x24, 0x2e, 0xc3, 0x13, 0xde, 0xd0, 0x04, 0x6a, 0xad, 0x39, 0x96, 0x12, 0x1f, 0x81, 0x82, 0x36, + 0x92, 0x6f, 0x68, 0xd8, 0x74, 0x87, 0x78, 0xbe, 0x70, 0x66, 0xa6, 0xca, 0x82, 0x04, 0x67, 0xf1, + 0xa1, 0x7d, 0x58, 0x90, 0x96, 0xd7, 0x8d, 0x03, 0xe2, 0x7a, 0xd5, 0xf2, 0x8a, 0xca, 0xcd, 0x75, + 0x6c, 0xa6, 0xd0, 0x63, 0xae, 0xc6, 0x2b, 0x42, 0xf6, 0x42, 0x33, 0x8d, 0x87, 0x47, 0x45, 0x20, + 0x02, 0xe0, 0x51, 0xcb, 0x36, 0xfc, 0x81, 0x4b, 0xbc, 0xea, 0x14, 0x17, 0xb8, 0x9a, 0x57, 0xe0, + 0x56, 0xc8, 0x19, 0x9f, 0xaf, 0x68, 0xc9, 0xc3, 0x12, 0x30, 0x7a, 0x00, 0x8b, 0x92, 0xec, 0x98, + 0xa8, 0x5a, 0x59, 0x51, 0xaf, 0xcd, 0x36, 0x5e, 0x19, 0x1e, 0x2e, 0x2f, 0x36, 0xb3, 0x08, 0x70, + 0x36, 0x1f, 0xda, 0x85, 0x4b, 0x19, 0x66, 0xdc, 0x20, 0x1d, 0x6a, 0xb4, 0x0f, 0xfa, 0xa4, 0x3a, + 0xcd, 0xfd, 0xf0, 0x25, 0xa1, 0xd6, 0xa5, 0xe6, 0x11, 0xb4, 0xf8, 0x48, 0x24, 0x74, 0x3f, 0xe1, + 0x99, 0xbb, 0x8e, 0xbd, 0x43, 0xad, 0x2a, 0x70, 0xf8, 0x2c, 0x53, 0x07, 0x04, 0x78, 0x94, 0x47, + 0x7b, 0x0f, 0xce, 0xf3, 0xc7, 0x46, 0xd7, 0xd9, 0x8e, 0x22, 0xc5, 0x43, 0x1a, 0x94, 0xbb, 0x81, + 0xbb, 0x95, 0x15, 0x95, 0x25, 0x82, 0xe1, 0xe1, 0x72, 0x59, 0x38, 0x4c, 0xec, 0x30, 0x1a, 0x33, + 0x10, 0x1c, 0x84, 0x24, 0xa7, 0x11, 0x92, 0xc4, 0x8e, 0xf6, 0x27, 0x15, 0xe6, 0x39, 0x7e, 0xab, + 0xd7, 0x77, 0x5c, 0x7f, 0xab, 0x4f, 0x4c, 0x74, 0x0f, 0x8a, 0x3b, 0xae, 0xd3, 0x13, 0x69, 0xe3, + 0xb2, 0x14, 0x77, 0x3a, 0x2b, 0x10, 0x71, 0x92, 0x88, 0xf4, 0x89, 0xd3, 0xd8, 0xb7, 0x5c, 0xa7, + 0x87, 0x39, 0x3b, 0x7a, 0x07, 0x0a, 0xbe, 0xc3, 0x45, 0xcf, 0xac, 0x5d, 0xcb, 0x02, 0x59, 0x77, + 0x4c, 0xa3, 0x9b, 0x46, 0x2a, 0xb3, 0x6c, 0xd6, 0x76, 0x70, 0xc1, 0x77, 0x50, 0x17, 0x66, 0x29, + 0x57, 0x6b, 0xd3, 0xe9, 0x52, 0xf3, 0x40, 0x24, 0x82, 0xb5, 0x1c, 0x07, 0xad, 0x6d, 0x58, 0x2d, + 0x89, 0xb3, 0x71, 0x41, 0xe8, 0x37, 0x2b, 0xaf, 0xe2, 0x04, 0x3a, 0xba, 0x03, 0xf3, 0xd4, 0x36, + 0xbb, 0x83, 0x4e, 0x1c, 0x97, 0x2c, 0xe8, 0x2b, 0x8d, 0x97, 0x05, 0xf3, 0x7c, 0x2b, 0xb9, 0x8d, + 0xd3, 0xf4, 0xe8, 0x03, 0x98, 0x77, 0xc3, 0x37, 0x11, 0x3a, 0x97, 0xb8, 0xce, 0x6f, 0xe6, 0xd3, + 0x19, 0x27, 0x99, 0x63, 0xc9, 0xa9, 0x0d, 0x9c, 0x16, 0xa3, 0xfd, 0x55, 0x81, 0x05, 0xd9, 0x8f, + 0xbe, 0xe1, 0x0f, 0x3c, 0xd4, 0x86, 0xb2, 0xc7, 0x7f, 0x09, 0x5f, 0x5e, 0xcf, 0x57, 0x02, 0x02, + 0xee, 0xc6, 0x9c, 0x90, 0x5e, 0x0e, 0x9e, 0xb1, 0xc0, 0x42, 0x2d, 0x28, 0x71, 0xa5, 0x23, 0xdf, + 0xe6, 0x0c, 0xfc, 0xc6, 0xf4, 0xf0, 0x70, 0x39, 0x28, 0x4f, 0x38, 0x40, 0x08, 0x4b, 0x9d, 0x9a, + 0x5d, 0xea, 0xb4, 0x0f, 0x15, 0x80, 0x38, 0xef, 0x44, 0xa5, 0x53, 0x19, 0x5b, 0x3a, 0xaf, 0x40, + 0xd1, 0xa3, 0x4f, 0x02, 0xcd, 0xd4, 0xb8, 0x10, 0x73, 0xf6, 0x2d, 0xfa, 0x84, 0x60, 0xbe, 0xcd, + 0x8a, 0x76, 0x2f, 0x0a, 0x7a, 0x35, 0x59, 0xb4, 0xe3, 0x08, 0x8f, 0x69, 0xb4, 0x0e, 0xcc, 0xc5, + 0x7a, 0x34, 0x59, 0xb5, 0x78, 0x4d, 0x48, 0x52, 0xb8, 0xa4, 0xb3, 0xc7, 0x4a, 0x29, 0xe4, 0x90, + 0xf2, 0x7b, 0x05, 0xa6, 0x03, 0x31, 0xd4, 0xf3, 0xd1, 0xe3, 0x91, 0x0a, 0xae, 0xe7, 0x73, 0x1f, + 0xe3, 0xe6, 0xf5, 0x3b, 0xea, 0x5b, 0xc2, 0x15, 0xa9, 0x7a, 0x6f, 0x40, 0x89, 0xfa, 0xa4, 0xe7, + 0x55, 0x0b, 0x3c, 0x7b, 0xe7, 0x77, 0xe2, 0x59, 0x01, 0x5a, 0x6a, 0x31, 0x76, 0x1c, 0xa0, 0x68, + 0x37, 0xc5, 0xf1, 0x5b, 0x77, 0x9c, 0xbd, 0x41, 0x5f, 0x44, 0xd4, 0x65, 0x28, 0x75, 0x59, 0x8c, + 0x73, 0x13, 0x57, 0x62, 0x4e, 0x1e, 0xf8, 0x38, 0xd8, 0xd3, 0x7e, 0x53, 0x16, 0xb6, 0x8d, 0xf2, + 0xf4, 0x29, 0xf4, 0x2e, 0x2b, 0x50, 0xf4, 0x63, 0xaf, 0x44, 0x27, 0x89, 0x3b, 0x84, 0xef, 0xa0, + 0x2b, 0x30, 0x65, 0x3a, 0xb6, 0x4f, 0x6c, 0x9f, 0x6b, 0x3f, 0xdb, 0x98, 0x19, 0x1e, 0x2e, 0x4f, + 0xdd, 0x0d, 0x96, 0x70, 0xb8, 0x87, 0x28, 0x80, 0xe9, 0xd8, 0x1d, 0xea, 0x53, 0xc7, 0xf6, 0xaa, + 0x45, 0x6e, 0xcb, 0x3c, 0xc1, 0x1e, 0xbd, 0xec, 0xdd, 0x90, 0x3b, 0xd6, 0x38, 0x5a, 0xf2, 0xb0, + 0x04, 0x8e, 0xbe, 0x01, 0x67, 0x39, 0x7b, 0xab, 0x43, 0x6c, 0x9f, 0xfa, 0x07, 0xa2, 0x6b, 0x58, + 0x14, 0x6c, 0x67, 0x5b, 0xf2, 0x26, 0x4e, 0xd2, 0xa2, 0x1f, 0xc3, 0x2c, 0x2b, 0xac, 0xa4, 0x73, + 0xb7, 0x6b, 0xd0, 0x5e, 0xd8, 0x24, 0xdc, 0x9d, 0xb8, 0x66, 0x73, 0xc5, 0x43, 0x94, 0x7b, 0xb6, + 0xef, 0x4a, 0xb9, 0x55, 0xde, 0xc2, 0x09, 0x71, 0xe8, 0x5d, 0x98, 0x32, 0x5d, 0xc2, 0xba, 0xef, + 0xea, 0x14, 0x77, 0xe8, 0x57, 0xf2, 0x39, 0xb4, 0x4d, 0x7b, 0x44, 0x58, 0x3e, 0x60, 0xc7, 0x21, + 0x0e, 0x0b, 0x0f, 0xea, 0x79, 0x03, 0xd2, 0x69, 0x1c, 0x54, 0x2b, 0xb9, 0x0b, 0x43, 0xf4, 0x22, + 0x2d, 0xc6, 0xeb, 0x36, 0x66, 0x59, 0x78, 0xb4, 0x04, 0x0e, 0x8e, 0x10, 0xd1, 0x7b, 0x21, 0x7a, + 0xdb, 0xe1, 0x5d, 0xc1, 0xcc, 0xda, 0x1b, 0x93, 0xa0, 0x6f, 0x0d, 0xf8, 0xa9, 0x93, 0xe1, 0xdb, + 0x0e, 0x8e, 0x20, 0x6b, 0x6f, 0xc3, 0xc2, 0x88, 0x21, 0xd1, 0x39, 0x50, 0xf7, 0x88, 0xb8, 0x73, + 0x60, 0xf6, 0x13, 0x5d, 0x80, 0xd2, 0xbe, 0xd1, 0x1d, 0x88, 0x73, 0x8a, 0x83, 0x87, 0xdb, 0x85, + 0x9b, 0x8a, 0xf6, 0xcb, 0x02, 0xcc, 0x04, 0x9e, 0xf1, 0x5d, 0x62, 0xf4, 0x4e, 0x21, 0x64, 0xda, + 0x50, 0xf4, 0xfa, 0xc4, 0x14, 0x49, 0x7f, 0x2d, 0xf7, 0xc9, 0xe1, 0xfa, 0xb1, 0xbe, 0x22, 0x0e, + 0x33, 0xf6, 0x84, 0x39, 0x1a, 0x7a, 0x1c, 0x55, 0xa8, 0xa0, 0xb8, 0xdf, 0x98, 0x10, 0xf7, 0xc8, + 0x4a, 0xa5, 0xfd, 0x41, 0x81, 0x73, 0x12, 0xf5, 0x69, 0xdd, 0x8c, 0x36, 0x9e, 0xb7, 0x40, 0xc6, + 0xb9, 0x55, 0x2a, 0x92, 0xda, 0x6f, 0x0b, 0x22, 0xb9, 0x86, 0x6f, 0xc1, 0x2a, 0xfc, 0x29, 0xbc, + 0xc6, 0xa3, 0x84, 0xc7, 0x6f, 0x4e, 0xe6, 0x99, 0xb8, 0x9f, 0xcc, 0xf4, 0xfb, 0x76, 0xca, 0xef, + 0xb7, 0x9f, 0x0b, 0xfd, 0x68, 0xef, 0xff, 0xb4, 0x00, 0x8b, 0x99, 0x1a, 0xa1, 0xab, 0x50, 0x0e, + 0x5a, 0x3f, 0x6e, 0xb9, 0x4a, 0x8c, 0x10, 0xd0, 0x60, 0xb1, 0x8b, 0x2c, 0x00, 0x97, 0xf4, 0x1d, + 0x8f, 0xfa, 0x8e, 0x7b, 0x20, 0xec, 0xf0, 0xf5, 0x1c, 0x9a, 0xe2, 0x88, 0x49, 0x32, 0xc3, 0x1c, + 0x33, 0x74, 0xbc, 0x83, 0x25, 0x68, 0xf4, 0x88, 0x29, 0x64, 0x58, 0x84, 0x99, 0x43, 0x9d, 0x24, + 0xbc, 0x64, 0xfc, 0xf8, 0x25, 0x18, 0x12, 0x16, 0x88, 0xda, 0xef, 0x0a, 0xf0, 0xf2, 0x18, 0xd3, + 0x21, 0x9c, 0x30, 0x04, 0xeb, 0x30, 0x26, 0x72, 0x43, 0x70, 0xa5, 0x48, 0x19, 0x8d, 0x66, 0x18, + 0xed, 0xd6, 0xf3, 0x18, 0x4d, 0x78, 0xf7, 0x08, 0xb3, 0x3d, 0x4e, 0x99, 0xed, 0xc6, 0x84, 0x66, + 0x4b, 0x9d, 0x9f, 0x94, 0xe1, 0x3e, 0x29, 0x26, 0xe2, 0x4e, 0xdc, 0x7d, 0x4f, 0x3e, 0xee, 0x3a, + 0x50, 0xda, 0xee, 0x3a, 0xdb, 0x61, 0x6b, 0xf6, 0xf6, 0x64, 0x3e, 0x09, 0xd4, 0xd4, 0xd9, 0x7d, + 0x51, 0x14, 0xe8, 0x28, 0xab, 0xf0, 0x35, 0x1c, 0x80, 0xa3, 0xdd, 0x94, 0xed, 0xde, 0x79, 0x2e, + 0x31, 0x81, 0xc9, 0x02, 0x39, 0x63, 0xec, 0x58, 0xdb, 0x03, 0x88, 0xb5, 0xc9, 0xa8, 0x72, 0xf7, + 0xe5, 0x2a, 0x37, 0xc1, 0x20, 0x21, 0x6a, 0xc6, 0xa5, 0xc2, 0x58, 0xfb, 0xa1, 0xa8, 0x8b, 0x63, + 0xa5, 0xad, 0x27, 0xa5, 0xbd, 0x95, 0x3b, 0x39, 0x27, 0x2e, 0xe0, 0x72, 0x2d, 0xfe, 0xa3, 0x22, + 0xee, 0xd0, 0xc2, 0x32, 0x27, 0xdf, 0xbc, 0x6f, 0x25, 0x9b, 0xf7, 0x49, 0xa3, 0x36, 0xbb, 0x85, + 0xff, 0xa7, 0x02, 0x48, 0xa2, 0xda, 0x30, 0xfa, 0x7d, 0x6a, 0x5b, 0xff, 0x77, 0xe5, 0xf2, 0xb8, + 0x3b, 0xe5, 0xaf, 0x0b, 0x09, 0x6f, 0xf1, 0x7a, 0xb0, 0x95, 0x18, 0x34, 0xc5, 0xc9, 0x46, 0xdc, + 0x34, 0x5f, 0x15, 0x20, 0x8b, 0xcd, 0x2c, 0x22, 0x9c, 0xcd, 0x8b, 0xde, 0x85, 0xa2, 0x6f, 0x58, + 0xa1, 0x8f, 0xea, 0x13, 0x4e, 0x00, 0xa4, 0x4b, 0x89, 0x61, 0x79, 0x98, 0x43, 0x21, 0x1b, 0x66, + 0xbb, 0xd2, 0x05, 0x6b, 0xd2, 0x9e, 0x49, 0xbe, 0x9c, 0xc5, 0x6d, 0xbb, 0xbc, 0x8a, 0x13, 0xf8, + 0xda, 0xaf, 0x92, 0x9d, 0x87, 0x28, 0x1a, 0x27, 0x62, 0xad, 0x87, 0x09, 0x6b, 0xe5, 0x79, 0x25, + 0x76, 0xed, 0xef, 0xb4, 0x0d, 0xeb, 0xde, 0x3e, 0xb1, 0x7d, 0x16, 0x24, 0x99, 0x26, 0x23, 0x70, + 0xb1, 0x3f, 0xd8, 0xee, 0x52, 0x33, 0x53, 0x1b, 0x71, 0x4a, 0x2e, 0x0b, 0xc6, 0x8b, 0x9b, 0xe3, + 0x49, 0xf1, 0x51, 0x38, 0xda, 0xc7, 0xc5, 0xf0, 0x16, 0xcb, 0x2d, 0xd5, 0x36, 0x4e, 0x23, 0x70, + 0xbe, 0x1d, 0x9c, 0xf4, 0x20, 0x6c, 0x26, 0x3e, 0x60, 0x53, 0x89, 0xaf, 0x0a, 0x6b, 0x00, 0xe2, + 0x0b, 0x09, 0x75, 0x6c, 0x6e, 0x16, 0x35, 0x96, 0x7e, 0x3f, 0xda, 0xc1, 0x12, 0x15, 0xda, 0xcd, + 0xb8, 0xfc, 0xde, 0xc8, 0xa7, 0x06, 0x77, 0x5a, 0xfe, 0xbb, 0x6f, 0x94, 0x22, 0x4a, 0x2f, 0x24, + 0x45, 0xa4, 0xe3, 0xa8, 0x7c, 0xc2, 0x71, 0xf4, 0xe7, 0x64, 0x6a, 0x6d, 0x1b, 0xd6, 0x29, 0x14, + 0x89, 0x87, 0xc9, 0x22, 0xb1, 0x3a, 0x59, 0x91, 0x68, 0x1b, 0xd6, 0x98, 0x3a, 0xf1, 0x2f, 0x05, + 0x16, 0x46, 0x62, 0x2f, 0xcc, 0xba, 0xca, 0x98, 0x8f, 0x56, 0x9b, 0x49, 0x65, 0xbe, 0x3a, 0xc1, + 0x29, 0xc9, 0x56, 0x23, 0x75, 0xf8, 0xd4, 0x93, 0x3b, 0x7c, 0xda, 0x47, 0x2a, 0x5c, 0xc8, 0xea, + 0xe8, 0x5f, 0xd4, 0xa0, 0x3c, 0x3d, 0xe6, 0x2e, 0x9c, 0xf6, 0x98, 0x5b, 0xfd, 0xef, 0xc7, 0xdc, + 0xc5, 0xd3, 0x19, 0x73, 0x7f, 0x54, 0x80, 0x97, 0xb2, 0xef, 0x09, 0x27, 0x34, 0xeb, 0x8e, 0x6f, + 0x18, 0x85, 0x17, 0x7f, 0xc3, 0x40, 0xb7, 0x61, 0xce, 0xe8, 0x04, 0xc7, 0xcc, 0xe8, 0xb2, 0xa2, + 0xc5, 0xcf, 0xf1, 0x74, 0x03, 0x0d, 0x0f, 0x97, 0xe7, 0xee, 0x24, 0x76, 0x70, 0x8a, 0x52, 0xfb, + 0x4c, 0x05, 0x34, 0x3a, 0x45, 0x44, 0xb7, 0xc5, 0x64, 0x33, 0x08, 0xc4, 0xab, 0xf2, 0x64, 0xf3, + 0x8b, 0xc3, 0xe5, 0x97, 0x46, 0x39, 0xa4, 0x99, 0xe7, 0x7a, 0x64, 0xc2, 0x60, 0x2e, 0x7a, 0x23, + 0x69, 0x94, 0x2f, 0x0e, 0x97, 0x33, 0xfe, 0x2c, 0xa0, 0x47, 0x48, 0x29, 0xd3, 0x59, 0x70, 0xb6, + 0x6b, 0x78, 0xfe, 0xa6, 0xeb, 0x6c, 0x93, 0x36, 0x15, 0x5f, 0xbc, 0x27, 0x9b, 0xfc, 0x45, 0xb3, + 0xcd, 0x75, 0x19, 0x08, 0x27, 0x71, 0xd1, 0x3e, 0x20, 0xb6, 0xd0, 0x76, 0x0d, 0xdb, 0x0b, 0x5e, + 0x89, 0x49, 0x2b, 0x4e, 0x2c, 0xad, 0x26, 0xa4, 0xa1, 0xf5, 0x11, 0x34, 0x9c, 0x21, 0x01, 0x5d, + 0x85, 0xb2, 0x4b, 0x0c, 0xcf, 0xb1, 0xc5, 0x24, 0x36, 0xf2, 0x32, 0xe6, 0xab, 0x58, 0xec, 0xa2, + 0x2f, 0xc3, 0x54, 0x8f, 0x78, 0x1e, 0x2b, 0x5f, 0x65, 0x4e, 0x38, 0x2f, 0x08, 0xa7, 0x36, 0x82, + 0x65, 0x1c, 0xee, 0x6b, 0x1f, 0x2a, 0x10, 0xbb, 0x88, 0x57, 0x5d, 0x6a, 0xde, 0x0b, 0x26, 0xb8, + 0x37, 0x61, 0xd6, 0x71, 0x2d, 0xc3, 0xa6, 0x4f, 0x82, 0x12, 0x1d, 0x38, 0x38, 0x8a, 0xf8, 0x07, + 0xd2, 0x1e, 0x4e, 0x50, 0xb2, 0xd2, 0x6e, 0x3a, 0xbd, 0x9e, 0x63, 0xb3, 0xac, 0x2d, 0x5c, 0x2b, + 0xe5, 0xbc, 0x70, 0x07, 0x4b, 0x54, 0xda, 0x27, 0x0a, 0xcc, 0xa7, 0x66, 0xa5, 0xe8, 0x17, 0x0a, + 0xbc, 0xe4, 0x65, 0x2a, 0x27, 0x42, 0xee, 0xd6, 0x24, 0x23, 0xd2, 0x04, 0x40, 0x63, 0x49, 0xe8, + 0x33, 0xe6, 0xed, 0xf1, 0x18, 0xc1, 0xda, 0xdf, 0x14, 0x38, 0x97, 0x9e, 0xba, 0xfe, 0x2f, 0x2a, + 0x8a, 0xde, 0x84, 0x99, 0xa0, 0x7f, 0xfc, 0x0e, 0x39, 0x68, 0x35, 0x85, 0x17, 0xce, 0x0b, 0xb0, + 0x99, 0xcd, 0x78, 0x0b, 0xcb, 0x74, 0xda, 0xcf, 0x0a, 0x50, 0x09, 0x2b, 0x16, 0xfa, 0x5e, 0x3c, + 0x45, 0x57, 0x26, 0x3e, 0xdd, 0xd1, 0xa1, 0x1b, 0x99, 0xa4, 0xbf, 0xf8, 0x3f, 0x72, 0x5c, 0x0e, + 0xdb, 0xb5, 0xa0, 0xbd, 0xce, 0x6e, 0xc2, 0x92, 0x1d, 0x67, 0x31, 0x4f, 0xc7, 0xa9, 0x7d, 0xac, + 0xc2, 0xc2, 0x48, 0x01, 0x47, 0xb7, 0x12, 0x39, 0xef, 0x4a, 0x2a, 0xe7, 0x2d, 0x8e, 0x30, 0x9c, + 0x58, 0xca, 0xcb, 0xce, 0x44, 0xea, 0x29, 0x66, 0xa2, 0x62, 0xde, 0x4c, 0x54, 0x3a, 0x3a, 0x13, + 0xa5, 0xbc, 0x53, 0xce, 0xe5, 0x9d, 0x3e, 0xcc, 0xa7, 0x3a, 0x12, 0x74, 0x1d, 0x2a, 0xd4, 0xf6, + 0x88, 0x39, 0x70, 0x89, 0x98, 0xb5, 0x46, 0x2d, 0x6b, 0x4b, 0xac, 0xe3, 0x88, 0x02, 0xd5, 0x61, + 0xda, 0x33, 0x77, 0x49, 0x67, 0xd0, 0x25, 0x1d, 0xee, 0x90, 0x4a, 0xfc, 0xc5, 0x74, 0x2b, 0xdc, + 0xc0, 0x31, 0x8d, 0xf6, 0xef, 0x22, 0xcc, 0xca, 0x0d, 0x45, 0x8e, 0x4f, 0xc4, 0xef, 0xc3, 0x8c, + 0x61, 0xdb, 0x8e, 0x6f, 0x04, 0x8d, 0x63, 0x21, 0xf7, 0xf0, 0x4b, 0x96, 0xa3, 0xdf, 0x89, 0x21, + 0x82, 0xe1, 0x57, 0x14, 0xca, 0xd2, 0x0e, 0x96, 0x25, 0xa1, 0x3b, 0xa2, 0x5b, 0x54, 0xf3, 0x77, + 0x8b, 0x95, 0x54, 0xa7, 0x58, 0x87, 0xe9, 0xa8, 0x23, 0x12, 0x7f, 0x4e, 0x88, 0xec, 0x13, 0xc7, + 0x64, 0x4c, 0x83, 0xf4, 0x84, 0x17, 0x4b, 0xdc, 0x8b, 0x73, 0x47, 0xdc, 0xe8, 0xd2, 0xad, 0x68, + 0xf9, 0x44, 0x5b, 0xd1, 0x8c, 0x3e, 0x72, 0xea, 0x54, 0xfa, 0xc8, 0xda, 0x37, 0xe1, 0x5c, 0xda, + 0x83, 0x13, 0x7d, 0x7e, 0xdb, 0x04, 0x34, 0x2a, 0xff, 0xb8, 0xde, 0x6b, 0x94, 0x23, 0x4e, 0x44, + 0x8d, 0x6b, 0x4f, 0x9f, 0x2d, 0x9d, 0xf9, 0xf4, 0xd9, 0xd2, 0x99, 0xcf, 0x9f, 0x2d, 0x9d, 0xf9, + 0xc9, 0x70, 0x49, 0x79, 0x3a, 0x5c, 0x52, 0x3e, 0x1d, 0x2e, 0x29, 0x9f, 0x0f, 0x97, 0x94, 0xbf, + 0x0f, 0x97, 0x94, 0x9f, 0xff, 0x63, 0xe9, 0xcc, 0xa3, 0xc2, 0xfe, 0xea, 0x7f, 0x02, 0x00, 0x00, + 0xff, 0xff, 0x22, 0x04, 0x69, 0xab, 0x36, 0x2a, 0x00, 0x00, } diff --git a/image/v1/generated.proto b/image/v1/generated.proto index 417a6c1bb29..e6f29f0776c 100644 --- a/image/v1/generated.proto +++ b/image/v1/generated.proto @@ -76,10 +76,10 @@ message ImageBlobReferences { // +optional repeated string layers = 1; - // manifest, if set, is the blob that contains the image manifest. Some images do - // not have separate manifest blobs and this field will be set to nil if so. + // config, if set, is the blob that contains the image config. Some images do + // not have separate config blobs and this field will be set to nil if so. // +optional - optional string manifest = 2; + optional string config = 2; } // ImageImportSpec describes a request to import a specific image. @@ -270,7 +270,7 @@ message ImageStreamLayers { // blobs is a map of blob name to metadata about the blob. map blobs = 2; - // images is a map between an image name and the names of the blobs and manifests that + // images is a map between an image name and the names of the blobs and config that // comprise the image. map images = 3; } diff --git a/image/v1/types.go b/image/v1/types.go index 9887fe542a8..ddaed57db47 100644 --- a/image/v1/types.go +++ b/image/v1/types.go @@ -428,7 +428,7 @@ type ImageStreamLayers struct { metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,1,opt,name=metadata"` // blobs is a map of blob name to metadata about the blob. Blobs map[string]ImageLayerData `json:"blobs" protobuf:"bytes,2,rep,name=blobs"` - // images is a map between an image name and the names of the blobs and manifests that + // images is a map between an image name and the names of the blobs and config that // comprise the image. Images map[string]ImageBlobReferences `json:"images" protobuf:"bytes,3,rep,name=images"` } @@ -440,10 +440,10 @@ type ImageBlobReferences struct { // may have zero layers. // +optional Layers []string `json:"layers" protobuf:"bytes,1,rep,name=layers"` - // manifest, if set, is the blob that contains the image manifest. Some images do - // not have separate manifest blobs and this field will be set to nil if so. + // config, if set, is the blob that contains the image config. Some images do + // not have separate config blobs and this field will be set to nil if so. // +optional - Manifest *string `json:"manifest" protobuf:"bytes,2,opt,name=manifest"` + Config *string `json:"config" protobuf:"bytes,2,opt,name=config"` } // ImageLayerData contains metadata about an image layer. diff --git a/image/v1/types_swagger_doc_generated.go b/image/v1/types_swagger_doc_generated.go index dc9b83c4977..1a651b876bf 100644 --- a/image/v1/types_swagger_doc_generated.go +++ b/image/v1/types_swagger_doc_generated.go @@ -43,9 +43,9 @@ func (Image) SwaggerDoc() map[string]string { } var map_ImageBlobReferences = map[string]string{ - "": "ImageBlobReferences describes the blob references within an image.", - "layers": "layers is the list of blobs that compose this image, from base layer to top layer. All layers referenced by this array will be defined in the blobs map. Some images may have zero layers.", - "manifest": "manifest, if set, is the blob that contains the image manifest. Some images do not have separate manifest blobs and this field will be set to nil if so.", + "": "ImageBlobReferences describes the blob references within an image.", + "layers": "layers is the list of blobs that compose this image, from base layer to top layer. All layers referenced by this array will be defined in the blobs map. Some images may have zero layers.", + "config": "config, if set, is the blob that contains the image config. Some images do not have separate config blobs and this field will be set to nil if so.", } func (ImageBlobReferences) SwaggerDoc() map[string]string { @@ -191,7 +191,7 @@ var map_ImageStreamLayers = map[string]string{ "": "ImageStreamLayers describes information about the layers referenced by images in this image stream.", "metadata": "Standard object's metadata.", "blobs": "blobs is a map of blob name to metadata about the blob.", - "images": "images is a map between an image name and the names of the blobs and manifests that comprise the image.", + "images": "images is a map between an image name and the names of the blobs and config that comprise the image.", } func (ImageStreamLayers) SwaggerDoc() map[string]string { diff --git a/image/v1/zz_generated.deepcopy.go b/image/v1/zz_generated.deepcopy.go index 6aa13046be4..93525f773dc 100644 --- a/image/v1/zz_generated.deepcopy.go +++ b/image/v1/zz_generated.deepcopy.go @@ -83,8 +83,8 @@ func (in *ImageBlobReferences) DeepCopyInto(out *ImageBlobReferences) { *out = make([]string, len(*in)) copy(*out, *in) } - if in.Manifest != nil { - in, out := &in.Manifest, &out.Manifest + if in.Config != nil { + in, out := &in.Config, &out.Config if *in == nil { *out = nil } else { From 1ba94e5a5eeb8470d02bd7b66c3ca1d445f42c26 Mon Sep 17 00:00:00 2001 From: Clayton Coleman Date: Tue, 14 Aug 2018 13:35:15 -0400 Subject: [PATCH 2/2] Add an imageMissing field to the blob references Communicates when an image stream references an image api object that has been deleted by an administrator. --- image/v1/generated.pb.go | 339 +++++++++++++----------- image/v1/generated.proto | 7 + image/v1/types.go | 6 + image/v1/types_swagger_doc_generated.go | 7 +- 4 files changed, 202 insertions(+), 157 deletions(-) diff --git a/image/v1/generated.pb.go b/image/v1/generated.pb.go index 46b27339afc..b30e58868ba 100644 --- a/image/v1/generated.pb.go +++ b/image/v1/generated.pb.go @@ -405,6 +405,14 @@ func (m *ImageBlobReferences) MarshalTo(dAtA []byte) (int, error) { i = encodeVarintGenerated(dAtA, i, uint64(len(*m.Config))) i += copy(dAtA[i:], *m.Config) } + dAtA[i] = 0x18 + i++ + if m.ImageMissing { + dAtA[i] = 1 + } else { + dAtA[i] = 0 + } + i++ return i, nil } @@ -1893,6 +1901,7 @@ func (m *ImageBlobReferences) Size() (n int) { l = len(*m.Config) n += 1 + l + sovGenerated(uint64(l)) } + n += 2 return n } @@ -2430,6 +2439,7 @@ func (this *ImageBlobReferences) String() string { s := strings.Join([]string{`&ImageBlobReferences{`, `Layers:` + fmt.Sprintf("%v", this.Layers) + `,`, `Config:` + valueToStringGenerated(this.Config) + `,`, + `ImageMissing:` + fmt.Sprintf("%v", this.ImageMissing) + `,`, `}`, }, "") return s @@ -3492,6 +3502,26 @@ func (m *ImageBlobReferences) Unmarshal(dAtA []byte) error { s := string(dAtA[iNdEx:postIndex]) m.Config = &s iNdEx = postIndex + case 3: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field ImageMissing", wireType) + } + var v int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowGenerated + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + v |= (int(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + m.ImageMissing = bool(v != 0) default: iNdEx = preIndex skippy, err := skipGenerated(dAtA[iNdEx:]) @@ -8469,158 +8499,159 @@ func init() { } var fileDescriptorGenerated = []byte{ - // 2442 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x5a, 0x4f, 0x6c, 0x1c, 0x57, - 0x19, 0xcf, 0xec, 0xec, 0xae, 0xd7, 0x9f, 0x1d, 0x3b, 0x7e, 0x89, 0xdb, 0xed, 0x26, 0xb5, 0xdd, - 0x09, 0x89, 0x02, 0xa4, 0xb3, 0xd8, 0x4d, 0x4b, 0x12, 0x24, 0xda, 0x6c, 0x36, 0x44, 0x0b, 0x36, - 0x71, 0x9f, 0x97, 0x1c, 0xa2, 0x54, 0x62, 0x3c, 0xfb, 0x3c, 0x7e, 0x78, 0x77, 0x66, 0x99, 0x99, - 0x75, 0xeb, 0x08, 0x24, 0x0e, 0xa8, 0xea, 0x81, 0x03, 0x9c, 0x7b, 0x44, 0x15, 0xe2, 0x8c, 0x40, - 0xdc, 0x01, 0x29, 0xe2, 0x42, 0x55, 0x2e, 0xbd, 0x60, 0x91, 0x85, 0x33, 0x37, 0x2e, 0x3d, 0xa1, - 0xf7, 0xe6, 0xcd, 0xcc, 0x9b, 0xd9, 0x59, 0x7b, 0x36, 0xc4, 0x16, 0xdc, 0x76, 0xde, 0xfb, 0xbe, - 0xdf, 0xf7, 0xcd, 0xf7, 0xbd, 0xef, 0xcf, 0xfb, 0x66, 0x61, 0xd5, 0xa2, 0xfe, 0xee, 0x60, 0x5b, - 0x37, 0x9d, 0x5e, 0xdd, 0xe9, 0x13, 0xdb, 0xdb, 0xa5, 0x3b, 0x7e, 0xdd, 0xe8, 0xd3, 0x3a, 0xed, - 0x19, 0x16, 0xa9, 0xef, 0xaf, 0xd6, 0x2d, 0x62, 0x13, 0xd7, 0xf0, 0x49, 0x47, 0xef, 0xbb, 0x8e, - 0xef, 0xa0, 0xd7, 0x62, 0x16, 0x3d, 0x62, 0xd1, 0x8d, 0x3e, 0xd5, 0x39, 0x8b, 0xbe, 0xbf, 0x5a, - 0x7b, 0x5d, 0x42, 0xb5, 0x1c, 0xcb, 0xa9, 0x73, 0xce, 0xed, 0xc1, 0x0e, 0x7f, 0xe2, 0x0f, 0xfc, - 0x57, 0x80, 0x58, 0xd3, 0xf6, 0x6e, 0x7a, 0x3a, 0x75, 0xb8, 0x58, 0xd3, 0x71, 0xb3, 0xa4, 0xd6, - 0x6e, 0xc4, 0x34, 0x3d, 0xc3, 0xdc, 0xa5, 0x36, 0x71, 0x0f, 0xea, 0xfd, 0x3d, 0x8b, 0x2d, 0x78, - 0xf5, 0x1e, 0xf1, 0x8d, 0x2c, 0xae, 0xfa, 0x38, 0x2e, 0x77, 0x60, 0xfb, 0xb4, 0x47, 0x46, 0x18, - 0xde, 0x3a, 0x8e, 0xc1, 0x33, 0x77, 0x49, 0xcf, 0x18, 0xe1, 0x7b, 0x63, 0x1c, 0xdf, 0xc0, 0xa7, - 0xdd, 0x3a, 0xb5, 0x7d, 0xcf, 0x77, 0xd3, 0x4c, 0xda, 0x67, 0x0a, 0x5c, 0x68, 0x3a, 0xe6, 0x1e, - 0x71, 0x5b, 0xcc, 0x72, 0x98, 0xec, 0x10, 0x97, 0xd8, 0x26, 0x41, 0xd7, 0xa1, 0xe2, 0x12, 0x8b, - 0x7a, 0xbe, 0x7b, 0x50, 0x55, 0x56, 0x94, 0x6b, 0xd3, 0x8d, 0x73, 0x4f, 0x0f, 0x97, 0xcf, 0x0c, - 0x0f, 0x97, 0x2b, 0x58, 0xac, 0xe3, 0x88, 0x02, 0xd5, 0x61, 0xda, 0x36, 0x7a, 0xc4, 0xeb, 0x1b, - 0x26, 0xa9, 0x16, 0x38, 0xf9, 0x82, 0x20, 0x9f, 0xfe, 0x6e, 0xb8, 0x81, 0x63, 0x1a, 0xb4, 0x02, - 0x45, 0xf6, 0x50, 0x55, 0x39, 0xed, 0xac, 0xa0, 0x2d, 0x32, 0x5a, 0xcc, 0x77, 0xd0, 0xab, 0xa0, - 0xfa, 0x86, 0x55, 0x2d, 0x72, 0x82, 0x19, 0x41, 0xa0, 0xb6, 0x0d, 0x0b, 0xb3, 0x75, 0x54, 0x83, - 0x02, 0x6d, 0x56, 0x4b, 0x7c, 0x17, 0xc4, 0x6e, 0xa1, 0xd5, 0xc4, 0x05, 0xda, 0xd4, 0xfe, 0x32, - 0x05, 0x25, 0xfe, 0x3a, 0xe8, 0xfb, 0x50, 0x61, 0x7e, 0xe9, 0x18, 0xbe, 0xc1, 0xdf, 0x62, 0x66, - 0xed, 0x6b, 0x7a, 0x60, 0x26, 0x5d, 0x36, 0x93, 0xde, 0xdf, 0xb3, 0xd8, 0x82, 0xa7, 0x33, 0x6a, - 0x7d, 0x7f, 0x55, 0x7f, 0xb0, 0xfd, 0x03, 0x62, 0xfa, 0x1b, 0xc4, 0x37, 0x1a, 0x48, 0xa0, 0x43, - 0xbc, 0x86, 0x23, 0x54, 0xb4, 0x09, 0x17, 0x3a, 0x19, 0xf6, 0x13, 0x46, 0xb8, 0x24, 0x78, 0x33, - 0x6d, 0x8c, 0x33, 0x39, 0xd1, 0x8f, 0xe0, 0xbc, 0xb4, 0xbe, 0x11, 0xaa, 0xaf, 0x72, 0xf5, 0x5f, - 0x1f, 0xab, 0xbe, 0x38, 0x1d, 0x3a, 0x36, 0xde, 0xbf, 0xf7, 0x81, 0x4f, 0x6c, 0x8f, 0x3a, 0x76, - 0xe3, 0xa2, 0x90, 0x7f, 0xbe, 0x39, 0x8a, 0x88, 0xb3, 0xc4, 0xa0, 0x6d, 0xa8, 0x65, 0x2c, 0x3f, - 0x24, 0x2e, 0xc3, 0x13, 0xde, 0xd0, 0x04, 0x6a, 0xad, 0x39, 0x96, 0x12, 0x1f, 0x81, 0x82, 0x36, - 0x92, 0x6f, 0x68, 0xd8, 0x74, 0x87, 0x78, 0xbe, 0x70, 0x66, 0xa6, 0xca, 0x82, 0x04, 0x67, 0xf1, - 0xa1, 0x7d, 0x58, 0x90, 0x96, 0xd7, 0x8d, 0x03, 0xe2, 0x7a, 0xd5, 0xf2, 0x8a, 0xca, 0xcd, 0x75, - 0x6c, 0xa6, 0xd0, 0x63, 0xae, 0xc6, 0x2b, 0x42, 0xf6, 0x42, 0x33, 0x8d, 0x87, 0x47, 0x45, 0x20, - 0x02, 0xe0, 0x51, 0xcb, 0x36, 0xfc, 0x81, 0x4b, 0xbc, 0xea, 0x14, 0x17, 0xb8, 0x9a, 0x57, 0xe0, - 0x56, 0xc8, 0x19, 0x9f, 0xaf, 0x68, 0xc9, 0xc3, 0x12, 0x30, 0x7a, 0x00, 0x8b, 0x92, 0xec, 0x98, - 0xa8, 0x5a, 0x59, 0x51, 0xaf, 0xcd, 0x36, 0x5e, 0x19, 0x1e, 0x2e, 0x2f, 0x36, 0xb3, 0x08, 0x70, - 0x36, 0x1f, 0xda, 0x85, 0x4b, 0x19, 0x66, 0xdc, 0x20, 0x1d, 0x6a, 0xb4, 0x0f, 0xfa, 0xa4, 0x3a, - 0xcd, 0xfd, 0xf0, 0x25, 0xa1, 0xd6, 0xa5, 0xe6, 0x11, 0xb4, 0xf8, 0x48, 0x24, 0x74, 0x3f, 0xe1, - 0x99, 0xbb, 0x8e, 0xbd, 0x43, 0xad, 0x2a, 0x70, 0xf8, 0x2c, 0x53, 0x07, 0x04, 0x78, 0x94, 0x47, - 0x7b, 0x0f, 0xce, 0xf3, 0xc7, 0x46, 0xd7, 0xd9, 0x8e, 0x22, 0xc5, 0x43, 0x1a, 0x94, 0xbb, 0x81, - 0xbb, 0x95, 0x15, 0x95, 0x25, 0x82, 0xe1, 0xe1, 0x72, 0x59, 0x38, 0x4c, 0xec, 0x30, 0x1a, 0x33, - 0x10, 0x1c, 0x84, 0x24, 0xa7, 0x11, 0x92, 0xc4, 0x8e, 0xf6, 0x27, 0x15, 0xe6, 0x39, 0x7e, 0xab, - 0xd7, 0x77, 0x5c, 0x7f, 0xab, 0x4f, 0x4c, 0x74, 0x0f, 0x8a, 0x3b, 0xae, 0xd3, 0x13, 0x69, 0xe3, - 0xb2, 0x14, 0x77, 0x3a, 0x2b, 0x10, 0x71, 0x92, 0x88, 0xf4, 0x89, 0xd3, 0xd8, 0xb7, 0x5c, 0xa7, - 0x87, 0x39, 0x3b, 0x7a, 0x07, 0x0a, 0xbe, 0xc3, 0x45, 0xcf, 0xac, 0x5d, 0xcb, 0x02, 0x59, 0x77, - 0x4c, 0xa3, 0x9b, 0x46, 0x2a, 0xb3, 0x6c, 0xd6, 0x76, 0x70, 0xc1, 0x77, 0x50, 0x17, 0x66, 0x29, - 0x57, 0x6b, 0xd3, 0xe9, 0x52, 0xf3, 0x40, 0x24, 0x82, 0xb5, 0x1c, 0x07, 0xad, 0x6d, 0x58, 0x2d, - 0x89, 0xb3, 0x71, 0x41, 0xe8, 0x37, 0x2b, 0xaf, 0xe2, 0x04, 0x3a, 0xba, 0x03, 0xf3, 0xd4, 0x36, - 0xbb, 0x83, 0x4e, 0x1c, 0x97, 0x2c, 0xe8, 0x2b, 0x8d, 0x97, 0x05, 0xf3, 0x7c, 0x2b, 0xb9, 0x8d, - 0xd3, 0xf4, 0xe8, 0x03, 0x98, 0x77, 0xc3, 0x37, 0x11, 0x3a, 0x97, 0xb8, 0xce, 0x6f, 0xe6, 0xd3, - 0x19, 0x27, 0x99, 0x63, 0xc9, 0xa9, 0x0d, 0x9c, 0x16, 0xa3, 0xfd, 0x55, 0x81, 0x05, 0xd9, 0x8f, - 0xbe, 0xe1, 0x0f, 0x3c, 0xd4, 0x86, 0xb2, 0xc7, 0x7f, 0x09, 0x5f, 0x5e, 0xcf, 0x57, 0x02, 0x02, - 0xee, 0xc6, 0x9c, 0x90, 0x5e, 0x0e, 0x9e, 0xb1, 0xc0, 0x42, 0x2d, 0x28, 0x71, 0xa5, 0x23, 0xdf, - 0xe6, 0x0c, 0xfc, 0xc6, 0xf4, 0xf0, 0x70, 0x39, 0x28, 0x4f, 0x38, 0x40, 0x08, 0x4b, 0x9d, 0x9a, - 0x5d, 0xea, 0xb4, 0x0f, 0x15, 0x80, 0x38, 0xef, 0x44, 0xa5, 0x53, 0x19, 0x5b, 0x3a, 0xaf, 0x40, - 0xd1, 0xa3, 0x4f, 0x02, 0xcd, 0xd4, 0xb8, 0x10, 0x73, 0xf6, 0x2d, 0xfa, 0x84, 0x60, 0xbe, 0xcd, - 0x8a, 0x76, 0x2f, 0x0a, 0x7a, 0x35, 0x59, 0xb4, 0xe3, 0x08, 0x8f, 0x69, 0xb4, 0x0e, 0xcc, 0xc5, - 0x7a, 0x34, 0x59, 0xb5, 0x78, 0x4d, 0x48, 0x52, 0xb8, 0xa4, 0xb3, 0xc7, 0x4a, 0x29, 0xe4, 0x90, - 0xf2, 0x7b, 0x05, 0xa6, 0x03, 0x31, 0xd4, 0xf3, 0xd1, 0xe3, 0x91, 0x0a, 0xae, 0xe7, 0x73, 0x1f, - 0xe3, 0xe6, 0xf5, 0x3b, 0xea, 0x5b, 0xc2, 0x15, 0xa9, 0x7a, 0x6f, 0x40, 0x89, 0xfa, 0xa4, 0xe7, - 0x55, 0x0b, 0x3c, 0x7b, 0xe7, 0x77, 0xe2, 0x59, 0x01, 0x5a, 0x6a, 0x31, 0x76, 0x1c, 0xa0, 0x68, - 0x37, 0xc5, 0xf1, 0x5b, 0x77, 0x9c, 0xbd, 0x41, 0x5f, 0x44, 0xd4, 0x65, 0x28, 0x75, 0x59, 0x8c, - 0x73, 0x13, 0x57, 0x62, 0x4e, 0x1e, 0xf8, 0x38, 0xd8, 0xd3, 0x7e, 0x53, 0x16, 0xb6, 0x8d, 0xf2, - 0xf4, 0x29, 0xf4, 0x2e, 0x2b, 0x50, 0xf4, 0x63, 0xaf, 0x44, 0x27, 0x89, 0x3b, 0x84, 0xef, 0xa0, - 0x2b, 0x30, 0x65, 0x3a, 0xb6, 0x4f, 0x6c, 0x9f, 0x6b, 0x3f, 0xdb, 0x98, 0x19, 0x1e, 0x2e, 0x4f, - 0xdd, 0x0d, 0x96, 0x70, 0xb8, 0x87, 0x28, 0x80, 0xe9, 0xd8, 0x1d, 0xea, 0x53, 0xc7, 0xf6, 0xaa, - 0x45, 0x6e, 0xcb, 0x3c, 0xc1, 0x1e, 0xbd, 0xec, 0xdd, 0x90, 0x3b, 0xd6, 0x38, 0x5a, 0xf2, 0xb0, - 0x04, 0x8e, 0xbe, 0x01, 0x67, 0x39, 0x7b, 0xab, 0x43, 0x6c, 0x9f, 0xfa, 0x07, 0xa2, 0x6b, 0x58, - 0x14, 0x6c, 0x67, 0x5b, 0xf2, 0x26, 0x4e, 0xd2, 0xa2, 0x1f, 0xc3, 0x2c, 0x2b, 0xac, 0xa4, 0x73, - 0xb7, 0x6b, 0xd0, 0x5e, 0xd8, 0x24, 0xdc, 0x9d, 0xb8, 0x66, 0x73, 0xc5, 0x43, 0x94, 0x7b, 0xb6, - 0xef, 0x4a, 0xb9, 0x55, 0xde, 0xc2, 0x09, 0x71, 0xe8, 0x5d, 0x98, 0x32, 0x5d, 0xc2, 0xba, 0xef, - 0xea, 0x14, 0x77, 0xe8, 0x57, 0xf2, 0x39, 0xb4, 0x4d, 0x7b, 0x44, 0x58, 0x3e, 0x60, 0xc7, 0x21, - 0x0e, 0x0b, 0x0f, 0xea, 0x79, 0x03, 0xd2, 0x69, 0x1c, 0x54, 0x2b, 0xb9, 0x0b, 0x43, 0xf4, 0x22, - 0x2d, 0xc6, 0xeb, 0x36, 0x66, 0x59, 0x78, 0xb4, 0x04, 0x0e, 0x8e, 0x10, 0xd1, 0x7b, 0x21, 0x7a, - 0xdb, 0xe1, 0x5d, 0xc1, 0xcc, 0xda, 0x1b, 0x93, 0xa0, 0x6f, 0x0d, 0xf8, 0xa9, 0x93, 0xe1, 0xdb, - 0x0e, 0x8e, 0x20, 0x6b, 0x6f, 0xc3, 0xc2, 0x88, 0x21, 0xd1, 0x39, 0x50, 0xf7, 0x88, 0xb8, 0x73, - 0x60, 0xf6, 0x13, 0x5d, 0x80, 0xd2, 0xbe, 0xd1, 0x1d, 0x88, 0x73, 0x8a, 0x83, 0x87, 0xdb, 0x85, - 0x9b, 0x8a, 0xf6, 0xcb, 0x02, 0xcc, 0x04, 0x9e, 0xf1, 0x5d, 0x62, 0xf4, 0x4e, 0x21, 0x64, 0xda, - 0x50, 0xf4, 0xfa, 0xc4, 0x14, 0x49, 0x7f, 0x2d, 0xf7, 0xc9, 0xe1, 0xfa, 0xb1, 0xbe, 0x22, 0x0e, - 0x33, 0xf6, 0x84, 0x39, 0x1a, 0x7a, 0x1c, 0x55, 0xa8, 0xa0, 0xb8, 0xdf, 0x98, 0x10, 0xf7, 0xc8, - 0x4a, 0xa5, 0xfd, 0x41, 0x81, 0x73, 0x12, 0xf5, 0x69, 0xdd, 0x8c, 0x36, 0x9e, 0xb7, 0x40, 0xc6, - 0xb9, 0x55, 0x2a, 0x92, 0xda, 0x6f, 0x0b, 0x22, 0xb9, 0x86, 0x6f, 0xc1, 0x2a, 0xfc, 0x29, 0xbc, - 0xc6, 0xa3, 0x84, 0xc7, 0x6f, 0x4e, 0xe6, 0x99, 0xb8, 0x9f, 0xcc, 0xf4, 0xfb, 0x76, 0xca, 0xef, - 0xb7, 0x9f, 0x0b, 0xfd, 0x68, 0xef, 0xff, 0xb4, 0x00, 0x8b, 0x99, 0x1a, 0xa1, 0xab, 0x50, 0x0e, - 0x5a, 0x3f, 0x6e, 0xb9, 0x4a, 0x8c, 0x10, 0xd0, 0x60, 0xb1, 0x8b, 0x2c, 0x00, 0x97, 0xf4, 0x1d, - 0x8f, 0xfa, 0x8e, 0x7b, 0x20, 0xec, 0xf0, 0xf5, 0x1c, 0x9a, 0xe2, 0x88, 0x49, 0x32, 0xc3, 0x1c, - 0x33, 0x74, 0xbc, 0x83, 0x25, 0x68, 0xf4, 0x88, 0x29, 0x64, 0x58, 0x84, 0x99, 0x43, 0x9d, 0x24, - 0xbc, 0x64, 0xfc, 0xf8, 0x25, 0x18, 0x12, 0x16, 0x88, 0xda, 0xef, 0x0a, 0xf0, 0xf2, 0x18, 0xd3, - 0x21, 0x9c, 0x30, 0x04, 0xeb, 0x30, 0x26, 0x72, 0x43, 0x70, 0xa5, 0x48, 0x19, 0x8d, 0x66, 0x18, - 0xed, 0xd6, 0xf3, 0x18, 0x4d, 0x78, 0xf7, 0x08, 0xb3, 0x3d, 0x4e, 0x99, 0xed, 0xc6, 0x84, 0x66, - 0x4b, 0x9d, 0x9f, 0x94, 0xe1, 0x3e, 0x29, 0x26, 0xe2, 0x4e, 0xdc, 0x7d, 0x4f, 0x3e, 0xee, 0x3a, - 0x50, 0xda, 0xee, 0x3a, 0xdb, 0x61, 0x6b, 0xf6, 0xf6, 0x64, 0x3e, 0x09, 0xd4, 0xd4, 0xd9, 0x7d, - 0x51, 0x14, 0xe8, 0x28, 0xab, 0xf0, 0x35, 0x1c, 0x80, 0xa3, 0xdd, 0x94, 0xed, 0xde, 0x79, 0x2e, - 0x31, 0x81, 0xc9, 0x02, 0x39, 0x63, 0xec, 0x58, 0xdb, 0x03, 0x88, 0xb5, 0xc9, 0xa8, 0x72, 0xf7, - 0xe5, 0x2a, 0x37, 0xc1, 0x20, 0x21, 0x6a, 0xc6, 0xa5, 0xc2, 0x58, 0xfb, 0xa1, 0xa8, 0x8b, 0x63, - 0xa5, 0xad, 0x27, 0xa5, 0xbd, 0x95, 0x3b, 0x39, 0x27, 0x2e, 0xe0, 0x72, 0x2d, 0xfe, 0xa3, 0x22, - 0xee, 0xd0, 0xc2, 0x32, 0x27, 0xdf, 0xbc, 0x6f, 0x25, 0x9b, 0xf7, 0x49, 0xa3, 0x36, 0xbb, 0x85, - 0xff, 0xa7, 0x02, 0x48, 0xa2, 0xda, 0x30, 0xfa, 0x7d, 0x6a, 0x5b, 0xff, 0x77, 0xe5, 0xf2, 0xb8, - 0x3b, 0xe5, 0xaf, 0x0b, 0x09, 0x6f, 0xf1, 0x7a, 0xb0, 0x95, 0x18, 0x34, 0xc5, 0xc9, 0x46, 0xdc, - 0x34, 0x5f, 0x15, 0x20, 0x8b, 0xcd, 0x2c, 0x22, 0x9c, 0xcd, 0x8b, 0xde, 0x85, 0xa2, 0x6f, 0x58, - 0xa1, 0x8f, 0xea, 0x13, 0x4e, 0x00, 0xa4, 0x4b, 0x89, 0x61, 0x79, 0x98, 0x43, 0x21, 0x1b, 0x66, - 0xbb, 0xd2, 0x05, 0x6b, 0xd2, 0x9e, 0x49, 0xbe, 0x9c, 0xc5, 0x6d, 0xbb, 0xbc, 0x8a, 0x13, 0xf8, - 0xda, 0xaf, 0x92, 0x9d, 0x87, 0x28, 0x1a, 0x27, 0x62, 0xad, 0x87, 0x09, 0x6b, 0xe5, 0x79, 0x25, - 0x76, 0xed, 0xef, 0xb4, 0x0d, 0xeb, 0xde, 0x3e, 0xb1, 0x7d, 0x16, 0x24, 0x99, 0x26, 0x23, 0x70, - 0xb1, 0x3f, 0xd8, 0xee, 0x52, 0x33, 0x53, 0x1b, 0x71, 0x4a, 0x2e, 0x0b, 0xc6, 0x8b, 0x9b, 0xe3, - 0x49, 0xf1, 0x51, 0x38, 0xda, 0xc7, 0xc5, 0xf0, 0x16, 0xcb, 0x2d, 0xd5, 0x36, 0x4e, 0x23, 0x70, - 0xbe, 0x1d, 0x9c, 0xf4, 0x20, 0x6c, 0x26, 0x3e, 0x60, 0x53, 0x89, 0xaf, 0x0a, 0x6b, 0x00, 0xe2, - 0x0b, 0x09, 0x75, 0x6c, 0x6e, 0x16, 0x35, 0x96, 0x7e, 0x3f, 0xda, 0xc1, 0x12, 0x15, 0xda, 0xcd, - 0xb8, 0xfc, 0xde, 0xc8, 0xa7, 0x06, 0x77, 0x5a, 0xfe, 0xbb, 0x6f, 0x94, 0x22, 0x4a, 0x2f, 0x24, - 0x45, 0xa4, 0xe3, 0xa8, 0x7c, 0xc2, 0x71, 0xf4, 0xe7, 0x64, 0x6a, 0x6d, 0x1b, 0xd6, 0x29, 0x14, - 0x89, 0x87, 0xc9, 0x22, 0xb1, 0x3a, 0x59, 0x91, 0x68, 0x1b, 0xd6, 0x98, 0x3a, 0xf1, 0x2f, 0x05, - 0x16, 0x46, 0x62, 0x2f, 0xcc, 0xba, 0xca, 0x98, 0x8f, 0x56, 0x9b, 0x49, 0x65, 0xbe, 0x3a, 0xc1, - 0x29, 0xc9, 0x56, 0x23, 0x75, 0xf8, 0xd4, 0x93, 0x3b, 0x7c, 0xda, 0x47, 0x2a, 0x5c, 0xc8, 0xea, - 0xe8, 0x5f, 0xd4, 0xa0, 0x3c, 0x3d, 0xe6, 0x2e, 0x9c, 0xf6, 0x98, 0x5b, 0xfd, 0xef, 0xc7, 0xdc, - 0xc5, 0xd3, 0x19, 0x73, 0x7f, 0x54, 0x80, 0x97, 0xb2, 0xef, 0x09, 0x27, 0x34, 0xeb, 0x8e, 0x6f, - 0x18, 0x85, 0x17, 0x7f, 0xc3, 0x40, 0xb7, 0x61, 0xce, 0xe8, 0x04, 0xc7, 0xcc, 0xe8, 0xb2, 0xa2, - 0xc5, 0xcf, 0xf1, 0x74, 0x03, 0x0d, 0x0f, 0x97, 0xe7, 0xee, 0x24, 0x76, 0x70, 0x8a, 0x52, 0xfb, - 0x4c, 0x05, 0x34, 0x3a, 0x45, 0x44, 0xb7, 0xc5, 0x64, 0x33, 0x08, 0xc4, 0xab, 0xf2, 0x64, 0xf3, - 0x8b, 0xc3, 0xe5, 0x97, 0x46, 0x39, 0xa4, 0x99, 0xe7, 0x7a, 0x64, 0xc2, 0x60, 0x2e, 0x7a, 0x23, - 0x69, 0x94, 0x2f, 0x0e, 0x97, 0x33, 0xfe, 0x2c, 0xa0, 0x47, 0x48, 0x29, 0xd3, 0x59, 0x70, 0xb6, - 0x6b, 0x78, 0xfe, 0xa6, 0xeb, 0x6c, 0x93, 0x36, 0x15, 0x5f, 0xbc, 0x27, 0x9b, 0xfc, 0x45, 0xb3, - 0xcd, 0x75, 0x19, 0x08, 0x27, 0x71, 0xd1, 0x3e, 0x20, 0xb6, 0xd0, 0x76, 0x0d, 0xdb, 0x0b, 0x5e, - 0x89, 0x49, 0x2b, 0x4e, 0x2c, 0xad, 0x26, 0xa4, 0xa1, 0xf5, 0x11, 0x34, 0x9c, 0x21, 0x01, 0x5d, - 0x85, 0xb2, 0x4b, 0x0c, 0xcf, 0xb1, 0xc5, 0x24, 0x36, 0xf2, 0x32, 0xe6, 0xab, 0x58, 0xec, 0xa2, - 0x2f, 0xc3, 0x54, 0x8f, 0x78, 0x1e, 0x2b, 0x5f, 0x65, 0x4e, 0x38, 0x2f, 0x08, 0xa7, 0x36, 0x82, - 0x65, 0x1c, 0xee, 0x6b, 0x1f, 0x2a, 0x10, 0xbb, 0x88, 0x57, 0x5d, 0x6a, 0xde, 0x0b, 0x26, 0xb8, - 0x37, 0x61, 0xd6, 0x71, 0x2d, 0xc3, 0xa6, 0x4f, 0x82, 0x12, 0x1d, 0x38, 0x38, 0x8a, 0xf8, 0x07, - 0xd2, 0x1e, 0x4e, 0x50, 0xb2, 0xd2, 0x6e, 0x3a, 0xbd, 0x9e, 0x63, 0xb3, 0xac, 0x2d, 0x5c, 0x2b, - 0xe5, 0xbc, 0x70, 0x07, 0x4b, 0x54, 0xda, 0x27, 0x0a, 0xcc, 0xa7, 0x66, 0xa5, 0xe8, 0x17, 0x0a, - 0xbc, 0xe4, 0x65, 0x2a, 0x27, 0x42, 0xee, 0xd6, 0x24, 0x23, 0xd2, 0x04, 0x40, 0x63, 0x49, 0xe8, - 0x33, 0xe6, 0xed, 0xf1, 0x18, 0xc1, 0xda, 0xdf, 0x14, 0x38, 0x97, 0x9e, 0xba, 0xfe, 0x2f, 0x2a, - 0x8a, 0xde, 0x84, 0x99, 0xa0, 0x7f, 0xfc, 0x0e, 0x39, 0x68, 0x35, 0x85, 0x17, 0xce, 0x0b, 0xb0, - 0x99, 0xcd, 0x78, 0x0b, 0xcb, 0x74, 0xda, 0xcf, 0x0a, 0x50, 0x09, 0x2b, 0x16, 0xfa, 0x5e, 0x3c, - 0x45, 0x57, 0x26, 0x3e, 0xdd, 0xd1, 0xa1, 0x1b, 0x99, 0xa4, 0xbf, 0xf8, 0x3f, 0x72, 0x5c, 0x0e, - 0xdb, 0xb5, 0xa0, 0xbd, 0xce, 0x6e, 0xc2, 0x92, 0x1d, 0x67, 0x31, 0x4f, 0xc7, 0xa9, 0x7d, 0xac, - 0xc2, 0xc2, 0x48, 0x01, 0x47, 0xb7, 0x12, 0x39, 0xef, 0x4a, 0x2a, 0xe7, 0x2d, 0x8e, 0x30, 0x9c, - 0x58, 0xca, 0xcb, 0xce, 0x44, 0xea, 0x29, 0x66, 0xa2, 0x62, 0xde, 0x4c, 0x54, 0x3a, 0x3a, 0x13, - 0xa5, 0xbc, 0x53, 0xce, 0xe5, 0x9d, 0x3e, 0xcc, 0xa7, 0x3a, 0x12, 0x74, 0x1d, 0x2a, 0xd4, 0xf6, - 0x88, 0x39, 0x70, 0x89, 0x98, 0xb5, 0x46, 0x2d, 0x6b, 0x4b, 0xac, 0xe3, 0x88, 0x02, 0xd5, 0x61, - 0xda, 0x33, 0x77, 0x49, 0x67, 0xd0, 0x25, 0x1d, 0xee, 0x90, 0x4a, 0xfc, 0xc5, 0x74, 0x2b, 0xdc, - 0xc0, 0x31, 0x8d, 0xf6, 0xef, 0x22, 0xcc, 0xca, 0x0d, 0x45, 0x8e, 0x4f, 0xc4, 0xef, 0xc3, 0x8c, - 0x61, 0xdb, 0x8e, 0x6f, 0x04, 0x8d, 0x63, 0x21, 0xf7, 0xf0, 0x4b, 0x96, 0xa3, 0xdf, 0x89, 0x21, - 0x82, 0xe1, 0x57, 0x14, 0xca, 0xd2, 0x0e, 0x96, 0x25, 0xa1, 0x3b, 0xa2, 0x5b, 0x54, 0xf3, 0x77, - 0x8b, 0x95, 0x54, 0xa7, 0x58, 0x87, 0xe9, 0xa8, 0x23, 0x12, 0x7f, 0x4e, 0x88, 0xec, 0x13, 0xc7, - 0x64, 0x4c, 0x83, 0xf4, 0x84, 0x17, 0x4b, 0xdc, 0x8b, 0x73, 0x47, 0xdc, 0xe8, 0xd2, 0xad, 0x68, - 0xf9, 0x44, 0x5b, 0xd1, 0x8c, 0x3e, 0x72, 0xea, 0x54, 0xfa, 0xc8, 0xda, 0x37, 0xe1, 0x5c, 0xda, - 0x83, 0x13, 0x7d, 0x7e, 0xdb, 0x04, 0x34, 0x2a, 0xff, 0xb8, 0xde, 0x6b, 0x94, 0x23, 0x4e, 0x44, - 0x8d, 0x6b, 0x4f, 0x9f, 0x2d, 0x9d, 0xf9, 0xf4, 0xd9, 0xd2, 0x99, 0xcf, 0x9f, 0x2d, 0x9d, 0xf9, - 0xc9, 0x70, 0x49, 0x79, 0x3a, 0x5c, 0x52, 0x3e, 0x1d, 0x2e, 0x29, 0x9f, 0x0f, 0x97, 0x94, 0xbf, - 0x0f, 0x97, 0x94, 0x9f, 0xff, 0x63, 0xe9, 0xcc, 0xa3, 0xc2, 0xfe, 0xea, 0x7f, 0x02, 0x00, 0x00, - 0xff, 0xff, 0x22, 0x04, 0x69, 0xab, 0x36, 0x2a, 0x00, 0x00, + // 2463 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x5a, 0x4d, 0x6c, 0x1c, 0x49, + 0x15, 0x4e, 0x4f, 0xcf, 0x8c, 0xc7, 0xcf, 0x8e, 0x1d, 0x57, 0xe2, 0xdd, 0xd9, 0x49, 0xd6, 0xf6, + 0x76, 0x48, 0x14, 0x20, 0xdb, 0x83, 0xbd, 0xd9, 0xc5, 0x09, 0x12, 0xbb, 0x99, 0x4c, 0x88, 0x06, + 0x6c, 0xe2, 0x2d, 0x0f, 0x39, 0x44, 0x41, 0xa2, 0xdd, 0x53, 0x6e, 0x17, 0x9e, 0xe9, 0x1e, 0xba, + 0x7b, 0xbc, 0xeb, 0x08, 0x24, 0x0e, 0x68, 0xb5, 0x07, 0x0e, 0x70, 0xe2, 0xb0, 0x47, 0xb4, 0x42, + 0x9c, 0x11, 0x88, 0x3b, 0x20, 0x45, 0x5c, 0x58, 0x2d, 0x97, 0xbd, 0x60, 0x91, 0x81, 0x33, 0x37, + 0x2e, 0x7b, 0x42, 0x55, 0x5d, 0xdd, 0x5d, 0xdd, 0xd3, 0xe3, 0xf4, 0x84, 0xd8, 0x82, 0x9b, 0xa7, + 0xde, 0x7b, 0xdf, 0x7b, 0xf5, 0x5e, 0xbd, 0x9f, 0xaa, 0x36, 0xac, 0x5a, 0xd4, 0xdf, 0x1b, 0xec, + 0xe8, 0xa6, 0xd3, 0xab, 0x3b, 0x7d, 0x62, 0x7b, 0x7b, 0x74, 0xd7, 0xaf, 0x1b, 0x7d, 0x5a, 0xa7, + 0x3d, 0xc3, 0x22, 0xf5, 0x83, 0xd5, 0xba, 0x45, 0x6c, 0xe2, 0x1a, 0x3e, 0xe9, 0xe8, 0x7d, 0xd7, + 0xf1, 0x1d, 0xf4, 0x5a, 0x2c, 0xa2, 0x47, 0x22, 0xba, 0xd1, 0xa7, 0x3a, 0x17, 0xd1, 0x0f, 0x56, + 0x6b, 0xaf, 0x4b, 0xa8, 0x96, 0x63, 0x39, 0x75, 0x2e, 0xb9, 0x33, 0xd8, 0xe5, 0xbf, 0xf8, 0x0f, + 0xfe, 0x57, 0x80, 0x58, 0xd3, 0xf6, 0xd7, 0x3d, 0x9d, 0x3a, 0x5c, 0xad, 0xe9, 0xb8, 0x59, 0x5a, + 0x6b, 0x37, 0x62, 0x9e, 0x9e, 0x61, 0xee, 0x51, 0x9b, 0xb8, 0x87, 0xf5, 0xfe, 0xbe, 0xc5, 0x16, + 0xbc, 0x7a, 0x8f, 0xf8, 0x46, 0x96, 0x54, 0x7d, 0x9c, 0x94, 0x3b, 0xb0, 0x7d, 0xda, 0x23, 0x23, + 0x02, 0x6f, 0x3d, 0x4b, 0xc0, 0x33, 0xf7, 0x48, 0xcf, 0x18, 0x91, 0x7b, 0x63, 0x9c, 0xdc, 0xc0, + 0xa7, 0xdd, 0x3a, 0xb5, 0x7d, 0xcf, 0x77, 0xd3, 0x42, 0xda, 0xa7, 0x0a, 0x5c, 0x68, 0x3a, 0xe6, + 0x3e, 0x71, 0x5b, 0xcc, 0x73, 0x98, 0xec, 0x12, 0x97, 0xd8, 0x26, 0x41, 0xd7, 0xa1, 0xe2, 0x12, + 0x8b, 0x7a, 0xbe, 0x7b, 0x58, 0x55, 0x56, 0x94, 0x6b, 0xd3, 0x8d, 0x73, 0x4f, 0x8e, 0x96, 0xcf, + 0x0c, 0x8f, 0x96, 0x2b, 0x58, 0xac, 0xe3, 0x88, 0x03, 0xd5, 0x61, 0xda, 0x36, 0x7a, 0xc4, 0xeb, + 0x1b, 0x26, 0xa9, 0x16, 0x38, 0xfb, 0x82, 0x60, 0x9f, 0xfe, 0x76, 0x48, 0xc0, 0x31, 0x0f, 0x5a, + 0x81, 0x22, 0xfb, 0x51, 0x55, 0x39, 0xef, 0xac, 0xe0, 0x2d, 0x32, 0x5e, 0xcc, 0x29, 0xe8, 0x55, + 0x50, 0x7d, 0xc3, 0xaa, 0x16, 0x39, 0xc3, 0x8c, 0x60, 0x50, 0xdb, 0x86, 0x85, 0xd9, 0x3a, 0xaa, + 0x41, 0x81, 0x36, 0xab, 0x25, 0x4e, 0x05, 0x41, 0x2d, 0xb4, 0x9a, 0xb8, 0x40, 0x9b, 0xda, 0x5f, + 0xa6, 0xa0, 0xc4, 0xb7, 0x83, 0xbe, 0x07, 0x15, 0x16, 0x97, 0x8e, 0xe1, 0x1b, 0x7c, 0x17, 0x33, + 0x6b, 0x5f, 0xd1, 0x03, 0x37, 0xe9, 0xb2, 0x9b, 0xf4, 0xfe, 0xbe, 0xc5, 0x16, 0x3c, 0x9d, 0x71, + 0xeb, 0x07, 0xab, 0xfa, 0xfd, 0x9d, 0xef, 0x13, 0xd3, 0xdf, 0x24, 0xbe, 0xd1, 0x40, 0x02, 0x1d, + 0xe2, 0x35, 0x1c, 0xa1, 0xa2, 0x2d, 0xb8, 0xd0, 0xc9, 0xf0, 0x9f, 0x70, 0xc2, 0x25, 0x21, 0x9b, + 0xe9, 0x63, 0x9c, 0x29, 0x89, 0x7e, 0x08, 0xe7, 0xa5, 0xf5, 0xcd, 0xd0, 0x7c, 0x95, 0x9b, 0xff, + 0xfa, 0x58, 0xf3, 0xc5, 0xe9, 0xd0, 0xb1, 0xf1, 0xde, 0xdd, 0xf7, 0x7d, 0x62, 0x7b, 0xd4, 0xb1, + 0x1b, 0x17, 0x85, 0xfe, 0xf3, 0xcd, 0x51, 0x44, 0x9c, 0xa5, 0x06, 0xed, 0x40, 0x2d, 0x63, 0xf9, + 0x01, 0x71, 0x19, 0x9e, 0x88, 0x86, 0x26, 0x50, 0x6b, 0xcd, 0xb1, 0x9c, 0xf8, 0x18, 0x14, 0xb4, + 0x99, 0xdc, 0xa1, 0x61, 0xd3, 0x5d, 0xe2, 0xf9, 0x22, 0x98, 0x99, 0x26, 0x0b, 0x16, 0x9c, 0x25, + 0x87, 0x0e, 0x60, 0x41, 0x5a, 0xde, 0x30, 0x0e, 0x89, 0xeb, 0x55, 0xcb, 0x2b, 0x2a, 0x77, 0xd7, + 0x33, 0x2b, 0x85, 0x1e, 0x4b, 0x35, 0x5e, 0x11, 0xba, 0x17, 0x9a, 0x69, 0x3c, 0x3c, 0xaa, 0x02, + 0x11, 0x00, 0x8f, 0x5a, 0xb6, 0xe1, 0x0f, 0x5c, 0xe2, 0x55, 0xa7, 0xb8, 0xc2, 0xd5, 0xbc, 0x0a, + 0xb7, 0x43, 0xc9, 0xf8, 0x7c, 0x45, 0x4b, 0x1e, 0x96, 0x80, 0xd1, 0x7d, 0x58, 0x94, 0x74, 0xc7, + 0x4c, 0xd5, 0xca, 0x8a, 0x7a, 0x6d, 0xb6, 0xf1, 0xca, 0xf0, 0x68, 0x79, 0xb1, 0x99, 0xc5, 0x80, + 0xb3, 0xe5, 0xd0, 0x1e, 0x5c, 0xca, 0x70, 0xe3, 0x26, 0xe9, 0x50, 0xa3, 0x7d, 0xd8, 0x27, 0xd5, + 0x69, 0x1e, 0x87, 0x2f, 0x08, 0xb3, 0x2e, 0x35, 0x8f, 0xe1, 0xc5, 0xc7, 0x22, 0xa1, 0x7b, 0x89, + 0xc8, 0xdc, 0x71, 0xec, 0x5d, 0x6a, 0x55, 0x81, 0xc3, 0x67, 0xb9, 0x3a, 0x60, 0xc0, 0xa3, 0x32, + 0xda, 0x2f, 0x14, 0x38, 0xcf, 0x7f, 0x37, 0xba, 0xce, 0x4e, 0x94, 0x2a, 0x1e, 0xd2, 0xa0, 0xdc, + 0x0d, 0xe2, 0xad, 0xac, 0xa8, 0xac, 0x12, 0x0c, 0x8f, 0x96, 0xcb, 0x22, 0x62, 0x82, 0xc2, 0x78, + 0xcc, 0x40, 0x73, 0x90, 0x93, 0x9c, 0x47, 0xa8, 0x12, 0x14, 0xb4, 0x0e, 0xb3, 0x3c, 0x3c, 0x9b, + 0xd4, 0xf3, 0xa8, 0x6d, 0xf1, 0x64, 0xab, 0x34, 0x2e, 0x08, 0x1b, 0x67, 0x5b, 0x12, 0x0d, 0x27, + 0x38, 0xb5, 0x3f, 0xa9, 0x30, 0xcf, 0xc9, 0xad, 0x5e, 0xdf, 0x71, 0xfd, 0xed, 0x3e, 0x31, 0xd1, + 0x5d, 0x28, 0xee, 0xba, 0x4e, 0x4f, 0x54, 0x9c, 0xcb, 0x52, 0xca, 0xea, 0xac, 0xb7, 0xc4, 0xf5, + 0x25, 0xda, 0x49, 0x5c, 0x01, 0xbf, 0xe1, 0x3a, 0x3d, 0xcc, 0xc5, 0xd1, 0x3b, 0x50, 0xf0, 0x1d, + 0x6e, 0xf4, 0xcc, 0xda, 0xb5, 0x2c, 0x90, 0x0d, 0xc7, 0x34, 0xba, 0x69, 0xa4, 0x32, 0x2b, 0x84, + 0x6d, 0x07, 0x17, 0x7c, 0x07, 0x75, 0xd9, 0xb6, 0x98, 0x59, 0x5b, 0x4e, 0x97, 0x9a, 0x87, 0xa2, + 0x86, 0xac, 0xe5, 0x38, 0xa3, 0x6d, 0xc3, 0x6a, 0x49, 0x92, 0xb2, 0x2b, 0xe2, 0x55, 0x9c, 0x40, + 0x47, 0xb7, 0x61, 0x9e, 0xda, 0x66, 0x77, 0xd0, 0x89, 0x53, 0xba, 0xc8, 0xfd, 0xf8, 0xb2, 0x10, + 0x9e, 0x6f, 0x25, 0xc9, 0x38, 0xcd, 0x8f, 0xde, 0x87, 0x79, 0x37, 0xdc, 0x89, 0xb0, 0xb9, 0xc4, + 0x6d, 0x7e, 0x33, 0x9f, 0xcd, 0x38, 0x29, 0x1c, 0x6b, 0x4e, 0x11, 0x70, 0x5a, 0x8d, 0xf6, 0x57, + 0x05, 0x16, 0xe4, 0x38, 0xfa, 0x86, 0x3f, 0xf0, 0x50, 0x1b, 0xca, 0x1e, 0xff, 0x4b, 0xc4, 0xf2, + 0x7a, 0xbe, 0xee, 0x11, 0x48, 0x37, 0xe6, 0x84, 0xf6, 0x72, 0xf0, 0x1b, 0x0b, 0x2c, 0xd4, 0x82, + 0x12, 0x37, 0x3a, 0x8a, 0x6d, 0xce, 0x9a, 0xd1, 0x98, 0x1e, 0x1e, 0x2d, 0x07, 0x9d, 0x0d, 0x07, + 0x08, 0x61, 0x97, 0x54, 0xb3, 0xbb, 0xa4, 0xf6, 0x81, 0x02, 0x10, 0x97, 0xac, 0xa8, 0xeb, 0x2a, + 0x63, 0xbb, 0xee, 0x15, 0x28, 0x7a, 0xf4, 0x71, 0x60, 0x99, 0x1a, 0xf7, 0x70, 0x2e, 0xbe, 0x4d, + 0x1f, 0x13, 0xcc, 0xc9, 0xac, 0xdf, 0xf7, 0xa2, 0x7a, 0xa1, 0x26, 0xfb, 0x7d, 0x5c, 0x1c, 0x62, + 0x1e, 0xad, 0x03, 0x73, 0xb1, 0x1d, 0x4d, 0xd6, 0x68, 0x5e, 0x13, 0x9a, 0x14, 0xae, 0xe9, 0xec, + 0x33, 0xb5, 0x14, 0x72, 0x68, 0xf9, 0xbd, 0x02, 0xd3, 0x81, 0x1a, 0xea, 0xf9, 0xe8, 0xd1, 0x48, + 0xf3, 0xd7, 0xf3, 0x85, 0x8f, 0x49, 0xf3, 0xd6, 0x1f, 0x8d, 0x3c, 0xe1, 0x8a, 0xd4, 0xf8, 0x37, + 0xa1, 0x44, 0x7d, 0xd2, 0xf3, 0xaa, 0x05, 0x5e, 0xf8, 0xf3, 0x07, 0xf1, 0xac, 0x00, 0x2d, 0xb5, + 0x98, 0x38, 0x0e, 0x50, 0xb4, 0x75, 0x71, 0xfc, 0x36, 0x1c, 0x67, 0x7f, 0xd0, 0x17, 0x19, 0x75, + 0x19, 0x4a, 0x5d, 0x96, 0xe3, 0xa2, 0x1e, 0x45, 0x92, 0x3c, 0xf1, 0x71, 0x40, 0xd3, 0x7e, 0x53, + 0x16, 0xbe, 0x8d, 0x4a, 0xfc, 0x29, 0x8c, 0x3d, 0x2b, 0x50, 0xf4, 0xe3, 0xa8, 0x44, 0x27, 0x89, + 0x07, 0x84, 0x53, 0xd0, 0x15, 0x98, 0x32, 0x1d, 0xdb, 0x27, 0xb6, 0xcf, 0xad, 0x9f, 0x6d, 0xcc, + 0x0c, 0x8f, 0x96, 0xa7, 0xee, 0x04, 0x4b, 0x38, 0xa4, 0x21, 0x0a, 0x60, 0x3a, 0x76, 0x87, 0xfa, + 0xd4, 0xb1, 0xbd, 0x6a, 0x91, 0xfb, 0x32, 0x4f, 0xb2, 0x47, 0x9b, 0xbd, 0x13, 0x4a, 0xc7, 0x16, + 0x47, 0x4b, 0x1e, 0x96, 0xc0, 0xd1, 0xd7, 0xe0, 0x2c, 0x17, 0x6f, 0x75, 0x88, 0xed, 0x53, 0xff, + 0x50, 0x0c, 0x1c, 0x8b, 0x42, 0xec, 0x6c, 0x4b, 0x26, 0xe2, 0x24, 0x2f, 0xfa, 0x11, 0xcc, 0xb2, + 0x9e, 0x4c, 0x3a, 0x77, 0xba, 0x06, 0xed, 0x85, 0xf3, 0xc5, 0x9d, 0x89, 0xdb, 0x3d, 0x37, 0x3c, + 0x44, 0xb9, 0x6b, 0xfb, 0xae, 0x54, 0x5b, 0x65, 0x12, 0x4e, 0xa8, 0x43, 0xef, 0xc2, 0x94, 0xe9, + 0x12, 0x36, 0xb8, 0x57, 0xa7, 0x78, 0x40, 0xbf, 0x94, 0x2f, 0xa0, 0x6d, 0xda, 0x23, 0xc2, 0xf3, + 0x81, 0x38, 0x0e, 0x71, 0x58, 0x7a, 0x50, 0xcf, 0x1b, 0x90, 0x4e, 0xe3, 0xb0, 0x5a, 0xc9, 0xdd, + 0x18, 0xa2, 0x8d, 0xb4, 0x98, 0xac, 0xdb, 0x98, 0x65, 0xe9, 0xd1, 0x12, 0x38, 0x38, 0x42, 0x44, + 0xdf, 0x0d, 0xd1, 0xdb, 0x0e, 0x1f, 0x28, 0x66, 0xd6, 0xde, 0x98, 0x04, 0x7d, 0x7b, 0xc0, 0x4f, + 0x9d, 0x0c, 0xdf, 0x76, 0x70, 0x04, 0x59, 0x7b, 0x1b, 0x16, 0x46, 0x1c, 0x89, 0xce, 0x81, 0xba, + 0x4f, 0xc4, 0x75, 0x05, 0xb3, 0x3f, 0xd1, 0x05, 0x28, 0x1d, 0x18, 0xdd, 0x81, 0x38, 0xa7, 0x38, + 0xf8, 0x71, 0xab, 0xb0, 0xae, 0x68, 0xbf, 0x2c, 0xc0, 0x4c, 0x10, 0x19, 0xdf, 0x25, 0x46, 0xef, + 0x14, 0x52, 0xa6, 0x0d, 0x45, 0xaf, 0x4f, 0x4c, 0x51, 0xf4, 0xd7, 0x72, 0x9f, 0x1c, 0x6e, 0x1f, + 0x9b, 0x2b, 0xe2, 0x34, 0x63, 0xbf, 0x30, 0x47, 0x43, 0x8f, 0xa2, 0x0e, 0x15, 0x34, 0xf7, 0x1b, + 0x13, 0xe2, 0x1e, 0xdb, 0xa9, 0xb4, 0x3f, 0x28, 0x70, 0x4e, 0xe2, 0x3e, 0xad, 0x4b, 0xd5, 0xe6, + 0xf3, 0x36, 0xc8, 0xb8, 0xb6, 0x4a, 0x4d, 0x52, 0xfb, 0x6d, 0x41, 0x14, 0xd7, 0x70, 0x17, 0xac, + 0xc3, 0x9f, 0xc2, 0x36, 0x1e, 0x26, 0x22, 0xbe, 0x3e, 0x59, 0x64, 0xe2, 0x79, 0x32, 0x33, 0xee, + 0x3b, 0xa9, 0xb8, 0xdf, 0x7a, 0x2e, 0xf4, 0xe3, 0xa3, 0xff, 0x93, 0x02, 0x2c, 0x66, 0x5a, 0x84, + 0xae, 0x42, 0x39, 0x18, 0xfd, 0xb8, 0xe7, 0x2a, 0x31, 0x42, 0xc0, 0x83, 0x05, 0x15, 0x59, 0x00, + 0x2e, 0xe9, 0x3b, 0x1e, 0xf5, 0x1d, 0xf7, 0x50, 0xf8, 0xe1, 0xab, 0x39, 0x2c, 0xc5, 0x91, 0x90, + 0xe4, 0x86, 0x39, 0xe6, 0xe8, 0x98, 0x82, 0x25, 0x68, 0xf4, 0x90, 0x19, 0x64, 0x58, 0x84, 0xb9, + 0x43, 0x9d, 0x24, 0xbd, 0x64, 0xfc, 0x78, 0x13, 0x0c, 0x09, 0x0b, 0x44, 0xed, 0x77, 0x05, 0x78, + 0x79, 0x8c, 0xeb, 0x10, 0x4e, 0x38, 0x82, 0x4d, 0x18, 0x13, 0x85, 0x21, 0xb8, 0x8c, 0xa4, 0x9c, + 0x46, 0x33, 0x9c, 0x76, 0xf3, 0x79, 0x9c, 0x26, 0xa2, 0x7b, 0x8c, 0xdb, 0x1e, 0xa5, 0xdc, 0x76, + 0x63, 0x42, 0xb7, 0xa5, 0xce, 0x4f, 0xca, 0x71, 0x1f, 0x17, 0x13, 0x79, 0x27, 0xae, 0xcd, 0x27, + 0x9f, 0x77, 0x1d, 0x28, 0xed, 0x74, 0x9d, 0x9d, 0x70, 0x34, 0x7b, 0x7b, 0xb2, 0x98, 0x04, 0x66, + 0xea, 0xec, 0xa6, 0x29, 0x1a, 0x74, 0x54, 0x55, 0xf8, 0x1a, 0x0e, 0xc0, 0xd1, 0x5e, 0xca, 0x77, + 0xef, 0x3c, 0x97, 0x9a, 0xc0, 0x65, 0x81, 0x9e, 0x31, 0x7e, 0xac, 0xed, 0x03, 0xc4, 0xd6, 0x64, + 0x74, 0xb9, 0x7b, 0x72, 0x97, 0x9b, 0xe0, 0x0d, 0x22, 0x1a, 0xc6, 0xa5, 0xc6, 0x58, 0xfb, 0x81, + 0xe8, 0x8b, 0x63, 0xb5, 0x6d, 0x24, 0xb5, 0xbd, 0x95, 0xbb, 0x38, 0x27, 0xae, 0xee, 0x72, 0x2f, + 0xfe, 0xa3, 0x22, 0xee, 0xd0, 0xc2, 0x33, 0x27, 0x3f, 0xbc, 0x6f, 0x27, 0x87, 0xf7, 0x49, 0xb3, + 0x36, 0x7b, 0x84, 0xff, 0xa7, 0x02, 0x48, 0xe2, 0xda, 0x34, 0xfa, 0x7d, 0x6a, 0x5b, 0xff, 0x77, + 0xed, 0xf2, 0x59, 0x77, 0xca, 0x5f, 0x17, 0x12, 0xd1, 0xe2, 0xfd, 0x60, 0x3b, 0xf1, 0x46, 0x15, + 0x17, 0x1b, 0x71, 0xd3, 0x7c, 0x55, 0x80, 0x2c, 0x36, 0xb3, 0x98, 0x70, 0xb6, 0x2c, 0x7a, 0x17, + 0x8a, 0xbe, 0x61, 0x85, 0x31, 0xaa, 0x4f, 0xf8, 0x02, 0x20, 0x5d, 0x4a, 0x0c, 0xcb, 0xc3, 0x1c, + 0x0a, 0xd9, 0x30, 0xdb, 0x95, 0x2e, 0x58, 0x93, 0xce, 0x4c, 0xf2, 0xe5, 0x2c, 0x1e, 0xdb, 0xe5, + 0x55, 0x9c, 0xc0, 0xd7, 0x7e, 0x95, 0x9c, 0x3c, 0x44, 0xd3, 0x38, 0x11, 0x6f, 0x3d, 0x48, 0x78, + 0x2b, 0xcf, 0x96, 0xd8, 0xb5, 0xbf, 0xd3, 0x36, 0xac, 0xbb, 0x07, 0xc4, 0xf6, 0x59, 0x92, 0x64, + 0xba, 0x8c, 0xc0, 0xc5, 0xfe, 0x60, 0xa7, 0x4b, 0xcd, 0x4c, 0x6b, 0xc4, 0x29, 0xb9, 0x2c, 0x04, + 0x2f, 0x6e, 0x8d, 0x67, 0xc5, 0xc7, 0xe1, 0x68, 0x1f, 0x15, 0xc3, 0x5b, 0x2c, 0xf7, 0x54, 0xdb, + 0x38, 0x8d, 0xc4, 0xf9, 0x66, 0x70, 0xd2, 0x83, 0xb4, 0x99, 0xf8, 0x80, 0x4d, 0x25, 0x3e, 0x48, + 0xac, 0x01, 0x88, 0x8f, 0x2b, 0xd4, 0xb1, 0xb9, 0x5b, 0xd4, 0x58, 0xfb, 0xbd, 0x88, 0x82, 0x25, + 0x2e, 0xb4, 0x97, 0x71, 0xf9, 0xbd, 0x91, 0xcf, 0x0c, 0x1e, 0xb4, 0xfc, 0x77, 0xdf, 0xa8, 0x44, + 0x94, 0x5e, 0x48, 0x89, 0x48, 0xe7, 0x51, 0xf9, 0x84, 0xf3, 0xe8, 0xcf, 0xc9, 0xd2, 0xda, 0x36, + 0xac, 0x53, 0x68, 0x12, 0x0f, 0x92, 0x4d, 0x62, 0x75, 0xb2, 0x26, 0xd1, 0x36, 0xac, 0x31, 0x7d, + 0xe2, 0x5f, 0x0a, 0x2c, 0x8c, 0xe4, 0x5e, 0x58, 0x75, 0x95, 0x31, 0xdf, 0xbb, 0xb6, 0x92, 0xc6, + 0x7c, 0x79, 0x82, 0x53, 0x92, 0x6d, 0x46, 0xea, 0xf0, 0xa9, 0x27, 0x77, 0xf8, 0xb4, 0x0f, 0x55, + 0xb8, 0x90, 0x35, 0xd1, 0xbf, 0xa8, 0x87, 0xf2, 0xf4, 0x33, 0x77, 0xe1, 0xb4, 0x9f, 0xb9, 0xd5, + 0xff, 0xfe, 0x99, 0xbb, 0x78, 0x3a, 0xcf, 0xdc, 0x1f, 0x16, 0xe0, 0xa5, 0xec, 0x7b, 0xc2, 0x09, + 0xbd, 0x75, 0xc7, 0x37, 0x8c, 0xc2, 0x8b, 0xbf, 0x61, 0xa0, 0x5b, 0x30, 0x67, 0x74, 0x82, 0x63, + 0x66, 0x74, 0x59, 0xd3, 0xe2, 0xe7, 0x78, 0xba, 0x81, 0x86, 0x47, 0xcb, 0x73, 0xb7, 0x13, 0x14, + 0x9c, 0xe2, 0xd4, 0x3e, 0x55, 0x01, 0x8d, 0xbe, 0x22, 0xa2, 0x5b, 0xe2, 0x65, 0x33, 0x48, 0xc4, + 0xab, 0xf2, 0xcb, 0xe6, 0xe7, 0x47, 0xcb, 0x2f, 0x8d, 0x4a, 0x48, 0x6f, 0x9e, 0x1b, 0x91, 0x0b, + 0x83, 0x77, 0xd1, 0x1b, 0x49, 0xa7, 0x7c, 0x7e, 0xb4, 0x9c, 0xf1, 0x7f, 0x06, 0x7a, 0x84, 0x94, + 0x72, 0x9d, 0x05, 0x67, 0xbb, 0x86, 0xe7, 0x6f, 0xb9, 0xce, 0x0e, 0x69, 0x53, 0xf1, 0xb1, 0x7c, + 0xb2, 0x97, 0xbf, 0xe8, 0x6d, 0x73, 0x43, 0x06, 0xc2, 0x49, 0x5c, 0x74, 0x00, 0x88, 0x2d, 0xb4, + 0x5d, 0xc3, 0xf6, 0x82, 0x2d, 0x31, 0x6d, 0xc5, 0x89, 0xb5, 0xd5, 0x84, 0x36, 0xb4, 0x31, 0x82, + 0x86, 0x33, 0x34, 0xa0, 0xab, 0x50, 0x76, 0x89, 0xe1, 0x39, 0xb6, 0x78, 0x89, 0x8d, 0xa2, 0x8c, + 0xf9, 0x2a, 0x16, 0x54, 0xf4, 0x45, 0x98, 0xea, 0x11, 0xcf, 0x63, 0xed, 0xab, 0xcc, 0x19, 0xe7, + 0x05, 0xe3, 0xd4, 0x66, 0xb0, 0x8c, 0x43, 0xba, 0xf6, 0x81, 0x02, 0x71, 0x88, 0x78, 0xd7, 0xa5, + 0xe6, 0xdd, 0xe0, 0x05, 0x77, 0x1d, 0x66, 0x1d, 0xd7, 0x32, 0x6c, 0xfa, 0x38, 0x68, 0xd1, 0x41, + 0x80, 0xa3, 0x8c, 0xbf, 0x2f, 0xd1, 0x70, 0x82, 0x93, 0xb5, 0x76, 0xd3, 0xe9, 0xf5, 0x1c, 0x9b, + 0x55, 0x6d, 0x11, 0x5a, 0xa9, 0xe6, 0x85, 0x14, 0x2c, 0x71, 0x69, 0x1f, 0x2b, 0x30, 0x9f, 0x7a, + 0x2b, 0x45, 0x3f, 0x57, 0xe0, 0x25, 0x2f, 0xd3, 0x38, 0x91, 0x72, 0x37, 0x27, 0x79, 0x22, 0x4d, + 0x00, 0x34, 0x96, 0x84, 0x3d, 0x63, 0x76, 0x8f, 0xc7, 0x28, 0xd6, 0xfe, 0xa6, 0xc0, 0xb9, 0xf4, + 0xab, 0xeb, 0xff, 0xa2, 0xa1, 0xe8, 0x4d, 0x98, 0x09, 0xe6, 0xc7, 0x6f, 0x91, 0xc3, 0x56, 0x53, + 0x44, 0xe1, 0xbc, 0x00, 0x9b, 0xd9, 0x8a, 0x49, 0x58, 0xe6, 0xd3, 0x7e, 0x5a, 0x80, 0x4a, 0xd8, + 0xb1, 0xd0, 0x77, 0xe2, 0x57, 0x74, 0x65, 0xe2, 0xd3, 0x1d, 0x1d, 0xba, 0x91, 0x97, 0xf4, 0x17, + 0xff, 0x3f, 0x20, 0x97, 0xc3, 0x71, 0x2d, 0x18, 0xaf, 0xb3, 0x87, 0xb0, 0xe4, 0xc4, 0x59, 0xcc, + 0x33, 0x71, 0x6a, 0x1f, 0xa9, 0xb0, 0x30, 0xd2, 0xc0, 0xd1, 0xcd, 0x44, 0xcd, 0xbb, 0x92, 0xaa, + 0x79, 0x8b, 0x23, 0x02, 0x27, 0x56, 0xf2, 0xb2, 0x2b, 0x91, 0x7a, 0x8a, 0x95, 0xa8, 0x98, 0xb7, + 0x12, 0x95, 0x8e, 0xaf, 0x44, 0xa9, 0xe8, 0x94, 0x73, 0x45, 0xa7, 0x0f, 0xf3, 0xa9, 0x89, 0x04, + 0x5d, 0x87, 0x0a, 0xb5, 0x3d, 0x62, 0x0e, 0x5c, 0x22, 0xde, 0x5a, 0xa3, 0x91, 0xb5, 0x25, 0xd6, + 0x71, 0xc4, 0x81, 0xea, 0x30, 0xed, 0x99, 0x7b, 0xa4, 0x33, 0xe8, 0x92, 0x0e, 0x0f, 0x48, 0x25, + 0xfe, 0x62, 0xba, 0x1d, 0x12, 0x70, 0xcc, 0xa3, 0xfd, 0xbb, 0x08, 0xb3, 0xf2, 0x40, 0x91, 0xe3, + 0x13, 0xf1, 0x7b, 0x30, 0x63, 0xd8, 0xb6, 0xe3, 0x1b, 0xc1, 0xe0, 0x58, 0xc8, 0xfd, 0xf8, 0x25, + 0xeb, 0xd1, 0x6f, 0xc7, 0x10, 0xc1, 0xe3, 0x57, 0x94, 0xca, 0x12, 0x05, 0xcb, 0x9a, 0xd0, 0x6d, + 0x31, 0x2d, 0xaa, 0xf9, 0xa7, 0xc5, 0x4a, 0x6a, 0x52, 0xac, 0xc3, 0x74, 0x34, 0x11, 0x89, 0x7f, + 0x4e, 0x88, 0xfc, 0x13, 0xe7, 0x64, 0xcc, 0x83, 0xf4, 0x44, 0x14, 0x4b, 0x3c, 0x8a, 0x73, 0xc7, + 0xdc, 0xe8, 0xd2, 0xa3, 0x68, 0xf9, 0x44, 0x47, 0xd1, 0x8c, 0x39, 0x72, 0xea, 0x54, 0xe6, 0xc8, + 0xda, 0xd7, 0xe1, 0x5c, 0x3a, 0x82, 0x13, 0x7d, 0x7e, 0xdb, 0x02, 0x34, 0xaa, 0xff, 0x59, 0xb3, + 0xd7, 0xa8, 0x44, 0x5c, 0x88, 0x1a, 0xd7, 0x9e, 0x3c, 0x5d, 0x3a, 0xf3, 0xc9, 0xd3, 0xa5, 0x33, + 0x9f, 0x3d, 0x5d, 0x3a, 0xf3, 0xe3, 0xe1, 0x92, 0xf2, 0x64, 0xb8, 0xa4, 0x7c, 0x32, 0x5c, 0x52, + 0x3e, 0x1b, 0x2e, 0x29, 0x7f, 0x1f, 0x2e, 0x29, 0x3f, 0xfb, 0xc7, 0xd2, 0x99, 0x87, 0x85, 0x83, + 0xd5, 0xff, 0x04, 0x00, 0x00, 0xff, 0xff, 0xf9, 0xfa, 0xef, 0x59, 0x71, 0x2a, 0x00, 0x00, } diff --git a/image/v1/generated.proto b/image/v1/generated.proto index e6f29f0776c..b02bd6cc582 100644 --- a/image/v1/generated.proto +++ b/image/v1/generated.proto @@ -70,6 +70,13 @@ message Image { // ImageBlobReferences describes the blob references within an image. message ImageBlobReferences { + // imageMissing is true if the image is referenced by the image stream but the image + // object has been deleted from the API by an administrator. When this field is set, + // layers and config fields may be empty and callers that depend on the image metadata + // should consider the image to be unavailable for download or viewing. + // +optional + optional bool imageMissing = 3; + // layers is the list of blobs that compose this image, from base layer to top layer. // All layers referenced by this array will be defined in the blobs map. Some images // may have zero layers. diff --git a/image/v1/types.go b/image/v1/types.go index ddaed57db47..d20ee8b4dcf 100644 --- a/image/v1/types.go +++ b/image/v1/types.go @@ -435,6 +435,12 @@ type ImageStreamLayers struct { // ImageBlobReferences describes the blob references within an image. type ImageBlobReferences struct { + // imageMissing is true if the image is referenced by the image stream but the image + // object has been deleted from the API by an administrator. When this field is set, + // layers and config fields may be empty and callers that depend on the image metadata + // should consider the image to be unavailable for download or viewing. + // +optional + ImageMissing bool `json:"imageMissing" protobuf:"varint,3,opt,name=imageMissing"` // layers is the list of blobs that compose this image, from base layer to top layer. // All layers referenced by this array will be defined in the blobs map. Some images // may have zero layers. diff --git a/image/v1/types_swagger_doc_generated.go b/image/v1/types_swagger_doc_generated.go index 1a651b876bf..09a971757e3 100644 --- a/image/v1/types_swagger_doc_generated.go +++ b/image/v1/types_swagger_doc_generated.go @@ -43,9 +43,10 @@ func (Image) SwaggerDoc() map[string]string { } var map_ImageBlobReferences = map[string]string{ - "": "ImageBlobReferences describes the blob references within an image.", - "layers": "layers is the list of blobs that compose this image, from base layer to top layer. All layers referenced by this array will be defined in the blobs map. Some images may have zero layers.", - "config": "config, if set, is the blob that contains the image config. Some images do not have separate config blobs and this field will be set to nil if so.", + "": "ImageBlobReferences describes the blob references within an image.", + "imageMissing": "imageMissing is true if the image is referenced by the image stream but the image object has been deleted from the API by an administrator. When this field is set, layers and config fields may be empty and callers that depend on the image metadata should consider the image to be unavailable for download or viewing.", + "layers": "layers is the list of blobs that compose this image, from base layer to top layer. All layers referenced by this array will be defined in the blobs map. Some images may have zero layers.", + "config": "config, if set, is the blob that contains the image config. Some images do not have separate config blobs and this field will be set to nil if so.", } func (ImageBlobReferences) SwaggerDoc() map[string]string {