From 7955c03392a77f8c5b432efef036f28db52ebd29 Mon Sep 17 00:00:00 2001 From: lgtm <1gtm@users.noreply.github.com> Date: Wed, 28 Oct 2020 01:59:51 -0700 Subject: [PATCH] [cherry-pick] Update Kubernetes v1.18.9 dependencies (#519) (#521) /cherry-pick Signed-off-by: 1gtm <1gtm@appscode.com> --- go.mod | 4 +- go.sum | 4 + .../kmodules.xyz/client-go/core/v1/service.go | 12 +- .../offshoot-api/api/v1/generated.pb.go | 340 +++++++++++------- .../offshoot-api/api/v1/generated.proto | 15 + .../offshoot-api/api/v1/openapi_generated.go | 15 +- .../kmodules.xyz/offshoot-api/api/v1/types.go | 19 +- .../api/v1/zz_generated.deepcopy.go | 5 + vendor/modules.txt | 4 +- 9 files changed, 289 insertions(+), 129 deletions(-) diff --git a/go.mod b/go.mod index ce42378c8..9976953c7 100644 --- a/go.mod +++ b/go.mod @@ -42,10 +42,10 @@ require ( k8s.io/client-go v12.0.0+incompatible k8s.io/kube-openapi v0.0.0-20200410145947-61e04a5be9a6 k8s.io/utils v0.0.0-20200414100711-2df71ebbae66 // indirect - kmodules.xyz/client-go v0.0.0-20201021051118-03dac1aea508 + kmodules.xyz/client-go v0.0.0-20201027113349-01a6d453d836 kmodules.xyz/crd-schema-fuzz v0.0.0-20200922204806-c1426cd7fcf4 kmodules.xyz/custom-resources v0.0.0-20201008012351-6d8090f759d4 - kmodules.xyz/offshoot-api v0.0.0-20200922211229-36acc531abab + kmodules.xyz/offshoot-api v0.0.0-20201027212804-f5e6dc573558 kubedb.dev/apimachinery v0.14.0-beta.2 sigs.k8s.io/yaml v1.2.0 stash.appscode.dev/apimachinery v0.11.3 diff --git a/go.sum b/go.sum index 5e390c933..563e06f90 100644 --- a/go.sum +++ b/go.sum @@ -1304,6 +1304,8 @@ kmodules.xyz/client-go v0.0.0-20200903033732-dab39b86c81b/go.mod h1:sY/eoe4ktxZE kmodules.xyz/client-go v0.0.0-20200922200830-63d86b6e5b63/go.mod h1:JZN34jqk6ZlR+QOnBPpnUVBab4rmfamqxfSvLaulBMY= kmodules.xyz/client-go v0.0.0-20201021051118-03dac1aea508 h1:LjidyEzvw1rSlwRQLWNfElleLJ6vr9Uu5tn5H6JO+QA= kmodules.xyz/client-go v0.0.0-20201021051118-03dac1aea508/go.mod h1:pnRh7gtJ6ErPJQBkQeRlpD95KRtxhD4eGrYagZEU8RM= +kmodules.xyz/client-go v0.0.0-20201027113349-01a6d453d836 h1:oRtOV4teHgELaRJx+mjkpjlO03S9xl1g020RUoU4FDI= +kmodules.xyz/client-go v0.0.0-20201027113349-01a6d453d836/go.mod h1:pnRh7gtJ6ErPJQBkQeRlpD95KRtxhD4eGrYagZEU8RM= kmodules.xyz/constants v0.0.0-20200506032633-a21e58ceec72/go.mod h1:DbiFk1bJ1KEO94t1SlAn7tzc+Zz95rSXgyUKa2nzPmY= kmodules.xyz/crd-schema-fuzz v0.0.0-20200521005638-2433a187de95 h1:v0S/+ftzL6Xrs9XevgchAOJyPKlRQXPiZf87xotj3X4= kmodules.xyz/crd-schema-fuzz v0.0.0-20200521005638-2433a187de95/go.mod h1:jpu8xFsDKd6kAWUAKk8oTu/GQGBWqhrcaDeOJdaCJnk= @@ -1322,6 +1324,8 @@ kmodules.xyz/offshoot-api v0.0.0-20200521035628-e135bf07b226 h1:RZ7H0gl1z/9jLI74 kmodules.xyz/offshoot-api v0.0.0-20200521035628-e135bf07b226/go.mod h1:IbK+hCI23UfTDMzG7hos9sERCase2xsFK+XC0Ns3OCg= kmodules.xyz/offshoot-api v0.0.0-20200922211229-36acc531abab h1:d/4AFAN0TfKgwhjbQYzwXXHT/5/vTP7SAAvS4uJX+wQ= kmodules.xyz/offshoot-api v0.0.0-20200922211229-36acc531abab/go.mod h1:Wy3/mWK2lWQOviKVpBtiCEYtLaYIaSiym8leZNKBUd4= +kmodules.xyz/offshoot-api v0.0.0-20201027212804-f5e6dc573558 h1:/gk1vlGimdRj3fYS2NUsoV4UKQxW/I2ORXssnz2sBNI= +kmodules.xyz/offshoot-api v0.0.0-20201027212804-f5e6dc573558/go.mod h1:+tGJRjfzEFm01qWQZcmTkFhB5dWA1jKHXnlUS6O4ZkQ= kmodules.xyz/openshift v0.0.0-20200522123204-ce4abf5433c8/go.mod h1:nVhGcoB3Bi7Ots5+g972Ap/vtyIrrtoK3Z3aulNux7w= kmodules.xyz/prober v0.0.0-20200521101241-adf06150535c h1:aV6O9NbDpnFVra/D8c7b7TjI05w/CyI5CYJ8IBg6lg8= kmodules.xyz/prober v0.0.0-20200521101241-adf06150535c/go.mod h1:XYWZkfQquD09Mn+O7piHS+SEPq9oFV1Wy2WZ9DA+oeA= diff --git a/vendor/kmodules.xyz/client-go/core/v1/service.go b/vendor/kmodules.xyz/client-go/core/v1/service.go index ce322670e..894a0f9dc 100644 --- a/vendor/kmodules.xyz/client-go/core/v1/service.go +++ b/vendor/kmodules.xyz/client-go/core/v1/service.go @@ -106,24 +106,30 @@ func MergeServicePorts(cur, desired []core.ServicePort) []core.ServicePort { } // ports - curPorts := make(map[int32]core.ServicePort) + curPorts := make(map[string]core.ServicePort) for _, p := range cur { - curPorts[p.Port] = p + curPorts[p.Name] = p } for i, dp := range desired { - cp, ok := curPorts[dp.Port] + cp, ok := curPorts[dp.Name] // svc port not found if !ok { continue } + if dp.Port == 0 { + dp.Port = cp.Port + } if dp.NodePort == 0 { dp.NodePort = cp.NodePort // avoid reassigning port } if dp.Protocol == "" { dp.Protocol = cp.Protocol } + if dp.AppProtocol == nil { + dp.AppProtocol = cp.AppProtocol + } desired[i] = dp } return desired diff --git a/vendor/kmodules.xyz/offshoot-api/api/v1/generated.pb.go b/vendor/kmodules.xyz/offshoot-api/api/v1/generated.pb.go index 242d1f45d..d4f9b9f8c 100644 --- a/vendor/kmodules.xyz/offshoot-api/api/v1/generated.pb.go +++ b/vendor/kmodules.xyz/offshoot-api/api/v1/generated.pb.go @@ -435,126 +435,129 @@ func init() { } var fileDescriptor_3a450b99b211cb39 = []byte{ - // 1893 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x58, 0x4f, 0x6f, 0x1b, 0xc7, - 0x15, 0x17, 0x25, 0x52, 0xe2, 0x3e, 0x4a, 0x94, 0x34, 0x8a, 0xd2, 0xb5, 0xaa, 0x92, 0x2a, 0x5b, - 0x14, 0x2a, 0x1a, 0x2f, 0xa3, 0xc4, 0x07, 0x27, 0x41, 0x9d, 0x6a, 0x15, 0xd9, 0x55, 0xaa, 0xc8, - 0xc4, 0x48, 0x49, 0xff, 0xa0, 0xff, 0x46, 0xcb, 0x11, 0xb5, 0xd6, 0x72, 0x87, 0xdd, 0x19, 0x32, - 0x56, 0x7a, 0x68, 0xce, 0x3d, 0xf5, 0x13, 0xf4, 0x1b, 0xf4, 0x23, 0xf4, 0x52, 0xf4, 0x60, 0xa0, - 0x40, 0x91, 0x63, 0x4e, 0x44, 0xcd, 0x7e, 0x0b, 0x17, 0x05, 0x8a, 0x99, 0x9d, 0xfd, 0x47, 0xae, - 0x2c, 0x99, 0xb6, 0x7b, 0x20, 0xc0, 0x7d, 0xf3, 0x7b, 0xbf, 0x79, 0xf3, 0xe6, 0xbd, 0x37, 0x6f, - 0x06, 0xde, 0xbe, 0xe8, 0xb2, 0x76, 0xdf, 0xa3, 0xdc, 0x7a, 0x7c, 0xf9, 0x45, 0x93, 0x9d, 0x9d, - 0xf1, 0x73, 0xc6, 0xc4, 0x6d, 0xd2, 0x73, 0x9b, 0xf2, 0x37, 0xd8, 0x69, 0x76, 0xa8, 0x4f, 0x03, - 0x22, 0x68, 0xdb, 0xea, 0x05, 0x4c, 0x30, 0xb4, 0x95, 0xd6, 0xb0, 0x22, 0x8d, 0xdf, 0x90, 0x9e, - 0x6b, 0xc9, 0xdf, 0x60, 0x67, 0xe3, 0x76, 0xc7, 0x15, 0xe7, 0xfd, 0x53, 0xcb, 0x61, 0xdd, 0x66, - 0x87, 0x75, 0x58, 0x53, 0x29, 0x9e, 0xf6, 0xcf, 0xd4, 0x97, 0xfa, 0x50, 0xff, 0x42, 0xc2, 0x8d, - 0xc6, 0xc5, 0x5d, 0x6e, 0xb9, 0x4c, 0xcd, 0xe7, 0xb0, 0x80, 0xe6, 0x4c, 0xba, 0x71, 0x27, 0xc1, - 0x74, 0x89, 0x73, 0xee, 0xfa, 0x34, 0xb8, 0x6c, 0xf6, 0x2e, 0x3a, 0x52, 0xc0, 0x9b, 0x5d, 0x2a, - 0x48, 0x8e, 0x56, 0xe3, 0xbf, 0x25, 0x30, 0xf7, 0x98, 0x2f, 0x88, 0xc4, 0xe3, 0xbe, 0x2f, 0xdc, - 0x2e, 0x3d, 0xa6, 0x42, 0xb8, 0x7e, 0x87, 0xa3, 0x9f, 0x83, 0x11, 0x50, 0xce, 0xfa, 0x81, 0x43, - 0xb9, 0x59, 0xd8, 0x2a, 0x6c, 0x57, 0xde, 0xd9, 0xb6, 0xc2, 0x69, 0xd4, 0x42, 0xa4, 0x29, 0xd6, - 0x60, 0xc7, 0xc2, 0x1a, 0x84, 0xe9, 0xef, 0xfa, 0x6e, 0x40, 0xbb, 0xd4, 0x17, 0xdc, 0x5e, 0x7d, - 0x32, 0xac, 0xcf, 0x8c, 0x86, 0x75, 0x23, 0x1a, 0xe5, 0x38, 0x61, 0x43, 0x18, 0x96, 0x3c, 0x77, - 0x40, 0x7d, 0xca, 0x79, 0x2b, 0x60, 0xa7, 0xd4, 0x9c, 0x55, 0xf4, 0xb7, 0xf2, 0xe8, 0x15, 0xc0, - 0x5e, 0x1d, 0x0d, 0xeb, 0x4b, 0x87, 0x69, 0x1d, 0x9c, 0xa5, 0x40, 0x9f, 0x42, 0x35, 0xa0, 0xa4, - 0xed, 0x26, 0xa4, 0x73, 0xd7, 0x91, 0xa2, 0xd1, 0xb0, 0x5e, 0xc5, 0x19, 0x25, 0x3c, 0x46, 0x82, - 0x3e, 0x06, 0xc3, 0x73, 0xcf, 0xa8, 0x73, 0xe9, 0x78, 0xd4, 0x2c, 0x2a, 0xc6, 0x6f, 0xe5, 0x31, - 0x1e, 0x46, 0x20, 0x7b, 0x49, 0x2e, 0x3b, 0xfe, 0xc4, 0x89, 0x3a, 0x3a, 0x85, 0x65, 0x4e, 0x9d, - 0x7e, 0xe0, 0x8a, 0x4b, 0xe9, 0x75, 0xfa, 0x58, 0x98, 0x25, 0xc5, 0xf8, 0x9d, 0x3c, 0xc6, 0xe3, - 0x2c, 0xd4, 0x5e, 0x1b, 0x0d, 0xeb, 0xcb, 0x63, 0x42, 0x3c, 0x4e, 0x88, 0x0e, 0xa1, 0xe8, 0xbb, - 0x0e, 0x35, 0xe7, 0x15, 0xb1, 0x65, 0x5d, 0x17, 0x8c, 0xd6, 0x91, 0xeb, 0xc4, 0x7b, 0x6e, 0x97, - 0x47, 0xc3, 0x7a, 0x51, 0x4a, 0xb0, 0x62, 0x41, 0x27, 0x30, 0xef, 0x32, 0xc5, 0xb7, 0xa0, 0xf8, - 0xde, 0xbe, 0x9e, 0xef, 0xe0, 0x61, 0x86, 0x11, 0x46, 0xc3, 0xfa, 0x7c, 0x28, 0xc3, 0x9a, 0x0b, - 0x1d, 0xc2, 0x02, 0xf5, 0x07, 0xf7, 0x03, 0xd6, 0x35, 0xcb, 0x5b, 0x73, 0xdb, 0x95, 0x77, 0xbe, - 0x9d, 0xb7, 0xfe, 0xfd, 0x10, 0x72, 0xac, 0x62, 0xc6, 0x5e, 0xd6, 0x01, 0xb5, 0xa0, 0xc5, 0x38, - 0xa2, 0x40, 0xef, 0xc1, 0x1c, 0xf5, 0x07, 0xa6, 0xa1, 0x98, 0x36, 0xae, 0x60, 0xfa, 0x8c, 0x04, - 0x76, 0x45, 0x53, 0xcc, 0xed, 0xfb, 0x03, 0x2c, 0x75, 0x1a, 0xbf, 0x86, 0x6a, 0xd6, 0x5c, 0x54, - 0x87, 0x92, 0xe3, 0x11, 0x1e, 0x06, 0x7c, 0xc9, 0x36, 0x46, 0xc3, 0x7a, 0x69, 0x4f, 0x0a, 0x70, - 0x28, 0x47, 0x3f, 0x00, 0x43, 0xfd, 0xf9, 0x88, 0x08, 0xa2, 0xc2, 0xb6, 0x14, 0x6e, 0xf8, 0x5e, - 0x24, 0xc4, 0xc9, 0x78, 0xe3, 0x1e, 0x2c, 0x66, 0xd8, 0x2d, 0x00, 0xd2, 0x7e, 0xd4, 0xe7, 0x42, - 0x26, 0x89, 0x9e, 0xa2, 0x3a, 0x1a, 0xd6, 0x61, 0x37, 0x96, 0xe2, 0x14, 0xa2, 0xf1, 0xb7, 0x02, - 0xc0, 0xc3, 0xd3, 0x47, 0xd4, 0x11, 0x9f, 0x50, 0x41, 0x90, 0x80, 0x0a, 0xf1, 0x7d, 0x26, 0x88, - 0x70, 0x99, 0x2f, 0x4d, 0x94, 0x2b, 0xfe, 0xe1, 0xf5, 0x5b, 0x92, 0x50, 0x58, 0xbb, 0x89, 0xfe, - 0xbe, 0x2f, 0x82, 0x4b, 0x7b, 0x4d, 0x3b, 0xa5, 0x92, 0x1a, 0xc1, 0xe9, 0x69, 0x36, 0xee, 0xc1, - 0xca, 0xb8, 0x16, 0x5a, 0x81, 0xb9, 0x0b, 0x7a, 0xa9, 0x56, 0x60, 0x60, 0xf9, 0x17, 0xbd, 0x01, - 0xa5, 0x01, 0xf1, 0xfa, 0x61, 0x2a, 0x1b, 0x38, 0xfc, 0x78, 0x7f, 0xf6, 0x6e, 0xa1, 0xf1, 0xac, - 0x08, 0xab, 0x2d, 0x12, 0x08, 0x97, 0x78, 0xa9, 0xb5, 0x6c, 0x41, 0xd1, 0x27, 0x5d, 0x1a, 0x52, - 0xd8, 0x8b, 0xda, 0x8a, 0xe2, 0x11, 0xe9, 0xca, 0xd8, 0x23, 0x5d, 0x8a, 0xee, 0xc2, 0x62, 0x54, - 0xaf, 0xa4, 0x34, 0x24, 0xb6, 0xdf, 0xd0, 0xc8, 0xc5, 0x07, 0xa9, 0x31, 0x9c, 0x41, 0xa2, 0x26, - 0x18, 0x92, 0x81, 0xf7, 0x88, 0x13, 0x56, 0x01, 0x23, 0xa9, 0x47, 0x47, 0xd1, 0x00, 0x4e, 0x30, - 0xa8, 0x03, 0xf3, 0x1e, 0x39, 0xa5, 0x1e, 0x37, 0x8b, 0xca, 0xa7, 0x1f, 0x5e, 0xef, 0xd3, 0x89, - 0x15, 0x59, 0x87, 0x8a, 0x21, 0xf4, 0x6a, 0x55, 0x4f, 0x37, 0x1f, 0x0a, 0xb1, 0xa6, 0x47, 0xbf, - 0xcf, 0xee, 0x60, 0x49, 0xcd, 0xf6, 0xd1, 0x34, 0xb3, 0xbd, 0xf8, 0x46, 0xa2, 0xcf, 0x61, 0x99, - 0x7d, 0x2e, 0x0b, 0x3d, 0x3d, 0xa3, 0x01, 0xf5, 0x65, 0x59, 0x9f, 0x57, 0x06, 0xdc, 0x49, 0x25, - 0x4d, 0x7c, 0x7a, 0x58, 0xbd, 0x8b, 0x8e, 0x14, 0x70, 0x4b, 0x9e, 0x1e, 0x2a, 0x8c, 0x32, 0xca, - 0xf6, 0x37, 0xf4, 0x84, 0xcb, 0x59, 0x39, 0xc7, 0xe3, 0xb3, 0x6c, 0xbc, 0x07, 0x95, 0x94, 0x73, - 0x5e, 0x24, 0x78, 0x5e, 0x3a, 0xf8, 0xfe, 0x32, 0x0b, 0xeb, 0x2d, 0x1a, 0x70, 0x97, 0x0b, 0xea, - 0x8b, 0xcf, 0x98, 0xd7, 0xef, 0xd2, 0x3d, 0x8f, 0xb8, 0x5d, 0xf4, 0x08, 0xca, 0x72, 0x61, 0x6d, - 0x99, 0xc7, 0xe1, 0xe9, 0xf6, 0xee, 0x14, 0xfb, 0x60, 0xdf, 0xd2, 0x5e, 0x98, 0x0c, 0x71, 0x1c, - 0xf3, 0xa3, 0x87, 0x50, 0xe4, 0x3d, 0xea, 0xe8, 0x63, 0xee, 0x76, 0xee, 0x89, 0x94, 0x67, 0xe4, - 0x71, 0x8f, 0x3a, 0x49, 0x6e, 0xc8, 0x2f, 0xac, 0x88, 0xd0, 0x4f, 0x61, 0x9e, 0x0b, 0x22, 0xfa, - 0x5c, 0x1f, 0x72, 0xcd, 0x9b, 0x53, 0x2a, 0xb5, 0x24, 0x40, 0xc3, 0x6f, 0xac, 0xe9, 0x1a, 0xff, - 0x34, 0x00, 0xb5, 0x58, 0x7b, 0xbc, 0x17, 0xf8, 0xb2, 0x00, 0x8b, 0x3e, 0x6b, 0xd3, 0x63, 0xea, - 0x51, 0x47, 0xb0, 0x40, 0xd7, 0x9e, 0xfb, 0x37, 0xf0, 0xd8, 0x04, 0x99, 0x75, 0x94, 0x22, 0x0a, - 0x63, 0x37, 0x4e, 0xea, 0xf4, 0x10, 0xce, 0xcc, 0x88, 0x3e, 0x06, 0xc4, 0x69, 0x30, 0x70, 0x1d, - 0xba, 0xeb, 0x38, 0xac, 0xef, 0x8b, 0x54, 0x51, 0xd8, 0xd0, 0xfa, 0xe8, 0x78, 0x02, 0x81, 0x73, - 0xb4, 0x50, 0x1b, 0x36, 0x49, 0x5f, 0xb0, 0xae, 0x14, 0x64, 0x55, 0x4e, 0xd8, 0x05, 0xf5, 0x95, - 0x53, 0xcb, 0xf6, 0xd6, 0x68, 0x58, 0xdf, 0xdc, 0x7d, 0x0e, 0x0e, 0x3f, 0x97, 0x05, 0xbd, 0x05, - 0x65, 0xb9, 0x02, 0x65, 0x67, 0x51, 0xd9, 0xb9, 0xa2, 0xed, 0x2c, 0x1f, 0x69, 0x39, 0x8e, 0x11, - 0x88, 0x5e, 0xd5, 0x1c, 0x7c, 0x2f, 0x77, 0x6f, 0x59, 0x7b, 0xba, 0xfe, 0xc0, 0x87, 0x15, 0xb7, - 0x4b, 0x3a, 0xb4, 0xd5, 0xf7, 0xbc, 0x63, 0xea, 0x04, 0x54, 0x44, 0x55, 0x20, 0xb7, 0xb9, 0x3b, - 0x64, 0x4e, 0x14, 0xd3, 0x49, 0xe6, 0x9b, 0x7a, 0x19, 0x2b, 0x07, 0x63, 0x4c, 0x78, 0x82, 0x1b, - 0xdd, 0x87, 0x32, 0x39, 0x3b, 0x73, 0x7d, 0x57, 0x5c, 0xea, 0x1e, 0x62, 0x33, 0x6f, 0x9e, 0x5d, - 0x8d, 0xb1, 0x17, 0xa5, 0x7b, 0xa2, 0x2f, 0x1c, 0xeb, 0xa2, 0x0f, 0x60, 0x89, 0x3b, 0xe7, 0x54, - 0x06, 0x5b, 0xa0, 0x3c, 0x5a, 0x56, 0x1e, 0x5d, 0xd7, 0xa6, 0x2c, 0x1d, 0xa7, 0x07, 0x71, 0x16, - 0x8b, 0x3e, 0x85, 0x8a, 0x60, 0x9e, 0x3c, 0x20, 0x54, 0xd9, 0x0d, 0x5b, 0x85, 0x5a, 0x9e, 0x1d, - 0x27, 0x31, 0x2c, 0x29, 0xa8, 0x89, 0x8c, 0xe3, 0x34, 0x0f, 0x7a, 0x00, 0xab, 0xbd, 0xc0, 0x65, - 0xca, 0xbd, 0xf2, 0xcc, 0x57, 0x76, 0x81, 0xb2, 0x2b, 0x29, 0x0b, 0xe3, 0x00, 0x3c, 0xa9, 0x83, - 0xb6, 0xa1, 0x1c, 0x09, 0xcd, 0x8a, 0xea, 0x0a, 0x94, 0x1b, 0x22, 0x5d, 0x1c, 0x8f, 0xa2, 0x76, - 0xaa, 0xcb, 0x7d, 0x40, 0x04, 0xe5, 0xe6, 0xa2, 0x5a, 0xcc, 0x77, 0xaf, 0x08, 0x12, 0x9c, 0x06, - 0xdb, 0x6f, 0x6a, 0xab, 0xaa, 0x19, 0x31, 0xc7, 0x63, 0x9c, 0xe8, 0x47, 0xb0, 0x12, 0x84, 0x49, - 0x9b, 0xac, 0x6b, 0x29, 0x3c, 0x7e, 0xe5, 0xb6, 0xe3, 0xb1, 0x31, 0x3c, 0x81, 0x46, 0xf7, 0x01, - 0x51, 0x9f, 0x9c, 0x7a, 0x54, 0x27, 0xc6, 0xa1, 0xeb, 0x5f, 0x70, 0xb3, 0xaa, 0xf2, 0xea, 0x4d, - 0x99, 0xa9, 0xfb, 0x13, 0xa3, 0x38, 0x47, 0x63, 0xe3, 0x43, 0x58, 0x9d, 0x28, 0x17, 0x2f, 0x74, - 0x00, 0xfc, 0x15, 0x60, 0x41, 0x26, 0x8b, 0xac, 0x9a, 0xf9, 0x25, 0xa4, 0x30, 0x55, 0x09, 0xd9, - 0x84, 0x22, 0x09, 0x3a, 0xdc, 0x9c, 0xdd, 0x9a, 0xdb, 0x36, 0xc2, 0xbe, 0x79, 0x37, 0xe8, 0x70, - 0xac, 0xa4, 0xa8, 0x3f, 0x56, 0x2e, 0xe7, 0xd4, 0x26, 0x7d, 0x70, 0xa3, 0x72, 0x29, 0x4d, 0x9d, - 0xb2, 0x46, 0x66, 0xae, 0x6c, 0xc5, 0x57, 0x7a, 0x65, 0x4b, 0xe7, 0x71, 0xe9, 0x55, 0xe6, 0xf1, - 0xfc, 0xf4, 0x79, 0xbc, 0xf0, 0x8a, 0xf2, 0x38, 0xaf, 0x26, 0x96, 0x5f, 0x63, 0x4d, 0x9c, 0xfe, - 0xc6, 0x82, 0x7e, 0x05, 0x55, 0xe9, 0xc7, 0xf8, 0xd2, 0xce, 0x4d, 0x50, 0x2c, 0xb9, 0x77, 0xd2, - 0x18, 0x95, 0x24, 0xfe, 0x41, 0x46, 0x19, 0x8f, 0x91, 0xe5, 0x57, 0xb4, 0xca, 0x4b, 0x56, 0xb4, - 0xc5, 0xe7, 0x56, 0xb4, 0x9c, 0x73, 0x6f, 0xe9, 0x35, 0x9c, 0x7b, 0x13, 0x4f, 0x0e, 0xd5, 0xd7, - 0xf1, 0xe4, 0xb0, 0xfc, 0xca, 0x9f, 0x1c, 0x56, 0x5e, 0xea, 0xc9, 0xe1, 0xe5, 0xeb, 0xe7, 0x9f, - 0x67, 0x61, 0xb9, 0xc5, 0xda, 0x27, 0xb4, 0xdb, 0xf3, 0x88, 0xa0, 0xaa, 0x8e, 0xfe, 0x72, 0xa2, - 0x75, 0x7e, 0xeb, 0x45, 0x2e, 0xa1, 0x36, 0xd2, 0xa1, 0x04, 0xb9, 0xcd, 0xf2, 0x6f, 0x01, 0x1c, - 0xe6, 0x8b, 0x80, 0x79, 0x1e, 0x0d, 0x74, 0xcb, 0x3c, 0x25, 0xff, 0x5e, 0xcc, 0x83, 0x53, 0x9c, - 0xe8, 0x27, 0xba, 0x1d, 0x0f, 0x7b, 0xe7, 0xef, 0xdf, 0xb8, 0x2a, 0xe7, 0xb5, 0xe2, 0x8d, 0x7f, - 0x14, 0x60, 0x79, 0xbc, 0x5d, 0x7e, 0x08, 0x73, 0x3d, 0xd6, 0xd6, 0xbe, 0xb9, 0x33, 0x4d, 0x93, - 0x6c, 0x2f, 0xc8, 0xb4, 0x97, 0x72, 0xc9, 0x84, 0x3a, 0x60, 0x38, 0x51, 0x96, 0x6a, 0x97, 0xbc, - 0x7f, 0x3d, 0xed, 0x55, 0x4f, 0x7b, 0xfa, 0xc5, 0x22, 0x1e, 0x4d, 0xb8, 0x1b, 0x7f, 0x80, 0x8a, - 0x3e, 0x00, 0x5b, 0x2c, 0x10, 0x37, 0xb8, 0xa5, 0x6f, 0x41, 0xb1, 0xc7, 0x02, 0xa1, 0x9f, 0x42, - 0x62, 0x84, 0xd4, 0xc6, 0x6a, 0x24, 0x6a, 0x83, 0xa5, 0x44, 0x79, 0xbc, 0x94, 0x6d, 0x83, 0x15, - 0x32, 0x46, 0x34, 0xfe, 0x53, 0x8a, 0x2d, 0x50, 0xb1, 0x86, 0xa1, 0x24, 0x59, 0xa2, 0xd7, 0x8e, - 0xdb, 0xd7, 0xaf, 0x3a, 0x65, 0xbf, 0xbd, 0xa4, 0x67, 0x2a, 0xc9, 0x2f, 0x8e, 0x43, 0x2a, 0xd4, - 0x04, 0xc3, 0xf1, 0xfa, 0x5c, 0xd0, 0xe0, 0xa0, 0xa5, 0x6f, 0x10, 0xf1, 0xe1, 0xb7, 0x17, 0x0d, - 0xe0, 0x04, 0x83, 0x6c, 0x28, 0x8a, 0xcb, 0x5e, 0xf4, 0x96, 0x60, 0x45, 0x8b, 0x3c, 0xb9, 0xec, - 0xd1, 0x67, 0xc3, 0x7a, 0x6d, 0xf2, 0x7d, 0x36, 0x32, 0x42, 0x22, 0xb0, 0xd2, 0x45, 0x3b, 0x50, - 0xa1, 0x8f, 0x05, 0x0d, 0x7c, 0xe2, 0x1d, 0xb4, 0xc2, 0x87, 0x06, 0xc3, 0x5e, 0x96, 0xe7, 0xd2, - 0x7e, 0x22, 0xc6, 0x69, 0x0c, 0xba, 0x07, 0x55, 0x8f, 0x91, 0xb6, 0x4d, 0x3c, 0xe2, 0x3b, 0xca, - 0xd8, 0x92, 0x32, 0x20, 0xae, 0xe6, 0x87, 0x99, 0x51, 0x3c, 0x86, 0x46, 0x3f, 0x03, 0x33, 0x2d, - 0x09, 0x5f, 0xd2, 0x30, 0xf1, 0x3b, 0xfa, 0xe6, 0x6f, 0xd8, 0x9b, 0xa3, 0x61, 0xdd, 0x3c, 0xbc, - 0x02, 0x83, 0xaf, 0xd4, 0x46, 0x7f, 0x2c, 0xc0, 0x7a, 0x64, 0xe9, 0x49, 0x20, 0x0f, 0x77, 0xa7, - 0xc5, 0x3c, 0xd7, 0x09, 0x7b, 0x7c, 0xc3, 0x3e, 0xd1, 0x16, 0xae, 0xef, 0xe7, 0x81, 0x9e, 0x0d, - 0xeb, 0xef, 0x5e, 0xed, 0xb3, 0x5c, 0x15, 0xe5, 0xc8, 0xfc, 0x29, 0xd1, 0x27, 0xb0, 0x76, 0x4e, - 0x89, 0x27, 0xce, 0xf7, 0xce, 0xa9, 0x73, 0x11, 0xc5, 0x94, 0xba, 0x20, 0x94, 0xec, 0x6f, 0x6a, - 0x4b, 0xd6, 0x7e, 0x3c, 0x09, 0xc1, 0x79, 0x7a, 0xe8, 0x0b, 0x58, 0xe7, 0x94, 0x73, 0x97, 0xf9, - 0x51, 0xfb, 0xb2, 0xc7, 0xfc, 0x33, 0xb7, 0x63, 0x1a, 0x51, 0xb9, 0xc8, 0x7b, 0xab, 0xcd, 0x51, - 0xb0, 0x6f, 0x49, 0x0f, 0xe4, 0x0e, 0xe1, 0xfc, 0x29, 0x1a, 0x7f, 0x2f, 0xc0, 0x5a, 0x14, 0x3a, - 0xff, 0xbf, 0x8a, 0x3b, 0xf1, 0x3c, 0x71, 0xc3, 0x14, 0xbb, 0xaa, 0x26, 0xda, 0xdb, 0x4f, 0x9e, - 0xd6, 0x66, 0xbe, 0x7a, 0x5a, 0x9b, 0xf9, 0xfa, 0x69, 0x6d, 0xe6, 0xcb, 0x51, 0xad, 0xf0, 0x64, - 0x54, 0x2b, 0x7c, 0x35, 0xaa, 0x15, 0xbe, 0x1e, 0xd5, 0x0a, 0xff, 0x1a, 0xd5, 0x0a, 0x7f, 0xfa, - 0x77, 0x6d, 0xe6, 0x17, 0xb3, 0x83, 0x9d, 0xff, 0x05, 0x00, 0x00, 0xff, 0xff, 0xee, 0x5c, 0x54, - 0x1b, 0x5f, 0x19, 0x00, 0x00, + // 1943 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x58, 0x5b, 0x6f, 0x1b, 0xc7, + 0x15, 0x16, 0x25, 0x52, 0x22, 0x0f, 0x25, 0x4a, 0x1a, 0x45, 0xe9, 0x5a, 0x55, 0x49, 0x95, 0x2d, + 0x0a, 0x15, 0x8d, 0x97, 0x51, 0xe2, 0x07, 0x27, 0x41, 0x9d, 0x6a, 0x65, 0xd9, 0x55, 0x2a, 0x4b, + 0xc4, 0x50, 0x49, 0x2f, 0xe8, 0x6d, 0xb4, 0x1c, 0x51, 0x6b, 0x2d, 0x77, 0xd8, 0x9d, 0x21, 0x63, + 0xa6, 0x0f, 0xcd, 0x73, 0x9f, 0xfa, 0x0b, 0xfa, 0x0f, 0xfa, 0x27, 0x8a, 0x3e, 0x18, 0x28, 0x50, + 0xe4, 0x31, 0x2f, 0x25, 0x6a, 0xf6, 0x5f, 0xb8, 0x28, 0x50, 0xcc, 0xec, 0xec, 0x8d, 0x5c, 0x59, + 0xb2, 0x6c, 0xf7, 0x81, 0x00, 0xf7, 0x5c, 0xbe, 0x39, 0x73, 0xe6, 0xdc, 0x66, 0xe0, 0xdd, 0x8b, + 0x2e, 0x6b, 0xf7, 0x5d, 0xca, 0xcd, 0x27, 0xc3, 0x2f, 0x1a, 0xec, 0xec, 0x8c, 0x9f, 0x33, 0x26, + 0x6e, 0x93, 0x9e, 0xd3, 0x90, 0xbf, 0xc1, 0x4e, 0xa3, 0x43, 0x3d, 0xea, 0x13, 0x41, 0xdb, 0x66, + 0xcf, 0x67, 0x82, 0xa1, 0xad, 0xa4, 0x86, 0x19, 0x6a, 0xfc, 0x86, 0xf4, 0x1c, 0x53, 0xfe, 0x06, + 0x3b, 0x1b, 0xb7, 0x3b, 0x8e, 0x38, 0xef, 0x9f, 0x9a, 0x36, 0xeb, 0x36, 0x3a, 0xac, 0xc3, 0x1a, + 0x4a, 0xf1, 0xb4, 0x7f, 0xa6, 0xbe, 0xd4, 0x87, 0xfa, 0x17, 0x00, 0x6e, 0xd4, 0x2f, 0xee, 0x72, + 0xd3, 0x61, 0x6a, 0x3d, 0x9b, 0xf9, 0x34, 0x63, 0xd1, 0x8d, 0x3b, 0xb1, 0x4c, 0x97, 0xd8, 0xe7, + 0x8e, 0x47, 0xfd, 0x61, 0xa3, 0x77, 0xd1, 0x91, 0x04, 0xde, 0xe8, 0x52, 0x41, 0x32, 0xb4, 0xea, + 0xff, 0x2d, 0x80, 0xb1, 0xc7, 0x3c, 0x41, 0xa4, 0x3c, 0xee, 0x7b, 0xc2, 0xe9, 0xd2, 0x16, 0x15, + 0xc2, 0xf1, 0x3a, 0x1c, 0xfd, 0x1c, 0x4a, 0x3e, 0xe5, 0xac, 0xef, 0xdb, 0x94, 0x1b, 0xb9, 0xad, + 0xdc, 0x76, 0xf9, 0xbd, 0x6d, 0x33, 0x58, 0x46, 0x6d, 0x44, 0x9a, 0x62, 0x0e, 0x76, 0x4c, 0xac, + 0x85, 0x30, 0xfd, 0x5d, 0xdf, 0xf1, 0x69, 0x97, 0x7a, 0x82, 0x5b, 0xab, 0x4f, 0x47, 0xb5, 0x99, + 0xf1, 0xa8, 0x56, 0x0a, 0xb9, 0x1c, 0xc7, 0x68, 0x08, 0xc3, 0x92, 0xeb, 0x0c, 0xa8, 0x47, 0x39, + 0x6f, 0xfa, 0xec, 0x94, 0x1a, 0xb3, 0x0a, 0xfe, 0x56, 0x16, 0xbc, 0x12, 0xb0, 0x56, 0xc7, 0xa3, + 0xda, 0xd2, 0x61, 0x52, 0x07, 0xa7, 0x21, 0xd0, 0xa7, 0x50, 0xf1, 0x29, 0x69, 0x3b, 0x31, 0xe8, + 0xdc, 0x55, 0xa0, 0x68, 0x3c, 0xaa, 0x55, 0x70, 0x4a, 0x09, 0x4f, 0x80, 0xa0, 0x4f, 0xa0, 0xe4, + 0x3a, 0x67, 0xd4, 0x1e, 0xda, 0x2e, 0x35, 0xf2, 0x0a, 0xf1, 0x5b, 0x59, 0x88, 0x87, 0xa1, 0x90, + 0xb5, 0x24, 0xb7, 0x1d, 0x7d, 0xe2, 0x58, 0x1d, 0x9d, 0xc2, 0x32, 0xa7, 0x76, 0xdf, 0x77, 0xc4, + 0x50, 0x7a, 0x9d, 0x3e, 0x11, 0x46, 0x41, 0x21, 0x7e, 0x27, 0x0b, 0xb1, 0x95, 0x16, 0xb5, 0xd6, + 0xc6, 0xa3, 0xda, 0xf2, 0x04, 0x11, 0x4f, 0x02, 0xa2, 0x43, 0xc8, 0x7b, 0x8e, 0x4d, 0x8d, 0x79, + 0x05, 0x6c, 0x9a, 0x57, 0x05, 0xa3, 0x79, 0xe4, 0xd8, 0xd1, 0x99, 0x5b, 0xc5, 0xf1, 0xa8, 0x96, + 0x97, 0x14, 0xac, 0x50, 0xd0, 0x09, 0xcc, 0x3b, 0x4c, 0xe1, 0x2d, 0x28, 0xbc, 0x77, 0xaf, 0xc6, + 0x3b, 0x38, 0x4e, 0x21, 0xc2, 0x78, 0x54, 0x9b, 0x0f, 0x68, 0x58, 0x63, 0xa1, 0x43, 0x58, 0xa0, + 0xde, 0xe0, 0x81, 0xcf, 0xba, 0x46, 0x71, 0x6b, 0x6e, 0xbb, 0xfc, 0xde, 0xb7, 0xb3, 0xf6, 0xbf, + 0x1f, 0x88, 0xb4, 0x54, 0xcc, 0x58, 0xcb, 0x3a, 0xa0, 0x16, 0x34, 0x19, 0x87, 0x10, 0xe8, 0x03, + 0x98, 0xa3, 0xde, 0xc0, 0x28, 0x29, 0xa4, 0x8d, 0x4b, 0x90, 0x3e, 0x23, 0xbe, 0x55, 0xd6, 0x10, + 0x73, 0xfb, 0xde, 0x00, 0x4b, 0x9d, 0xfa, 0xaf, 0xa1, 0x92, 0x36, 0x17, 0xd5, 0xa0, 0x60, 0xbb, + 0x84, 0x07, 0x01, 0x5f, 0xb0, 0x4a, 0xe3, 0x51, 0xad, 0xb0, 0x27, 0x09, 0x38, 0xa0, 0xa3, 0x1f, + 0x40, 0x49, 0xfd, 0xb9, 0x4f, 0x04, 0x51, 0x61, 0x5b, 0x08, 0x0e, 0x7c, 0x2f, 0x24, 0xe2, 0x98, + 0x5f, 0xbf, 0x07, 0x8b, 0x29, 0x74, 0x13, 0x80, 0xb4, 0x1f, 0xf7, 0xb9, 0x90, 0x49, 0xa2, 0x97, + 0xa8, 0x8c, 0x47, 0x35, 0xd8, 0x8d, 0xa8, 0x38, 0x21, 0x51, 0xff, 0x6b, 0x0e, 0xe0, 0xf8, 0xf4, + 0x31, 0xb5, 0xc5, 0x23, 0x2a, 0x08, 0x12, 0x50, 0x26, 0x9e, 0xc7, 0x04, 0x11, 0x0e, 0xf3, 0xa4, + 0x89, 0x72, 0xc7, 0x3f, 0xbc, 0xfa, 0x48, 0x62, 0x08, 0x73, 0x37, 0xd6, 0xdf, 0xf7, 0x84, 0x3f, + 0xb4, 0xd6, 0xb4, 0x53, 0xca, 0x09, 0x0e, 0x4e, 0x2e, 0xb3, 0x71, 0x0f, 0x56, 0x26, 0xb5, 0xd0, + 0x0a, 0xcc, 0x5d, 0xd0, 0xa1, 0xda, 0x41, 0x09, 0xcb, 0xbf, 0xe8, 0x2d, 0x28, 0x0c, 0x88, 0xdb, + 0x0f, 0x52, 0xb9, 0x84, 0x83, 0x8f, 0x0f, 0x67, 0xef, 0xe6, 0xea, 0xcf, 0xf3, 0xb0, 0xda, 0x24, + 0xbe, 0x70, 0x88, 0x9b, 0xd8, 0xcb, 0x16, 0xe4, 0x3d, 0xd2, 0xa5, 0x01, 0x84, 0xb5, 0xa8, 0xad, + 0xc8, 0x1f, 0x91, 0xae, 0x8c, 0x3d, 0xd2, 0xa5, 0xe8, 0x2e, 0x2c, 0x86, 0xf5, 0x4a, 0x52, 0x03, + 0x60, 0xeb, 0x2d, 0x2d, 0xb9, 0xf8, 0x30, 0xc1, 0xc3, 0x29, 0x49, 0xd4, 0x80, 0x92, 0x44, 0xe0, + 0x3d, 0x62, 0x07, 0x55, 0xa0, 0x14, 0xd7, 0xa3, 0xa3, 0x90, 0x81, 0x63, 0x19, 0xd4, 0x81, 0x79, + 0x97, 0x9c, 0x52, 0x97, 0x1b, 0x79, 0xe5, 0xd3, 0x8f, 0xaf, 0xf6, 0xe9, 0xd4, 0x8e, 0xcc, 0x43, + 0x85, 0x10, 0x78, 0xb5, 0xa2, 0x97, 0x9b, 0x0f, 0x88, 0x58, 0xc3, 0xa3, 0xdf, 0xa7, 0x4f, 0xb0, + 0xa0, 0x56, 0xbb, 0x7f, 0x93, 0xd5, 0x5e, 0xfe, 0x20, 0xd1, 0xe7, 0xb0, 0xcc, 0x3e, 0x97, 0x85, + 0x9e, 0x9e, 0x51, 0x9f, 0x7a, 0xb2, 0xac, 0xcf, 0x2b, 0x03, 0xee, 0x24, 0x92, 0x26, 0xea, 0x1e, + 0x66, 0xef, 0xa2, 0x23, 0x09, 0xdc, 0x94, 0xdd, 0x43, 0x85, 0x51, 0x4a, 0xd9, 0xfa, 0x86, 0x5e, + 0x70, 0x39, 0x4d, 0xe7, 0x78, 0x72, 0x95, 0x8d, 0x0f, 0xa0, 0x9c, 0x70, 0xce, 0xcb, 0x04, 0xcf, + 0x2b, 0x07, 0xdf, 0x5f, 0x66, 0x61, 0xbd, 0x49, 0x7d, 0xee, 0x70, 0x41, 0x3d, 0xf1, 0x19, 0x73, + 0xfb, 0x5d, 0xba, 0xe7, 0x12, 0xa7, 0x8b, 0x1e, 0x43, 0x51, 0x6e, 0xac, 0x2d, 0xf3, 0x38, 0xe8, + 0x6e, 0xef, 0xdf, 0xe0, 0x1c, 0xac, 0x5b, 0xda, 0x0b, 0xd3, 0x21, 0x8e, 0x23, 0x7c, 0x74, 0x0c, + 0x79, 0xde, 0xa3, 0xb6, 0x6e, 0x73, 0xb7, 0x33, 0x3b, 0x52, 0x96, 0x91, 0xad, 0x1e, 0xb5, 0xe3, + 0xdc, 0x90, 0x5f, 0x58, 0x01, 0xa1, 0x9f, 0xc2, 0x3c, 0x17, 0x44, 0xf4, 0xb9, 0x6e, 0x72, 0x8d, + 0xeb, 0x43, 0x2a, 0xb5, 0x38, 0x40, 0x83, 0x6f, 0xac, 0xe1, 0xea, 0xff, 0x28, 0x01, 0x6a, 0xb2, + 0xf6, 0xe4, 0x2c, 0xf0, 0x65, 0x0e, 0x16, 0x3d, 0xd6, 0xa6, 0x2d, 0xea, 0x52, 0x5b, 0x30, 0x5f, + 0xd7, 0x9e, 0x07, 0xd7, 0xf0, 0xd8, 0x14, 0x98, 0x79, 0x94, 0x00, 0x0a, 0x62, 0x37, 0x4a, 0xea, + 0x24, 0x0b, 0xa7, 0x56, 0x44, 0x9f, 0x00, 0xe2, 0xd4, 0x1f, 0x38, 0x36, 0xdd, 0xb5, 0x6d, 0xd6, + 0xf7, 0x44, 0xa2, 0x28, 0x6c, 0x68, 0x7d, 0xd4, 0x9a, 0x92, 0xc0, 0x19, 0x5a, 0xa8, 0x0d, 0x9b, + 0xa4, 0x2f, 0x58, 0x57, 0x12, 0xd2, 0x2a, 0x27, 0xec, 0x82, 0x7a, 0xca, 0xa9, 0x45, 0x6b, 0x6b, + 0x3c, 0xaa, 0x6d, 0xee, 0xbe, 0x40, 0x0e, 0xbf, 0x10, 0x05, 0xbd, 0x03, 0x45, 0xb9, 0x03, 0x65, + 0x67, 0x5e, 0xd9, 0xb9, 0xa2, 0xed, 0x2c, 0x1e, 0x69, 0x3a, 0x8e, 0x24, 0x10, 0xbd, 0x6c, 0x38, + 0xf8, 0x5e, 0xe6, 0xd9, 0xb2, 0xf6, 0xcd, 0xe6, 0x03, 0x0f, 0x56, 0x9c, 0x2e, 0xe9, 0xd0, 0x66, + 0xdf, 0x75, 0x5b, 0xd4, 0xf6, 0xa9, 0x08, 0xab, 0x40, 0xe6, 0x70, 0x77, 0xc8, 0xec, 0x30, 0xa6, + 0xe3, 0xcc, 0x37, 0xf4, 0x36, 0x56, 0x0e, 0x26, 0x90, 0xf0, 0x14, 0x36, 0x7a, 0x00, 0x45, 0x72, + 0x76, 0xe6, 0x78, 0x8e, 0x18, 0xea, 0x19, 0x62, 0x33, 0x6b, 0x9d, 0x5d, 0x2d, 0x63, 0x2d, 0x4a, + 0xf7, 0x84, 0x5f, 0x38, 0xd2, 0x45, 0x1f, 0xc1, 0x12, 0xb7, 0xcf, 0xa9, 0x0c, 0x36, 0x5f, 0x79, + 0xb4, 0xa8, 0x3c, 0xba, 0xae, 0x4d, 0x59, 0x6a, 0x25, 0x99, 0x38, 0x2d, 0x8b, 0x3e, 0x85, 0xb2, + 0x60, 0xae, 0x6c, 0x10, 0xaa, 0xec, 0x06, 0xa3, 0x42, 0x35, 0xcb, 0x8e, 0x93, 0x48, 0x2c, 0x2e, + 0xa8, 0x31, 0x8d, 0xe3, 0x24, 0x0e, 0x7a, 0x08, 0xab, 0x3d, 0xdf, 0x61, 0xca, 0xbd, 0xb2, 0xe7, + 0x2b, 0xbb, 0x40, 0xd9, 0x15, 0x97, 0x85, 0x49, 0x01, 0x3c, 0xad, 0x83, 0xb6, 0xa1, 0x18, 0x12, + 0x8d, 0xb2, 0x9a, 0x0a, 0x94, 0x1b, 0x42, 0x5d, 0x1c, 0x71, 0x51, 0x3b, 0x31, 0xe5, 0x3e, 0x24, + 0x82, 0x72, 0x63, 0x51, 0x6d, 0xe6, 0xbb, 0x97, 0x04, 0x09, 0x4e, 0x0a, 0x5b, 0x6f, 0x6b, 0xab, + 0x2a, 0x29, 0x32, 0xc7, 0x13, 0x98, 0xe8, 0x47, 0xb0, 0xe2, 0x07, 0x49, 0x1b, 0xef, 0x6b, 0x29, + 0x68, 0xbf, 0xf2, 0xd8, 0xf1, 0x04, 0x0f, 0x4f, 0x49, 0xa3, 0x07, 0x80, 0xa8, 0x47, 0x4e, 0x5d, + 0xaa, 0x13, 0xe3, 0xd0, 0xf1, 0x2e, 0xb8, 0x51, 0x51, 0x79, 0xf5, 0xb6, 0xcc, 0xd4, 0xfd, 0x29, + 0x2e, 0xce, 0xd0, 0xd8, 0xf8, 0x18, 0x56, 0xa7, 0xca, 0xc5, 0x4b, 0x35, 0x80, 0x7f, 0x96, 0x61, + 0x41, 0x26, 0x8b, 0xac, 0x9a, 0xd9, 0x25, 0x24, 0x77, 0xa3, 0x12, 0xb2, 0x09, 0x79, 0xe2, 0x77, + 0xb8, 0x31, 0xbb, 0x35, 0xb7, 0x5d, 0x0a, 0xe6, 0xe6, 0x5d, 0xbf, 0xc3, 0xb1, 0xa2, 0xa2, 0xfe, + 0x44, 0xb9, 0x9c, 0x53, 0x87, 0xf4, 0xd1, 0xb5, 0xca, 0xa5, 0x34, 0xf5, 0x86, 0x35, 0x32, 0x75, + 0x65, 0xcb, 0xbf, 0xd6, 0x2b, 0x5b, 0x32, 0x8f, 0x0b, 0xaf, 0x33, 0x8f, 0xe7, 0x6f, 0x9e, 0xc7, + 0x0b, 0xaf, 0x29, 0x8f, 0xb3, 0x6a, 0x62, 0xf1, 0x0d, 0xd6, 0xc4, 0x9b, 0xdf, 0x58, 0xd0, 0xaf, + 0xa0, 0x22, 0xfd, 0x18, 0x5d, 0xda, 0xb9, 0x01, 0x0a, 0x25, 0xf3, 0x4e, 0x1a, 0x49, 0xc5, 0x89, + 0x7f, 0x90, 0x52, 0xc6, 0x13, 0x60, 0xd9, 0x15, 0xad, 0xfc, 0x8a, 0x15, 0x6d, 0xf1, 0x85, 0x15, + 0x2d, 0xa3, 0xef, 0x2d, 0xbd, 0x81, 0xbe, 0x37, 0xf5, 0xe4, 0x50, 0x79, 0x13, 0x4f, 0x0e, 0xcb, + 0xaf, 0xfd, 0xc9, 0x61, 0xe5, 0xd5, 0x9e, 0x1c, 0x8e, 0xa1, 0xd4, 0xf6, 0x78, 0x93, 0xb9, 0x8e, + 0x3d, 0x34, 0x56, 0xd5, 0x41, 0xee, 0x84, 0x79, 0x7e, 0xff, 0xa8, 0x15, 0x30, 0x9e, 0x8f, 0x6a, + 0x9b, 0xd3, 0x6f, 0x4c, 0x66, 0xc4, 0xc7, 0x31, 0x06, 0x7a, 0xa4, 0x00, 0xf7, 0x98, 0x77, 0xe6, + 0x74, 0x0c, 0xa4, 0x8c, 0xdb, 0xba, 0xe4, 0xa0, 0xee, 0x1f, 0xb5, 0x02, 0xb9, 0xc0, 0xbe, 0xe8, + 0x13, 0xc7, 0x08, 0xaf, 0x5e, 0xdf, 0xff, 0x3c, 0x0b, 0xcb, 0x4d, 0xd6, 0x3e, 0xa1, 0xdd, 0x9e, + 0x4b, 0x04, 0x55, 0x75, 0xfe, 0x97, 0x53, 0xa3, 0xfd, 0x3b, 0x2f, 0x73, 0x49, 0xb6, 0x90, 0xf6, + 0x10, 0x64, 0x0e, 0xf3, 0xbf, 0x05, 0xb0, 0x99, 0x27, 0x7c, 0xe6, 0xba, 0xd4, 0xd7, 0x23, 0xfd, + 0x0d, 0xf1, 0xf7, 0x22, 0x1c, 0x9c, 0xc0, 0x44, 0x3f, 0xd1, 0xd7, 0x85, 0x60, 0xb6, 0xff, 0xfe, + 0xb5, 0xbb, 0x46, 0xd6, 0x55, 0xa1, 0xfe, 0xf7, 0x1c, 0x2c, 0x4f, 0x8e, 0xf3, 0xc7, 0x30, 0xd7, + 0x63, 0x6d, 0xed, 0x9b, 0x3b, 0x37, 0x19, 0xe2, 0xad, 0x05, 0x59, 0x96, 0x24, 0x5d, 0x22, 0xa1, + 0x0e, 0x94, 0xec, 0xb0, 0x8a, 0x68, 0x97, 0x7c, 0x78, 0x35, 0xec, 0x65, 0x4f, 0x8f, 0xfa, 0x45, + 0x25, 0xe2, 0xc6, 0xd8, 0xf5, 0x3f, 0x40, 0x59, 0x37, 0xe8, 0x26, 0xf3, 0xc5, 0x35, 0x5e, 0x11, + 0xb6, 0x20, 0xdf, 0x63, 0xbe, 0xd0, 0x4f, 0x35, 0x91, 0x84, 0xd4, 0xc6, 0x8a, 0x13, 0x8e, 0xe9, + 0x92, 0xa2, 0x3c, 0x5e, 0x48, 0x8f, 0xe9, 0x4a, 0x32, 0x92, 0xa8, 0xff, 0xa7, 0x10, 0x59, 0xa0, + 0x62, 0x0d, 0x43, 0x41, 0xa2, 0x84, 0xaf, 0x31, 0xb7, 0xaf, 0xde, 0x75, 0xc2, 0x7e, 0x6b, 0x49, + 0xaf, 0x54, 0x90, 0x5f, 0x1c, 0x07, 0x50, 0xa8, 0x01, 0x25, 0xdb, 0xed, 0x73, 0x41, 0xfd, 0x83, + 0xa6, 0xbe, 0xe1, 0x44, 0xcd, 0x79, 0x2f, 0x64, 0xe0, 0x58, 0x06, 0x59, 0x90, 0x17, 0xc3, 0x5e, + 0xf8, 0xd6, 0x61, 0x86, 0x9b, 0x3c, 0x19, 0xf6, 0xe8, 0xf3, 0x51, 0xad, 0x9a, 0x91, 0xdb, 0xda, + 0x08, 0x29, 0x81, 0x95, 0x2e, 0xda, 0x81, 0x32, 0x7d, 0x22, 0xa8, 0xef, 0x11, 0xf7, 0xa0, 0x19, + 0x3c, 0x84, 0x94, 0xac, 0x65, 0xd9, 0x37, 0xf7, 0x63, 0x32, 0x4e, 0xca, 0xa0, 0x7b, 0x50, 0x71, + 0x19, 0x69, 0x5b, 0xc4, 0x25, 0x9e, 0xad, 0x8c, 0x2d, 0x28, 0x03, 0xa2, 0x6e, 0x73, 0x98, 0xe2, + 0xe2, 0x09, 0x69, 0xf4, 0x33, 0x30, 0x92, 0x94, 0xe0, 0xa5, 0x0f, 0x13, 0xaf, 0xa3, 0x5f, 0x26, + 0x4a, 0xd6, 0xe6, 0x78, 0x54, 0x33, 0x0e, 0x2f, 0x91, 0xc1, 0x97, 0x6a, 0xa3, 0x3f, 0xe6, 0x60, + 0x3d, 0xb4, 0xf4, 0xc4, 0x97, 0xc3, 0x87, 0xad, 0x6b, 0xe0, 0x82, 0xb2, 0xf0, 0x44, 0x5b, 0xb8, + 0xbe, 0x9f, 0x25, 0xf4, 0x7c, 0x54, 0x7b, 0xff, 0x72, 0x9f, 0x65, 0xaa, 0x28, 0x47, 0x66, 0x2f, + 0x89, 0x1e, 0xc1, 0xda, 0x39, 0x25, 0xae, 0x38, 0xdf, 0x3b, 0xa7, 0xf6, 0x45, 0x18, 0x53, 0xea, + 0x02, 0x53, 0xb0, 0xbe, 0xa9, 0x2d, 0x59, 0xfb, 0xf1, 0xb4, 0x08, 0xce, 0xd2, 0x43, 0x5f, 0xc0, + 0x3a, 0xa7, 0x9c, 0x3b, 0xcc, 0x0b, 0xc7, 0x2b, 0x5d, 0x8d, 0x4b, 0x61, 0xb9, 0xc8, 0x7a, 0x4b, + 0xce, 0x50, 0xb0, 0x6e, 0x49, 0x0f, 0x64, 0xb2, 0x70, 0xf6, 0x12, 0xf5, 0xbf, 0xe5, 0x60, 0x2d, + 0x0c, 0x9d, 0xff, 0x5f, 0xc5, 0x9d, 0x7a, 0x3e, 0xb9, 0x66, 0x8a, 0x5d, 0x56, 0x13, 0xad, 0xed, + 0xa7, 0xcf, 0xaa, 0x33, 0x5f, 0x3d, 0xab, 0xce, 0x7c, 0xfd, 0xac, 0x3a, 0xf3, 0xe5, 0xb8, 0x9a, + 0x7b, 0x3a, 0xae, 0xe6, 0xbe, 0x1a, 0x57, 0x73, 0x5f, 0x8f, 0xab, 0xb9, 0x7f, 0x8d, 0xab, 0xb9, + 0x3f, 0xfd, 0xbb, 0x3a, 0xf3, 0x8b, 0xd9, 0xc1, 0xce, 0xff, 0x02, 0x00, 0x00, 0xff, 0xff, 0x7d, + 0x57, 0x6e, 0xf5, 0xff, 0x19, 0x00, 0x00, } func (m *ContainerRuntimeSettings) Marshal() (dAtA []byte, err error) { @@ -1136,6 +1139,27 @@ func (m *PodSpec) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + if m.DNSConfig != nil { + { + size, err := m.DNSConfig.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintGenerated(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0x92 + } + i -= len(m.DNSPolicy) + copy(dAtA[i:], m.DNSPolicy) + i = encodeVarintGenerated(dAtA, i, uint64(len(m.DNSPolicy))) + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0x8a if m.Lifecycle != nil { { size, err := m.Lifecycle.MarshalToSizedBuffer(dAtA[:i]) @@ -1880,6 +1904,12 @@ func (m *PodSpec) Size() (n int) { l = m.Lifecycle.Size() n += 2 + l + sovGenerated(uint64(l)) } + l = len(m.DNSPolicy) + n += 2 + l + sovGenerated(uint64(l)) + if m.DNSConfig != nil { + l = m.DNSConfig.Size() + n += 2 + l + sovGenerated(uint64(l)) + } return n } @@ -2207,6 +2237,8 @@ func (this *PodSpec) String() string { `LivenessProbe:` + strings.Replace(fmt.Sprintf("%v", this.LivenessProbe), "Probe", "v1.Probe", 1) + `,`, `ReadinessProbe:` + strings.Replace(fmt.Sprintf("%v", this.ReadinessProbe), "Probe", "v1.Probe", 1) + `,`, `Lifecycle:` + strings.Replace(fmt.Sprintf("%v", this.Lifecycle), "Lifecycle", "v1.Lifecycle", 1) + `,`, + `DNSPolicy:` + fmt.Sprintf("%v", this.DNSPolicy) + `,`, + `DNSConfig:` + strings.Replace(fmt.Sprintf("%v", this.DNSConfig), "PodDNSConfig", "v1.PodDNSConfig", 1) + `,`, `}`, }, "") return s @@ -4823,6 +4855,74 @@ func (m *PodSpec) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex + case 17: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field DNSPolicy", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowGenerated + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthGenerated + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthGenerated + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.DNSPolicy = k8s_io_api_core_v1.DNSPolicy(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 18: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field DNSConfig", 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 < 0 { + return ErrInvalidLengthGenerated + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.DNSConfig == nil { + m.DNSConfig = &v1.PodDNSConfig{} + } + if err := m.DNSConfig.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipGenerated(dAtA[iNdEx:]) diff --git a/vendor/kmodules.xyz/offshoot-api/api/v1/generated.proto b/vendor/kmodules.xyz/offshoot-api/api/v1/generated.proto index 9e476b804..05de37f06 100644 --- a/vendor/kmodules.xyz/offshoot-api/api/v1/generated.proto +++ b/vendor/kmodules.xyz/offshoot-api/api/v1/generated.proto @@ -393,6 +393,21 @@ message PodSpec { // Cannot be updated. // +optional optional k8s.io.api.core.v1.Lifecycle lifecycle = 16; + + // Set DNS policy for the pod. + // Defaults to "ClusterFirst". + // Valid values are 'ClusterFirstWithHostNet', 'ClusterFirst', 'Default' or 'None'. + // DNS parameters given in DNSConfig will be merged with the policy selected with DNSPolicy. + // To have DNS options set along with hostNetwork, you have to specify DNS policy + // explicitly to 'ClusterFirstWithHostNet'. + // +optional + optional string dnsPolicy = 17; + + // Specifies the DNS parameters of a pod. + // Parameters specified here will be merged to the generated DNS + // configuration based on DNSPolicy. + // +optional + optional k8s.io.api.core.v1.PodDNSConfig dnsConfig = 18; } // PodTemplateSpec describes the data a pod should have when created from a template diff --git a/vendor/kmodules.xyz/offshoot-api/api/v1/openapi_generated.go b/vendor/kmodules.xyz/offshoot-api/api/v1/openapi_generated.go index a66f93db3..4244f3804 100644 --- a/vendor/kmodules.xyz/offshoot-api/api/v1/openapi_generated.go +++ b/vendor/kmodules.xyz/offshoot-api/api/v1/openapi_generated.go @@ -630,11 +630,24 @@ func schema_kmodulesxyz_offshoot_api_api_v1_PodSpec(ref common.ReferenceCallback Ref: ref("k8s.io/api/core/v1.Lifecycle"), }, }, + "dnsPolicy": { + SchemaProps: spec.SchemaProps{ + Description: "Set DNS policy for the pod. Defaults to \"ClusterFirst\". Valid values are 'ClusterFirstWithHostNet', 'ClusterFirst', 'Default' or 'None'. DNS parameters given in DNSConfig will be merged with the policy selected with DNSPolicy. To have DNS options set along with hostNetwork, you have to specify DNS policy explicitly to 'ClusterFirstWithHostNet'.", + Type: []string{"string"}, + Format: "", + }, + }, + "dnsConfig": { + SchemaProps: spec.SchemaProps{ + Description: "Specifies the DNS parameters of a pod. Parameters specified here will be merged to the generated DNS configuration based on DNSPolicy.", + Ref: ref("k8s.io/api/core/v1.PodDNSConfig"), + }, + }, }, }, }, Dependencies: []string{ - "k8s.io/api/core/v1.Affinity", "k8s.io/api/core/v1.Container", "k8s.io/api/core/v1.EnvVar", "k8s.io/api/core/v1.Lifecycle", "k8s.io/api/core/v1.LocalObjectReference", "k8s.io/api/core/v1.PodSecurityContext", "k8s.io/api/core/v1.Probe", "k8s.io/api/core/v1.ResourceRequirements", "k8s.io/api/core/v1.Toleration"}, + "k8s.io/api/core/v1.Affinity", "k8s.io/api/core/v1.Container", "k8s.io/api/core/v1.EnvVar", "k8s.io/api/core/v1.Lifecycle", "k8s.io/api/core/v1.LocalObjectReference", "k8s.io/api/core/v1.PodDNSConfig", "k8s.io/api/core/v1.PodSecurityContext", "k8s.io/api/core/v1.Probe", "k8s.io/api/core/v1.ResourceRequirements", "k8s.io/api/core/v1.Toleration"}, } } diff --git a/vendor/kmodules.xyz/offshoot-api/api/v1/types.go b/vendor/kmodules.xyz/offshoot-api/api/v1/types.go index e477edf4e..3b2537b93 100644 --- a/vendor/kmodules.xyz/offshoot-api/api/v1/types.go +++ b/vendor/kmodules.xyz/offshoot-api/api/v1/types.go @@ -158,6 +158,21 @@ type PodSpec struct { // Cannot be updated. // +optional Lifecycle *core.Lifecycle `json:"lifecycle,omitempty" protobuf:"bytes,16,opt,name=lifecycle"` + + // Set DNS policy for the pod. + // Defaults to "ClusterFirst". + // Valid values are 'ClusterFirstWithHostNet', 'ClusterFirst', 'Default' or 'None'. + // DNS parameters given in DNSConfig will be merged with the policy selected with DNSPolicy. + // To have DNS options set along with hostNetwork, you have to specify DNS policy + // explicitly to 'ClusterFirstWithHostNet'. + // +optional + DNSPolicy core.DNSPolicy `json:"dnsPolicy,omitempty" protobuf:"bytes,17,opt,name=dnsPolicy,casttype=k8s.io/api/core/v1.DNSPolicy"` + + // Specifies the DNS parameters of a pod. + // Parameters specified here will be merged to the generated DNS + // configuration based on DNSPolicy. + // +optional + DNSConfig *core.PodDNSConfig `json:"dnsConfig,omitempty" protobuf:"bytes,18,opt,name=dnsConfig"` } // ServiceTemplateSpec describes the data a service should have when created from a template @@ -276,7 +291,9 @@ type ServicePort struct { NodePort int32 `json:"nodePort,omitempty" protobuf:"varint,3,opt,name=nodePort"` } -func MergeServicePorts(cur []core.ServicePort, desired []ServicePort) []core.ServicePort { +// Beware of MergeServicePorts +// ref: https://github.com/kmodules/client-go/blob/03dac1aea5084354127990a10d0b0e7529460dd5/core/v1/service.go#L103-L136 +func PatchServicePorts(cur []core.ServicePort, desired []ServicePort) []core.ServicePort { if len(desired) == 0 { return cur } diff --git a/vendor/kmodules.xyz/offshoot-api/api/v1/zz_generated.deepcopy.go b/vendor/kmodules.xyz/offshoot-api/api/v1/zz_generated.deepcopy.go index fdd32a4cd..93c9b89a8 100644 --- a/vendor/kmodules.xyz/offshoot-api/api/v1/zz_generated.deepcopy.go +++ b/vendor/kmodules.xyz/offshoot-api/api/v1/zz_generated.deepcopy.go @@ -364,6 +364,11 @@ func (in *PodSpec) DeepCopyInto(out *PodSpec) { *out = new(corev1.Lifecycle) (*in).DeepCopyInto(*out) } + if in.DNSConfig != nil { + in, out := &in.DNSConfig, &out.DNSConfig + *out = new(corev1.PodDNSConfig) + (*in).DeepCopyInto(*out) + } return } diff --git a/vendor/modules.txt b/vendor/modules.txt index 790920b19..82ffe55f3 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -843,7 +843,7 @@ k8s.io/utils/net k8s.io/utils/path k8s.io/utils/pointer k8s.io/utils/trace -# kmodules.xyz/client-go v0.0.0-20201021051118-03dac1aea508 +# kmodules.xyz/client-go v0.0.0-20201027113349-01a6d453d836 kmodules.xyz/client-go kmodules.xyz/client-go/api/v1 kmodules.xyz/client-go/apiextensions @@ -869,7 +869,7 @@ kmodules.xyz/custom-resources/client/clientset/versioned/typed/appcatalog/v1alph kmodules.xyz/custom-resources/crds # kmodules.xyz/objectstore-api v0.0.0-20200922210707-59bab27e5d41 kmodules.xyz/objectstore-api/api/v1 -# kmodules.xyz/offshoot-api v0.0.0-20200922211229-36acc531abab +# kmodules.xyz/offshoot-api v0.0.0-20201027212804-f5e6dc573558 kmodules.xyz/offshoot-api/api/v1 # kmodules.xyz/prober v0.0.0-20200922212142-743a6514664e kmodules.xyz/prober/api/v1