From db5f0b97c5dc80074e393dc666d83f7289fca4be Mon Sep 17 00:00:00 2001 From: John Howard Date: Wed, 26 Feb 2020 16:43:23 -0800 Subject: [PATCH] Fix type aliases --- api/v1alpha1/gateway_types.go | 80 +++++----- api/v1alpha1/gatewayclass_types.go | 2 + api/v1alpha1/generated.pb.go | 246 ++++++++++++++--------------- api/v1alpha1/generated.proto | 15 +- api/v1alpha1/httproute_types.go | 5 + kubebuilder.mk | 1 + 6 files changed, 184 insertions(+), 165 deletions(-) diff --git a/api/v1alpha1/gateway_types.go b/api/v1alpha1/gateway_types.go index f6c2f378f6..1b2474af55 100644 --- a/api/v1alpha1/gateway_types.go +++ b/api/v1alpha1/gateway_types.go @@ -24,20 +24,20 @@ import ( // Gateway represents an instantiation of a service-traffic handling infrastructure. type Gateway struct { - metav1.TypeMeta `json:",inline"` - metav1.ObjectMeta `json:"metadata,omitempty"` + metav1.TypeMeta `json:",inline" protobuf:"bytes,1,opt,name=typeMeta"` + metav1.ObjectMeta `json:"metadata,omitempty" protobuf:"bytes,2,opt,name=metadata"` - Spec GatewaySpec `json:"spec,omitempty"` - Status GatewayStatus `json:"status,omitempty"` + Spec GatewaySpec `json:"spec,omitempty" protobuf:"bytes,3,opt,name=spec"` + Status GatewayStatus `json:"status,omitempty" protobuf:"bytes,4,opt,name=status"` } // +kubebuilder:object:root=true // GatewayList contains a list of Gateway type GatewayList struct { - metav1.TypeMeta `json:",inline"` - metav1.ListMeta `json:"metadata,omitempty"` - Items []Gateway `json:"items"` + metav1.TypeMeta `json:",inline" protobuf:"bytes,1,opt,name=typeMeta"` + metav1.ListMeta `json:"metadata,omitempty" protobuf:"bytes,2,opt,name=metadata"` + Items []Gateway `json:"items" protobuf:"bytes,3,rep,name=items"` } // GatewaySpec defines the desired state of Gateway. @@ -52,10 +52,10 @@ type GatewayList struct { // signaling via the GatewayStatus block. type GatewaySpec struct { // Class used for this Gateway. This is the name of a GatewayClass resource. - Class string `json:"class"` + Class string `json:"class" protobuf:"bytes,1,opt,name=class"` // Listeners associated with this Gateway. Listeners define what addresses, // ports, protocols are bound on this Gateway. - Listeners []Listener `json:"listeners"` + Listeners []Listener `json:"listeners" protobuf:"bytes,2,rep,name=listeners"` // Routes is a list of resources to associate with the Gateway. A route is a // resource capable of servicing a request and allows a cluster operator to // expose a cluster resource (i.e. Service) by externally-reachable URL, @@ -68,7 +68,7 @@ type GatewaySpec struct { // Support: Core // // +optional - Routes []RouteObjectReference `json:"routes"` + Routes []RouteObjectReference `json:"routes" protobuf:"bytes,3,rep,name=routes"` } const ( @@ -91,7 +91,7 @@ type Listener struct { // Support: Core // // +required - Name string `json:"name"` + Name string `json:"name" protobuf:"bytes,1,opt,name=name"` // Address requested for this listener. This is optional and behavior // can depend on GatewayClass. If a value is set in the spec and // the request address is invalid, the GatewayClass MUST indicate @@ -100,31 +100,31 @@ type Listener struct { // Support: // // +optional - Address *ListenerAddress `json:"address,omitempty"` + Address *ListenerAddress `json:"address,omitempty" protobuf:"bytes,2,opt,name=address"` // Port is a list of ports associated with the Address. // // Support: // +optional - Port *int32 `json:"port,omitempty"` + Port *int32 `json:"port,omitempty" protobuf:"varint,3,opt,name=port"` // Protocol to use. // // Support: // +optional - Protocol *string `json:"protocol,omitempty"` + Protocol *string `json:"protocol,omitempty" protobuf:"bytes,4,opt,name=protocol"` // TLS is the TLS configuration for the Listener. If unspecified, // the listener will not support TLS connections. // // Support: Core // // +optional - TLS *ListenerTLS `json:"tls,omitempty"` + TLS *ListenerTLS `json:"tls,omitempty" protobuf:"bytes,5,opt,name=tls"` // Extension for this Listener. The resource may be "configmap" (use // the empty string for the group) or an implementation-defined resource // (for example, resource "mylistener" in group "networking.acme.io"). // // Support: custom. // +optional - Extension *ListenerExtensionObjectReference `json:"extension,omitempty"` + Extension *ListenerExtensionObjectReference `json:"extension,omitempty" protobuf:"bytes,6,opt,name=extension"` } // AddressType defines how a network address is represented as a text string. @@ -153,10 +153,10 @@ type ListenerAddress struct { // Type of the Address. This is one of the *AddressType constants. // // Support: Extended - Type AddressType `json:"type"` + Type AddressType `json:"type" protobuf:"bytes,1,opt,name=type,casttype=AddressType"` // Value. Examples: "1.2.3.4", "128::1", "my-ip-address". Validity of the // values will depend on `Type` and support by the controller. - Value string `json:"value"` + Value string `json:"value" protobuf:"bytes,2,opt,name=value"` } const ( @@ -194,7 +194,7 @@ type ListenerTLS struct { // Support: Implementation-specific (Other resource types) // // +required - Certificates []CertificateObjectReference `json:"certificates,omitempty"` + Certificates []CertificateObjectReference `json:"certificates,omitempty" protobuf:"bytes,1,rep,name=certificates"` // MinimumVersion of TLS allowed. It is recommended to use one of // the TLS_* constants above. Note: this is not strongly // typed to allow implementation-specific versions to be used without @@ -205,7 +205,7 @@ type ListenerTLS struct { // values. // // +optional - MinimumVersion *string `json:"minimumVersion"` + MinimumVersion *string `json:"minimumVersion" protobuf:"bytes,2,opt,name=minimumVersion"` // Options are a list of key/value pairs to give extended options // to the provider. // @@ -215,7 +215,7 @@ type ListenerTLS struct { // construct. // // Support: Implementation-specific. - Options map[string]string `json:"options"` + Options map[string]string `json:"options" protobuf:"bytes,3,rep,name=options"` } // LocalObjectReference identifies an API object within a known namespace. @@ -225,29 +225,31 @@ type LocalObjectReference struct { // // +kubebuilder:validation:Required // +required - Group string `json:"group"` + Group string `json:"group" protobuf:"bytes,1,opt,name=group"` // Resource is the resource of the referent. // // +kubebuilder:validation:Required // +required - Resource string `json:"resource"` + Resource string `json:"resource" protobuf:"bytes,2,opt,name=resource"` // Name is the name of the referent. // // +kubebuilder:validation:Required // +required - Name string `json:"name"` + Name string `json:"name" protobuf:"bytes,3,opt,name=name"` } // CertificateObjectReference identifies a certificate object within a known // namespace. // // +k8s:deepcopy-gen=false +// +protobuf=false type CertificateObjectReference = LocalObjectReference // ListenerExtensionObjectReference identifies a listener extension object // within a known namespace. // // +k8s:deepcopy-gen=false +// +protobuf=false type ListenerExtensionObjectReference = LocalObjectReference // RouteObjectReference identifies a route object within a known namespace. @@ -258,10 +260,10 @@ type RouteObjectReference = LocalObjectReference // GatewayStatus defines the observed state of Gateway. type GatewayStatus struct { // Conditions describe the current conditions of the Gateway. - Conditions []GatewayCondition `json:"conditions"` + Conditions []GatewayCondition `json:"conditions" protobuf:"bytes,1,rep,name=conditions"` // Listeners provide status for each listener defined in the Spec. The name // in ListenerStatus refers to the corresponding Listener of the same name. - Listeners []ListenerStatus `json:"listeners"` + Listeners []ListenerStatus `json:"listeners" protobuf:"bytes,2,rep,name=listeners"` } // GatewayConditionType is a type of condition associated with a Gateway. @@ -295,29 +297,29 @@ const ( // GatewayCondition is an error status for a given route. type GatewayCondition struct { // Type indicates the type of condition. - Type GatewayConditionType `json:"type"` + Type GatewayConditionType `json:"type" protobuf:"bytes,1,opt,name=type,casttype=GatewayConditionType"` // Status describes the current state of this condition. Can be "True", // "False", or "Unknown". - Status core.ConditionStatus `json:"status"` + Status core.ConditionStatus `json:"status" protobuf:"bytes,2,opt,name=status,casttype=k8s.io/api/core/v1.ConditionStatus"` // Message is a human-understandable message describing the condition. // +optional - Message string `json:"message,omitempty"` + Message string `json:"message,omitempty" protobuf:"bytes,3,opt,name=message"` // Reason indicates why the condition is in this state. // +optional - Reason string `json:"reason,omitempty"` + Reason string `json:"reason,omitempty" protobuf:"bytes,4,opt,name=reason"` // LastTransitionTime indicates the last time this condition changed. // +optional - LastTransitionTime metav1.Time `json:"lastTransitionTime,omitempty"` + LastTransitionTime metav1.Time `json:"lastTransitionTime,omitempty" protobuf:"bytes,5,opt,name=lastTransitionTime"` } // ListenerStatus is the status associated with each listener block. type ListenerStatus struct { // Name is the name of the listener this status refers to. - Name string `json:"name"` + Name string `json:"name" protobuf:"bytes,1,opt,name=name"` // Address bound on this listener. - Address *ListenerAddress `json:"address"` + Address *ListenerAddress `json:"address" protobuf:"bytes,2,opt,name=address"` // Conditions describe the current condition of this listener. - Conditions []ListenerCondition `json:"conditions"` + Conditions []ListenerCondition `json:"conditions" protobuf:"bytes,3,rep,name=conditions"` } // ListenerConditionType is a type of condition associated with the listener. @@ -338,19 +340,19 @@ const ( // ListenerCondition is an error status for a given listener. type ListenerCondition struct { // Type indicates the type of condition. - Type ListenerConditionType `json:"type"` + Type ListenerConditionType `json:"type" protobuf:"bytes,1,opt,name=type,casttype=ListenerConditionType"` // Status describes the current state of this condition. Can be "True", // "False", or "Unknown". - Status core.ConditionStatus `json:"status"` + Status core.ConditionStatus `json:"status" protobuf:"bytes,2,opt,name=status,casttype=k8s.io/api/core/v1.ConditionStatus"` // Message is a human-understandable message describing the condition. // +optional - Message string `json:"message,omitempty"` + Message string `json:"message,omitempty" protobuf:"bytes,3,opt,name=message"` // Reason indicates why the condition is in this state. // +optional - Reason string `json:"reason,omitempty"` + Reason string `json:"reason,omitempty" protobuf:"bytes,4,opt,name=reason"` // LastTransitionTime indicates the last time this condition changed. // +optional - LastTransitionTime metav1.Time `json:"lastTransitionTime,omitempty"` + LastTransitionTime metav1.Time `json:"lastTransitionTime,omitempty" protobuf:"bytes,5,opt,name=lastTransitionTime"` } func init() { diff --git a/api/v1alpha1/gatewayclass_types.go b/api/v1alpha1/gatewayclass_types.go index 64ea3cfa42..c659ef6dac 100644 --- a/api/v1alpha1/gatewayclass_types.go +++ b/api/v1alpha1/gatewayclass_types.go @@ -73,6 +73,7 @@ type GatewayClassSpec struct { // Support: Custom // // +optional + // +protobuf=false ParametersRef *GatewayClassParametersObjectReference `json:"parameters,omitempty" protobuf:"bytes,2,opt,name=parametersRef"` } @@ -80,6 +81,7 @@ type GatewayClassSpec struct { // gateway class within a known namespace. // // +k8s:deepcopy-gen=false +// +protobuf=false type GatewayClassParametersObjectReference = LocalObjectReference // GatewayClassConditionType is the type of status conditions. diff --git a/api/v1alpha1/generated.pb.go b/api/v1alpha1/generated.pb.go index e6145a1df3..2135e33733 100644 --- a/api/v1alpha1/generated.pb.go +++ b/api/v1alpha1/generated.pb.go @@ -1072,128 +1072,128 @@ func init() { } var fileDescriptor_40fafbfb106ed5b2 = []byte{ - // 1930 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x59, 0xcd, 0x6f, 0x1c, 0x49, - 0x15, 0x77, 0xcf, 0x87, 0x3d, 0xf3, 0xfc, 0x11, 0xa7, 0xe4, 0x5d, 0x19, 0x0b, 0x8d, 0xa3, 0x5e, - 0x16, 0x6d, 0x02, 0xee, 0x49, 0x42, 0x08, 0x49, 0x80, 0x43, 0x26, 0xec, 0xae, 0x91, 0x9c, 0x8d, - 0xb7, 0x3c, 0x84, 0xec, 0x12, 0x01, 0x95, 0x9e, 0x9a, 0x71, 0xe3, 0xe9, 0xe9, 0x56, 0x57, 0x8d, - 0x17, 0xdf, 0x80, 0x2b, 0x97, 0x15, 0x37, 0x84, 0x38, 0xed, 0x1f, 0xc1, 0x89, 0x7b, 0xc4, 0x69, - 0xb9, 0xad, 0x40, 0x1a, 0x91, 0x59, 0x21, 0x8e, 0x1c, 0x10, 0x08, 0x56, 0x42, 0x42, 0xf5, 0xd1, - 0xd5, 0xdd, 0x33, 0x1e, 0xbb, 0x7b, 0x13, 0x83, 0x8c, 0xf6, 0x36, 0xf5, 0xea, 0xbd, 0x5f, 0xd7, - 0x7b, 0xf5, 0x7b, 0xaf, 0x5e, 0xd5, 0xc0, 0x57, 0x99, 0xd7, 0x63, 0xce, 0xc1, 0x2d, 0xe6, 0x78, - 0x41, 0x93, 0xd1, 0xe8, 0xd0, 0x73, 0xe9, 0x16, 0x09, 0x3d, 0xd6, 0x24, 0xa1, 0xd7, 0x3c, 0xbc, - 0x46, 0xfa, 0xe1, 0x3e, 0xb9, 0xd6, 0xec, 0xd1, 0x01, 0x8d, 0x08, 0xa7, 0x1d, 0x27, 0x8c, 0x02, - 0x1e, 0xa0, 0x4b, 0xca, 0xc2, 0xd1, 0x16, 0x3f, 0x10, 0x16, 0x0e, 0x09, 0x3d, 0x27, 0xb6, 0xd8, - 0xd8, 0xea, 0x79, 0x7c, 0x7f, 0xf8, 0xc4, 0x71, 0x03, 0xbf, 0xd9, 0x0b, 0x7a, 0x41, 0x53, 0x1a, - 0x3e, 0x19, 0x76, 0xe5, 0x48, 0x0e, 0xe4, 0x2f, 0x05, 0xb8, 0x61, 0xeb, 0x25, 0x88, 0xaf, 0xba, - 0x41, 0x44, 0x9b, 0x87, 0x53, 0x1f, 0xdd, 0xb8, 0x91, 0xe8, 0xf8, 0xc4, 0xdd, 0xf7, 0x06, 0x34, - 0x3a, 0x6a, 0x86, 0x07, 0xbd, 0xa6, 0x5c, 0xaf, 0x4f, 0x39, 0x39, 0xce, 0xea, 0xe6, 0x2c, 0xab, - 0x68, 0x38, 0xe0, 0x9e, 0x4f, 0x9b, 0xcc, 0xdd, 0xa7, 0x3e, 0x99, 0xb2, 0xbb, 0x9d, 0x8e, 0x8c, - 0x1b, 0x0c, 0x78, 0x14, 0xf4, 0xfb, 0x34, 0xda, 0x8a, 0xcd, 0x04, 0x84, 0x34, 0xa5, 0x93, 0xa6, - 0xf6, 0xdf, 0x4a, 0xb0, 0xf0, 0x26, 0xe1, 0xf4, 0x3d, 0x72, 0x84, 0x1e, 0x43, 0x8d, 0x1f, 0x85, - 0xf4, 0x3e, 0xe5, 0x64, 0xdd, 0xba, 0x64, 0xbd, 0xb6, 0x78, 0xdd, 0xd1, 0xa0, 0x4e, 0x7a, 0x45, - 0x4e, 0x78, 0xd0, 0x73, 0x64, 0x14, 0x85, 0x1f, 0xce, 0xe1, 0x35, 0xa7, 0xad, 0xad, 0x5a, 0xab, - 0x4f, 0x47, 0x9b, 0x73, 0xe3, 0xd1, 0x66, 0x2d, 0x96, 0x60, 0x83, 0x88, 0x7e, 0x08, 0x35, 0xa1, - 0xdf, 0x21, 0x9c, 0xac, 0x97, 0x24, 0xfa, 0xd5, 0x7c, 0xe8, 0x0f, 0x9e, 0xfc, 0x88, 0xba, 0x5c, - 0xe2, 0x23, 0x8d, 0x0f, 0x89, 0x0c, 0x1b, 0x54, 0xf4, 0x00, 0x2a, 0x2c, 0xa4, 0xee, 0x7a, 0x59, - 0xa2, 0x6f, 0x39, 0xa7, 0x6d, 0xbc, 0xa3, 0x1d, 0xdf, 0x0b, 0xa9, 0xdb, 0x5a, 0xd2, 0xd0, 0x15, - 0x31, 0xc2, 0x12, 0x08, 0x7d, 0x17, 0xe6, 0x19, 0x27, 0x7c, 0xc8, 0xd6, 0x2b, 0x12, 0xb2, 0x99, - 0x1f, 0x52, 0x9a, 0xb5, 0x56, 0x34, 0xe8, 0xbc, 0x1a, 0x63, 0x0d, 0x67, 0xff, 0xac, 0x0c, 0x4b, - 0x5a, 0xf3, 0x5e, 0x9f, 0x30, 0x96, 0x09, 0x7d, 0xe5, 0x4c, 0x43, 0x6f, 0x9d, 0x49, 0xe8, 0xdb, - 0x3a, 0xf4, 0x6a, 0x63, 0xaf, 0xe7, 0x8e, 0x93, 0xf4, 0x7e, 0x66, 0xfc, 0x1f, 0x9b, 0xf8, 0xab, - 0x2d, 0xbd, 0x51, 0x10, 0xf7, 0xe4, 0x4d, 0xf8, 0xb8, 0x04, 0x2f, 0xa5, 0xd5, 0xef, 0x05, 0x83, - 0x8e, 0xc7, 0xbd, 0x60, 0x80, 0xbe, 0x09, 0x15, 0x11, 0x3b, 0x19, 0xab, 0x7a, 0xeb, 0x72, 0xbc, - 0x32, 0x11, 0xd9, 0x4f, 0x46, 0x9b, 0x9f, 0x3b, 0xd6, 0x48, 0x4c, 0x62, 0x69, 0x86, 0x76, 0xcc, - 0xb2, 0x4b, 0x12, 0xe0, 0x46, 0x76, 0x01, 0x9f, 0x8c, 0x36, 0x8f, 0x29, 0x21, 0x8e, 0x41, 0xca, - 0x2e, 0x13, 0xd9, 0x30, 0x1f, 0x51, 0xc2, 0x82, 0x81, 0x0c, 0x42, 0xbd, 0x05, 0x02, 0x09, 0x4b, - 0x09, 0xd6, 0x33, 0xe8, 0x55, 0x58, 0xf0, 0x29, 0x63, 0xa4, 0x47, 0x25, 0x7b, 0xea, 0xad, 0xc5, - 0xf1, 0x68, 0x73, 0xe1, 0xbe, 0x12, 0xe1, 0x78, 0x0e, 0x45, 0x80, 0xfa, 0x84, 0xf1, 0x76, 0x44, - 0x06, 0x4c, 0x2d, 0xda, 0xf3, 0xe9, 0x7a, 0x55, 0xc6, 0xf6, 0x4a, 0x4e, 0xbe, 0x79, 0x3e, 0x6d, - 0xbd, 0x3c, 0x1e, 0x6d, 0xa2, 0x9d, 0x29, 0x24, 0x7c, 0x0c, 0xba, 0xfd, 0x41, 0x09, 0x56, 0xd3, - 0x01, 0xdb, 0xf1, 0x18, 0xcf, 0xd0, 0xbd, 0xfc, 0xc2, 0xe9, 0xfe, 0x78, 0x8a, 0xee, 0x39, 0xd1, - 0xc5, 0xda, 0xb2, 0xe8, 0xb1, 0x24, 0x45, 0xf5, 0x3d, 0xa8, 0x7a, 0x9c, 0xfa, 0x62, 0x73, 0xcb, - 0x69, 0xe8, 0x7c, 0x9c, 0x6c, 0x2d, 0x6b, 0xe8, 0xea, 0xb7, 0x05, 0x08, 0x56, 0x58, 0xf6, 0x6f, - 0xac, 0x6c, 0x94, 0x44, 0x12, 0xa0, 0xeb, 0x00, 0x49, 0x31, 0xd7, 0x64, 0x34, 0x69, 0x78, 0xcf, - 0xcc, 0xe0, 0x94, 0x16, 0x0a, 0x60, 0x39, 0x24, 0x11, 0xf1, 0x29, 0xa7, 0x11, 0xc3, 0xb4, 0xab, - 0x33, 0xf2, 0xe6, 0xe9, 0xab, 0xdc, 0x09, 0x5c, 0xd2, 0x57, 0xc9, 0x8d, 0x69, 0x97, 0x46, 0x74, - 0xe0, 0xd2, 0xd6, 0xc5, 0xf1, 0x68, 0x73, 0x79, 0x37, 0x0d, 0x88, 0xb3, 0xf8, 0xf6, 0x4f, 0x2d, - 0x40, 0xd3, 0x49, 0x87, 0x0e, 0xe4, 0xda, 0x15, 0xa1, 0xd9, 0xba, 0x25, 0x43, 0xf5, 0xb5, 0x62, - 0xa1, 0x32, 0x09, 0x91, 0x71, 0x5a, 0x43, 0xe2, 0x14, 0xbc, 0xfd, 0xe7, 0x14, 0xc7, 0x4c, 0x12, - 0xdf, 0xca, 0x24, 0xf1, 0x17, 0x26, 0x92, 0x78, 0x6d, 0x52, 0xff, 0xcc, 0xf2, 0xf7, 0x72, 0x92, - 0x9b, 0x2a, 0x81, 0x2f, 0x68, 0xb8, 0xe9, 0xfc, 0xfc, 0xa2, 0x49, 0x75, 0x95, 0xc5, 0xa6, 0x72, - 0x4d, 0xa4, 0xfb, 0xe1, 0x0b, 0xca, 0xe3, 0x0d, 0x8d, 0x9f, 0x37, 0x97, 0x7f, 0x59, 0x82, 0x45, - 0x1d, 0xb7, 0xa9, 0x34, 0xb6, 0xce, 0x34, 0x8d, 0x4b, 0x2f, 0x3c, 0x8d, 0xdf, 0x8a, 0xd3, 0xb8, - 0x2c, 0xb9, 0x79, 0x39, 0x37, 0x37, 0x67, 0x64, 0xf0, 0x01, 0xbc, 0xac, 0x15, 0x26, 0x72, 0x08, - 0x35, 0xa1, 0x3e, 0x20, 0x3e, 0x65, 0x21, 0x71, 0x63, 0x36, 0x5e, 0xd4, 0x10, 0xf5, 0xb7, 0xe2, - 0x09, 0x9c, 0xe8, 0xa0, 0x4b, 0x50, 0x11, 0x03, 0xcd, 0x3e, 0x73, 0x30, 0x0a, 0x5d, 0x2c, 0x67, - 0xec, 0xbf, 0x5a, 0x66, 0x23, 0x64, 0xa5, 0x78, 0x05, 0xaa, 0xae, 0x48, 0x19, 0x0d, 0x6f, 0x56, - 0x28, 0xf3, 0x08, 0xab, 0x39, 0xf4, 0x3d, 0xa8, 0xf7, 0x3d, 0xc6, 0x45, 0x03, 0x18, 0x17, 0xaf, - 0x2b, 0x39, 0xca, 0x82, 0x36, 0x49, 0xd6, 0x1c, 0x4b, 0x18, 0x4e, 0xf0, 0xd0, 0xf7, 0x61, 0x3e, - 0x0a, 0x86, 0x9c, 0xc6, 0xf1, 0xfc, 0xb4, 0x05, 0x27, 0xa1, 0xbc, 0x44, 0xc3, 0x1a, 0xd5, 0xfe, - 0x83, 0x05, 0xcb, 0x99, 0xde, 0x0a, 0x75, 0x8f, 0xa9, 0x30, 0x05, 0x1a, 0x8f, 0xbc, 0xc5, 0x05, - 0x91, 0xe9, 0xb0, 0x5d, 0xcd, 0x1f, 0x36, 0xdd, 0x83, 0x9c, 0x18, 0x3c, 0xfb, 0x77, 0x16, 0xac, - 0x6e, 0xb7, 0xdb, 0xbb, 0xdb, 0x94, 0x74, 0x68, 0xf4, 0x86, 0xd7, 0xe7, 0x34, 0x42, 0xef, 0x42, - 0x99, 0x74, 0x3a, 0xda, 0xb1, 0xaf, 0x9f, 0xfe, 0xc5, 0x49, 0x00, 0xe7, 0x6e, 0xa7, 0xf3, 0xfa, - 0x80, 0x47, 0x47, 0xad, 0x45, 0xfd, 0xf1, 0xf2, 0xdd, 0x4e, 0x07, 0x0b, 0x50, 0xd5, 0x53, 0xf8, - 0xc1, 0x21, 0x95, 0x0e, 0x99, 0x9e, 0x42, 0x48, 0xb0, 0x9e, 0xd9, 0xb8, 0x09, 0xb5, 0x18, 0x01, - 0xad, 0x42, 0xf9, 0x80, 0x1e, 0x29, 0x76, 0x61, 0xf1, 0x13, 0xad, 0x41, 0xf5, 0x90, 0xf4, 0x87, - 0x9a, 0xa4, 0x58, 0x0d, 0xee, 0x94, 0x6e, 0x59, 0xf6, 0xbf, 0x4a, 0x50, 0x17, 0x6b, 0x91, 0x1b, - 0x78, 0xee, 0xef, 0x14, 0x6f, 0x67, 0xee, 0x14, 0xcd, 0x7c, 0xdb, 0x20, 0x5d, 0x9f, 0xd9, 0xd5, - 0xbe, 0x33, 0x71, 0xab, 0xb8, 0x56, 0x04, 0xf4, 0xe4, 0x96, 0xf6, 0x8f, 0x16, 0x5c, 0x30, 0xba, - 0x77, 0x5d, 0x79, 0x0e, 0xba, 0x50, 0xef, 0x06, 0xd1, 0x7b, 0x24, 0xea, 0xb4, 0x03, 0xbd, 0x05, - 0x9f, 0x36, 0x39, 0x97, 0x05, 0x83, 0xdf, 0x88, 0xc1, 0x70, 0x82, 0x2b, 0x3e, 0x42, 0x7f, 0xcc, - 0xe9, 0x80, 0x79, 0xc1, 0xe0, 0x39, 0x5b, 0x0e, 0xf9, 0x91, 0xd7, 0x63, 0x30, 0x9c, 0xe0, 0xda, - 0xbf, 0x4f, 0x7b, 0xa7, 0xb3, 0xe4, 0x1d, 0x58, 0xd8, 0x97, 0xa4, 0x67, 0xda, 0xb7, 0xeb, 0xc5, - 0x33, 0x45, 0x75, 0xcb, 0x4a, 0xc2, 0x70, 0x8c, 0xf7, 0xdf, 0xf1, 0xe9, 0x9f, 0x16, 0x2c, 0x1b, - 0x9f, 0xb6, 0x03, 0xc6, 0xd1, 0x97, 0xa1, 0xb6, 0x1f, 0x30, 0x2e, 0x4f, 0x00, 0x55, 0xce, 0x4d, - 0x06, 0x6c, 0x6b, 0x39, 0x36, 0x1a, 0xa8, 0x0d, 0xd5, 0x68, 0xd8, 0xa7, 0x71, 0x65, 0x2a, 0x42, - 0x50, 0x3c, 0xec, 0xd3, 0xe4, 0xa8, 0x10, 0x23, 0x86, 0x15, 0x58, 0xd6, 0xf5, 0xf2, 0x19, 0xb9, - 0xfe, 0xeb, 0x52, 0xca, 0xf5, 0x73, 0xdf, 0x4f, 0xec, 0x66, 0xfb, 0x89, 0x2f, 0x15, 0xd8, 0x88, - 0x19, 0x1d, 0xc5, 0x2f, 0xca, 0xb0, 0x62, 0x74, 0xee, 0x13, 0xee, 0xee, 0x0b, 0x6e, 0x84, 0x84, - 0xef, 0xb7, 0x93, 0xbe, 0xd6, 0x2c, 0x69, 0x57, 0xcb, 0xb1, 0xd1, 0x40, 0x9f, 0x87, 0x8a, 0xf8, - 0xad, 0xfb, 0x88, 0x9a, 0x28, 0x43, 0x42, 0x0b, 0x4b, 0x29, 0x72, 0x00, 0x14, 0xd3, 0x25, 0x9a, - 0x6a, 0x4d, 0x57, 0x44, 0x1d, 0xdc, 0x36, 0x52, 0x9c, 0xd2, 0x40, 0x1d, 0x98, 0x57, 0xa3, 0xf5, - 0x8a, 0xf4, 0xf0, 0x1b, 0x05, 0x3c, 0x94, 0xab, 0x77, 0x14, 0xb0, 0x3a, 0x93, 0x4c, 0x05, 0x53, - 0x42, 0xac, 0xb1, 0xb3, 0xcc, 0xab, 0x9e, 0x0d, 0xf3, 0x36, 0x6e, 0xc3, 0x62, 0x6a, 0x2d, 0x85, - 0x4e, 0xb7, 0xf7, 0xd3, 0xa4, 0x15, 0x39, 0x83, 0xde, 0x86, 0xaa, 0x2f, 0xdc, 0x9b, 0x7c, 0x59, - 0xc9, 0x1b, 0x96, 0x56, 0x5d, 0xec, 0xbc, 0xfc, 0x89, 0x15, 0x12, 0xfa, 0x0e, 0xcc, 0x77, 0x65, - 0x65, 0xd2, 0x3c, 0x2d, 0x72, 0x42, 0xe8, 0x92, 0x26, 0x4f, 0x74, 0xf5, 0x1b, 0x6b, 0x30, 0x01, - 0x4b, 0xe4, 0x99, 0xa0, 0x53, 0xba, 0x08, 0xac, 0x3a, 0x4c, 0x14, 0xac, 0xfa, 0x8d, 0x35, 0x98, - 0xfd, 0xdb, 0x74, 0x09, 0x93, 0xed, 0x68, 0x1b, 0xaa, 0xa2, 0x40, 0xc5, 0x5d, 0x59, 0x91, 0xa2, - 0x24, 0x4a, 0x5c, 0x92, 0x0f, 0x62, 0xc4, 0xb0, 0x02, 0x43, 0x0f, 0x61, 0xa1, 0x43, 0xbb, 0x64, - 0xd8, 0xe7, 0x3a, 0x2c, 0x85, 0x71, 0x65, 0x9d, 0xff, 0x96, 0xc2, 0xc0, 0x31, 0x98, 0x7d, 0x94, - 0x3a, 0x55, 0x4c, 0x6f, 0x59, 0xeb, 0xa9, 0x3e, 0x31, 0xf6, 0xe1, 0x56, 0xee, 0xce, 0x72, 0x92, - 0x86, 0x26, 0x43, 0xf5, 0x3c, 0xc3, 0x06, 0xdb, 0xfe, 0x77, 0x09, 0x6a, 0x71, 0x47, 0x68, 0xda, - 0x7e, 0x6b, 0x56, 0xdb, 0x8f, 0x1e, 0xc1, 0x02, 0xe9, 0x74, 0x22, 0xca, 0x58, 0x7e, 0x62, 0xc4, - 0xf0, 0x77, 0x95, 0xa1, 0x8a, 0x81, 0x1e, 0xe0, 0x18, 0x4e, 0x96, 0x8a, 0x20, 0xe2, 0x92, 0x18, - 0x55, 0x5d, 0x2a, 0x82, 0x88, 0x63, 0x29, 0x45, 0xaf, 0x41, 0x4d, 0xbe, 0x16, 0xbb, 0x41, 0x5f, - 0xdf, 0x4c, 0x97, 0x64, 0xc9, 0xd1, 0x32, 0x6c, 0x66, 0xd1, 0x36, 0x94, 0x79, 0x9f, 0xe9, 0xc4, - 0xdd, 0xca, 0xbf, 0xba, 0xf6, 0xce, 0x5e, 0x6b, 0x41, 0xb4, 0xa8, 0xed, 0x9d, 0x3d, 0x2c, 0x20, - 0xb2, 0x85, 0x60, 0xfe, 0x8c, 0x8e, 0xa0, 0x47, 0x70, 0x61, 0x22, 0x3e, 0x62, 0x17, 0x52, 0xcf, - 0x06, 0x4b, 0xe9, 0x67, 0x03, 0xfd, 0x3c, 0xf0, 0x4a, 0xa6, 0x38, 0x24, 0x64, 0x7d, 0x28, 0x84, - 0xba, 0x56, 0xd8, 0x7f, 0x29, 0xc1, 0xc5, 0x18, 0x3a, 0x79, 0x93, 0xb8, 0x9d, 0x01, 0x7f, 0x75, - 0xe2, 0x4d, 0xe2, 0xa5, 0x29, 0x83, 0xcf, 0x1e, 0x25, 0x4e, 0x7f, 0x94, 0xf8, 0xbb, 0x05, 0x2b, - 0xd9, 0xdb, 0xd6, 0xff, 0x34, 0x93, 0x7a, 0x99, 0x6b, 0xa9, 0x6a, 0x06, 0xbe, 0x92, 0x1f, 0x3c, - 0xff, 0xa3, 0xd7, 0xa8, 0x04, 0x8b, 0xa9, 0xf4, 0x41, 0x21, 0x2c, 0xb9, 0x34, 0xe2, 0x5e, 0xd7, - 0x73, 0x89, 0xb8, 0x87, 0x5b, 0xcf, 0x75, 0x0f, 0x5f, 0xd3, 0x5f, 0x5f, 0xba, 0x97, 0xc2, 0xc4, - 0x99, 0x2f, 0xa0, 0x3b, 0xb0, 0xe2, 0x7b, 0x03, 0xcf, 0x1f, 0xfa, 0x0f, 0x69, 0x64, 0xba, 0xe4, - 0x7a, 0x0b, 0x8d, 0x47, 0x9b, 0x2b, 0xf7, 0x33, 0x33, 0x78, 0x42, 0x13, 0x51, 0x58, 0x08, 0xc2, - 0x74, 0x8c, 0xee, 0x14, 0x2a, 0x16, 0xce, 0x03, 0x65, 0xac, 0x9a, 0x09, 0x43, 0x5e, 0x2d, 0xc5, - 0x31, 0xf6, 0xc6, 0x1d, 0x58, 0x4a, 0x6b, 0x16, 0x3a, 0xea, 0x7f, 0x6e, 0xc1, 0xda, 0x71, 0xb1, - 0x11, 0x05, 0xa0, 0x17, 0x05, 0xc3, 0x70, 0xf2, 0xb5, 0xe5, 0x4d, 0x21, 0xc4, 0x6a, 0x4e, 0xb4, - 0x6a, 0x11, 0x65, 0xc1, 0x30, 0x72, 0xe3, 0x42, 0x61, 0x0e, 0x02, 0xac, 0xe5, 0xd8, 0x68, 0x18, - 0xc6, 0x96, 0x67, 0x3e, 0xf9, 0xfc, 0xa3, 0x04, 0xb5, 0xb6, 0x1b, 0xfe, 0x7f, 0xdc, 0xaa, 0x77, - 0x33, 0xb7, 0xea, 0x1c, 0x4f, 0xe8, 0xb1, 0xe7, 0x33, 0x2f, 0xd5, 0x8f, 0x26, 0x2e, 0xd5, 0x57, - 0x0b, 0x60, 0x9e, 0x7c, 0xa7, 0xfe, 0x55, 0x09, 0x96, 0x62, 0xd5, 0x73, 0x7f, 0x4b, 0x79, 0x90, - 0xbd, 0xa5, 0x5c, 0xc9, 0x1f, 0xa5, 0x19, 0x97, 0x94, 0x95, 0x24, 0x38, 0x62, 0x37, 0xec, 0x55, - 0x58, 0xc9, 0xc6, 0x55, 0xfe, 0xd7, 0xd9, 0x8e, 0x48, 0xb7, 0xeb, 0xb9, 0x7b, 0x61, 0xdf, 0xe3, - 0xe7, 0x9e, 0xbc, 0xed, 0x0c, 0x79, 0x73, 0xbc, 0x37, 0xa4, 0xbd, 0xcf, 0xf1, 0x5f, 0x67, 0x25, - 0xef, 0x7f, 0x9d, 0x19, 0xdc, 0x93, 0x49, 0xfc, 0x41, 0x09, 0x56, 0xd3, 0xea, 0xe7, 0x9e, 0xc8, - 0x7b, 0x59, 0x22, 0x3b, 0xc5, 0xa2, 0x35, 0x83, 0xcc, 0x28, 0x1b, 0x24, 0x49, 0xe8, 0x35, 0x40, - 0xc7, 0xc4, 0xd9, 0x79, 0xfa, 0xac, 0x31, 0xf7, 0xe1, 0xb3, 0xc6, 0xdc, 0x47, 0xcf, 0x1a, 0x73, - 0x3f, 0x19, 0x37, 0xac, 0xa7, 0xe3, 0x86, 0xf5, 0xe1, 0xb8, 0x61, 0x7d, 0x34, 0x6e, 0x58, 0x7f, - 0x1a, 0x37, 0xac, 0xf7, 0x3f, 0x6e, 0xcc, 0xbd, 0x5b, 0x8b, 0x3f, 0xfe, 0x9f, 0x00, 0x00, 0x00, - 0xff, 0xff, 0x47, 0x04, 0xfb, 0xc2, 0xbc, 0x22, 0x00, 0x00, + // 1932 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x59, 0xcd, 0x8f, 0x1c, 0x47, + 0x15, 0xdf, 0x9e, 0x8f, 0xdd, 0x99, 0xb7, 0x1f, 0x5e, 0x97, 0x36, 0xd1, 0xb2, 0xa0, 0x59, 0xab, + 0x43, 0x50, 0x6c, 0xd8, 0x1e, 0xdb, 0x18, 0x63, 0x1b, 0x38, 0x78, 0x4c, 0x92, 0x45, 0x5a, 0xc7, + 0x9b, 0xda, 0xc1, 0x24, 0xc1, 0x02, 0xca, 0x3d, 0x35, 0x33, 0xcd, 0x4e, 0x4f, 0xb7, 0xba, 0x6a, + 0x36, 0xec, 0x0d, 0xb8, 0x72, 0x89, 0xb8, 0x21, 0xc4, 0x29, 0x7f, 0x04, 0x27, 0xee, 0x16, 0xa7, + 0x70, 0x8b, 0x40, 0x1a, 0xe1, 0x89, 0x10, 0x47, 0x0e, 0x08, 0x04, 0x91, 0x90, 0x50, 0x7d, 0x74, + 0x75, 0xf7, 0xcc, 0xce, 0xba, 0x3b, 0xf1, 0x82, 0x16, 0x71, 0x9b, 0x7e, 0xf5, 0xde, 0xaf, 0xea, + 0xbd, 0xfa, 0xbd, 0x57, 0xaf, 0x6a, 0xe0, 0x2b, 0xcc, 0xeb, 0x31, 0xe7, 0xf0, 0x16, 0x73, 0xbc, + 0xa0, 0xc9, 0x68, 0x74, 0xe4, 0xb9, 0x74, 0x87, 0x84, 0x1e, 0x6b, 0x92, 0xd0, 0x6b, 0x1e, 0x5d, + 0x23, 0x83, 0xb0, 0x4f, 0xae, 0x35, 0x7b, 0x74, 0x48, 0x23, 0xc2, 0x69, 0xc7, 0x09, 0xa3, 0x80, + 0x07, 0xe8, 0x92, 0xb2, 0x70, 0xb4, 0xc5, 0xf7, 0x85, 0x85, 0x43, 0x42, 0xcf, 0x89, 0x2d, 0xb6, + 0x76, 0x7a, 0x1e, 0xef, 0x8f, 0x1e, 0x3b, 0x6e, 0xe0, 0x37, 0x7b, 0x41, 0x2f, 0x68, 0x4a, 0xc3, + 0xc7, 0xa3, 0xae, 0xfc, 0x92, 0x1f, 0xf2, 0x97, 0x02, 0xdc, 0xb2, 0xf5, 0x12, 0xc4, 0xac, 0x6e, + 0x10, 0xd1, 0xe6, 0xd1, 0xcc, 0xa4, 0x5b, 0x37, 0x12, 0x1d, 0x9f, 0xb8, 0x7d, 0x6f, 0x48, 0xa3, + 0xe3, 0x66, 0x78, 0xd8, 0x6b, 0xca, 0xf5, 0xfa, 0x94, 0x93, 0x93, 0xac, 0x6e, 0xce, 0xb3, 0x8a, + 0x46, 0x43, 0xee, 0xf9, 0xb4, 0xc9, 0xdc, 0x3e, 0xf5, 0xc9, 0x8c, 0xdd, 0xed, 0x74, 0x64, 0xdc, + 0x60, 0xc8, 0xa3, 0x60, 0x30, 0xa0, 0xd1, 0x4e, 0x6c, 0x26, 0x20, 0xa4, 0x29, 0x9d, 0x36, 0xb5, + 0xff, 0x5a, 0x82, 0xa5, 0xd7, 0x09, 0xa7, 0xef, 0x92, 0x63, 0xf4, 0x08, 0x6a, 0xfc, 0x38, 0xa4, + 0xf7, 0x29, 0x27, 0x9b, 0xd6, 0x25, 0xeb, 0x95, 0xe5, 0xeb, 0x8e, 0x06, 0x75, 0xd2, 0x2b, 0x72, + 0xc2, 0xc3, 0x9e, 0x23, 0xa3, 0x28, 0xfc, 0x70, 0x8e, 0xae, 0x39, 0x6d, 0x6d, 0xd5, 0x5a, 0x7f, + 0x32, 0xde, 0x5e, 0x98, 0x8c, 0xb7, 0x6b, 0xb1, 0x04, 0x1b, 0x44, 0xf4, 0x03, 0xa8, 0x09, 0xfd, + 0x0e, 0xe1, 0x64, 0xb3, 0x24, 0xd1, 0xaf, 0xe6, 0x43, 0x7f, 0xf0, 0xf8, 0x87, 0xd4, 0xe5, 0x12, + 0x1f, 0x69, 0x7c, 0x48, 0x64, 0xd8, 0xa0, 0xa2, 0x07, 0x50, 0x61, 0x21, 0x75, 0x37, 0xcb, 0x12, + 0x7d, 0xc7, 0x79, 0xd6, 0xc6, 0x3b, 0xda, 0xf1, 0x83, 0x90, 0xba, 0xad, 0x15, 0x0d, 0x5d, 0x11, + 0x5f, 0x58, 0x02, 0xa1, 0xef, 0xc0, 0x22, 0xe3, 0x84, 0x8f, 0xd8, 0x66, 0x45, 0x42, 0x36, 0xf3, + 0x43, 0x4a, 0xb3, 0xd6, 0x9a, 0x06, 0x5d, 0x54, 0xdf, 0x58, 0xc3, 0xd9, 0x3f, 0x2d, 0xc3, 0x8a, + 0xd6, 0xbc, 0x37, 0x20, 0x8c, 0x65, 0x42, 0x5f, 0x39, 0xd3, 0xd0, 0x5b, 0x67, 0x12, 0xfa, 0xb6, + 0x0e, 0xbd, 0xda, 0xd8, 0xeb, 0xb9, 0xe3, 0x24, 0xbd, 0x9f, 0x1b, 0xff, 0x47, 0x26, 0xfe, 0x6a, + 0x4b, 0x6f, 0x14, 0xc4, 0x3d, 0x7d, 0x13, 0x3e, 0x2a, 0xc1, 0x0b, 0x69, 0xf5, 0x7b, 0xc1, 0xb0, + 0xe3, 0x71, 0x2f, 0x18, 0xa2, 0x6f, 0x40, 0x45, 0xc4, 0x4e, 0xc6, 0xaa, 0xde, 0xba, 0x1c, 0xaf, + 0x4c, 0x44, 0xf6, 0xe3, 0xf1, 0xf6, 0x67, 0x4e, 0x34, 0x12, 0x83, 0x58, 0x9a, 0xa1, 0x3d, 0xb3, + 0xec, 0x92, 0x04, 0xb8, 0x91, 0x5d, 0xc0, 0xc7, 0xe3, 0xed, 0x13, 0x4a, 0x88, 0x63, 0x90, 0xb2, + 0xcb, 0x44, 0x36, 0x2c, 0x46, 0x94, 0xb0, 0x60, 0x28, 0x83, 0x50, 0x6f, 0x81, 0x40, 0xc2, 0x52, + 0x82, 0xf5, 0x08, 0x7a, 0x19, 0x96, 0x7c, 0xca, 0x18, 0xe9, 0x51, 0xc9, 0x9e, 0x7a, 0x6b, 0x79, + 0x32, 0xde, 0x5e, 0xba, 0xaf, 0x44, 0x38, 0x1e, 0x43, 0x11, 0xa0, 0x01, 0x61, 0xbc, 0x1d, 0x91, + 0x21, 0x53, 0x8b, 0xf6, 0x7c, 0xba, 0x59, 0x95, 0xb1, 0xbd, 0x92, 0x93, 0x6f, 0x9e, 0x4f, 0x5b, + 0x2f, 0x4e, 0xc6, 0xdb, 0x68, 0x6f, 0x06, 0x09, 0x9f, 0x80, 0x6e, 0xbf, 0x5f, 0x82, 0xf5, 0x74, + 0xc0, 0xf6, 0x3c, 0xc6, 0x33, 0x74, 0x2f, 0x3f, 0x77, 0xba, 0x3f, 0x9a, 0xa1, 0x7b, 0x4e, 0x74, + 0xb1, 0xb6, 0x2c, 0x7a, 0x2c, 0x49, 0x51, 0xfd, 0x00, 0xaa, 0x1e, 0xa7, 0xbe, 0xd8, 0xdc, 0x72, + 0x1a, 0x3a, 0x1f, 0x27, 0x5b, 0xab, 0x1a, 0xba, 0xfa, 0x2d, 0x01, 0x82, 0x15, 0x96, 0xfd, 0x6b, + 0x2b, 0x1b, 0x25, 0x91, 0x04, 0xe8, 0x3a, 0x40, 0x52, 0xcc, 0x35, 0x19, 0x4d, 0x1a, 0xde, 0x33, + 0x23, 0x38, 0xa5, 0x85, 0x02, 0x58, 0x0d, 0x49, 0x44, 0x7c, 0xca, 0x69, 0xc4, 0x30, 0xed, 0xea, + 0x8c, 0xbc, 0xf9, 0xec, 0x55, 0xee, 0x05, 0x2e, 0x19, 0xa8, 0xe4, 0xc6, 0xb4, 0x4b, 0x23, 0x3a, + 0x74, 0x69, 0xeb, 0xe2, 0x64, 0xbc, 0xbd, 0xba, 0x9f, 0x06, 0xc4, 0x59, 0x7c, 0xfb, 0x27, 0x16, + 0xa0, 0xd9, 0xa4, 0x43, 0x87, 0x72, 0xed, 0x8a, 0xd0, 0x6c, 0xd3, 0x92, 0xa1, 0xfa, 0x6a, 0xb1, + 0x50, 0x99, 0x84, 0xc8, 0x38, 0xad, 0x21, 0x71, 0x0a, 0xde, 0xfe, 0x53, 0x8a, 0x63, 0x26, 0x89, + 0x6f, 0x65, 0x92, 0xf8, 0xf3, 0x53, 0x49, 0xbc, 0x31, 0xad, 0x7f, 0x66, 0xf9, 0x7b, 0x39, 0xc9, + 0x4d, 0x95, 0xc0, 0x17, 0x34, 0xdc, 0x6c, 0x7e, 0x7e, 0xc1, 0xa4, 0xba, 0xca, 0x62, 0x53, 0xb9, + 0xa6, 0xd2, 0xfd, 0xe8, 0x39, 0xe5, 0xf1, 0x96, 0xc6, 0xcf, 0x9b, 0xcb, 0xbf, 0x28, 0xc1, 0xb2, + 0x8e, 0xdb, 0x4c, 0x1a, 0x5b, 0x67, 0x9a, 0xc6, 0xa5, 0xe7, 0x9e, 0xc6, 0x6f, 0xc4, 0x69, 0x5c, + 0x96, 0xdc, 0xbc, 0x9c, 0x9b, 0x9b, 0x73, 0x32, 0xf8, 0x10, 0x5e, 0xd4, 0x0a, 0x53, 0x39, 0x84, + 0x9a, 0x50, 0x1f, 0x12, 0x9f, 0xb2, 0x90, 0xb8, 0x31, 0x1b, 0x2f, 0x6a, 0x88, 0xfa, 0x1b, 0xf1, + 0x00, 0x4e, 0x74, 0xd0, 0x25, 0xa8, 0x88, 0x0f, 0xcd, 0x3e, 0x73, 0x30, 0x0a, 0x5d, 0x2c, 0x47, + 0xec, 0xbf, 0x58, 0x66, 0x23, 0x64, 0xa5, 0x78, 0x09, 0xaa, 0xae, 0x48, 0x19, 0x0d, 0x6f, 0x56, + 0x28, 0xf3, 0x08, 0xab, 0x31, 0xf4, 0x5d, 0xa8, 0x0f, 0x3c, 0xc6, 0x45, 0x03, 0x18, 0x17, 0xaf, + 0x2b, 0x39, 0xca, 0x82, 0x36, 0x49, 0xd6, 0x1c, 0x4b, 0x18, 0x4e, 0xf0, 0xd0, 0xf7, 0x60, 0x31, + 0x0a, 0x46, 0x9c, 0xc6, 0xf1, 0xfc, 0xa4, 0x05, 0x27, 0xa1, 0xbc, 0x44, 0xc3, 0x1a, 0xd5, 0xfe, + 0xbd, 0x05, 0xab, 0x99, 0xde, 0x0a, 0x75, 0x4f, 0xa8, 0x30, 0x05, 0x1a, 0x8f, 0xbc, 0xc5, 0x05, + 0x91, 0xd9, 0xb0, 0x5d, 0xcd, 0x1f, 0x36, 0xdd, 0x83, 0x9c, 0x1a, 0x3c, 0xfb, 0xb7, 0x16, 0xac, + 0xef, 0xb6, 0xdb, 0xfb, 0xbb, 0x94, 0x74, 0x68, 0xf4, 0x9a, 0x37, 0xe0, 0x34, 0x42, 0xef, 0x40, + 0x99, 0x74, 0x3a, 0xda, 0xb1, 0xaf, 0x3d, 0x7b, 0xc6, 0x69, 0x00, 0xe7, 0x6e, 0xa7, 0xf3, 0xea, + 0x90, 0x47, 0xc7, 0xad, 0x65, 0x3d, 0x79, 0xf9, 0x6e, 0xa7, 0x83, 0x05, 0xa8, 0xea, 0x29, 0xfc, + 0xe0, 0x88, 0x4a, 0x87, 0x4c, 0x4f, 0x21, 0x24, 0x58, 0x8f, 0x6c, 0xdd, 0x84, 0x5a, 0x8c, 0x80, + 0xd6, 0xa1, 0x7c, 0x48, 0x8f, 0x15, 0xbb, 0xb0, 0xf8, 0x89, 0x36, 0xa0, 0x7a, 0x44, 0x06, 0x23, + 0x4d, 0x52, 0xac, 0x3e, 0xee, 0x94, 0x6e, 0x59, 0xf6, 0x3f, 0x4b, 0x50, 0x17, 0x6b, 0x91, 0x1b, + 0x78, 0xee, 0xef, 0x14, 0x6f, 0x66, 0xee, 0x14, 0xcd, 0x7c, 0xdb, 0x20, 0x5d, 0x9f, 0xdb, 0xd5, + 0xbe, 0x3d, 0x75, 0xab, 0xb8, 0x56, 0x04, 0xf4, 0xf4, 0x96, 0xf6, 0x0f, 0x16, 0x5c, 0x30, 0xba, + 0x77, 0x5d, 0x79, 0x0e, 0xba, 0x50, 0xef, 0x06, 0xd1, 0xbb, 0x24, 0xea, 0xb4, 0x03, 0xbd, 0x05, + 0x9f, 0x34, 0x39, 0x57, 0x05, 0x83, 0x5f, 0x8b, 0xc1, 0x70, 0x82, 0x2b, 0x26, 0xa1, 0x3f, 0xe2, + 0x74, 0xc8, 0xbc, 0x60, 0xf8, 0x29, 0x5b, 0x0e, 0x39, 0xc9, 0xab, 0x31, 0x18, 0x4e, 0x70, 0xed, + 0xdf, 0xa5, 0xbd, 0xd3, 0x59, 0xf2, 0x36, 0x2c, 0xf5, 0x25, 0xe9, 0x99, 0xf6, 0xed, 0x7a, 0xf1, + 0x4c, 0x51, 0xdd, 0xb2, 0x92, 0x30, 0x1c, 0xe3, 0xfd, 0x67, 0x7c, 0xfa, 0x87, 0x05, 0xab, 0xc6, + 0xa7, 0xdd, 0x80, 0x71, 0xf4, 0x25, 0xa8, 0xf5, 0x03, 0xc6, 0xe5, 0x09, 0xa0, 0xca, 0xb9, 0xc9, + 0x80, 0x5d, 0x2d, 0xc7, 0x46, 0x03, 0xb5, 0xa1, 0x1a, 0x8d, 0x06, 0x34, 0xae, 0x4c, 0x45, 0x08, + 0x8a, 0x47, 0x03, 0x9a, 0x1c, 0x15, 0xe2, 0x8b, 0x61, 0x05, 0x96, 0x75, 0xbd, 0x7c, 0x46, 0xae, + 0xff, 0xaa, 0x94, 0x72, 0xfd, 0xdc, 0xf7, 0x13, 0xfb, 0xd9, 0x7e, 0xe2, 0x8b, 0x05, 0x36, 0x62, + 0x4e, 0x47, 0xf1, 0xf3, 0x32, 0xac, 0x19, 0x9d, 0xfb, 0x84, 0xbb, 0x7d, 0xc1, 0x8d, 0x90, 0xf0, + 0x7e, 0x3b, 0xe9, 0x6b, 0xcd, 0x92, 0xf6, 0xb5, 0x1c, 0x1b, 0x0d, 0xf4, 0x39, 0xa8, 0x88, 0xdf, + 0xba, 0x8f, 0xa8, 0x89, 0x32, 0x24, 0xb4, 0xb0, 0x94, 0x22, 0x07, 0x40, 0x31, 0x5d, 0xa2, 0xa9, + 0xd6, 0x74, 0x4d, 0xd4, 0xc1, 0x5d, 0x23, 0xc5, 0x29, 0x0d, 0xd4, 0x81, 0x45, 0xf5, 0xb5, 0x59, + 0x91, 0x1e, 0x7e, 0xbd, 0x80, 0x87, 0x72, 0xf5, 0x8e, 0x02, 0x56, 0x67, 0x92, 0xa9, 0x60, 0x4a, + 0x88, 0x35, 0x76, 0x96, 0x79, 0xd5, 0xb3, 0x61, 0xde, 0xd6, 0x6d, 0x58, 0x4e, 0xad, 0xa5, 0xd0, + 0xe9, 0xf6, 0x5e, 0x9a, 0xb4, 0x22, 0x67, 0xd0, 0x9b, 0x50, 0xf5, 0x85, 0x7b, 0xd3, 0x2f, 0x2b, + 0x79, 0xc3, 0xd2, 0xaa, 0x8b, 0x9d, 0x97, 0x3f, 0xb1, 0x42, 0x42, 0xdf, 0x86, 0xc5, 0xae, 0xac, + 0x4c, 0x9a, 0xa7, 0x45, 0x4e, 0x08, 0x5d, 0xd2, 0xe4, 0x89, 0xae, 0x7e, 0x63, 0x0d, 0x26, 0x60, + 0x89, 0x3c, 0x13, 0x74, 0x4a, 0x17, 0x81, 0x55, 0x87, 0x89, 0x82, 0x55, 0xbf, 0xb1, 0x06, 0xb3, + 0x7f, 0x93, 0x2e, 0x61, 0xb2, 0x1d, 0x6d, 0x43, 0x55, 0x14, 0xa8, 0xb8, 0x2b, 0x2b, 0x52, 0x94, + 0x44, 0x89, 0x4b, 0xf2, 0x41, 0x7c, 0x31, 0xac, 0xc0, 0xd0, 0x43, 0x58, 0xea, 0xd0, 0x2e, 0x19, + 0x0d, 0xb8, 0x0e, 0x4b, 0x61, 0x5c, 0x59, 0xe7, 0xbf, 0xa9, 0x30, 0x70, 0x0c, 0x66, 0x1f, 0xa7, + 0x4e, 0x15, 0xd3, 0x5b, 0xd6, 0x7a, 0xaa, 0x4f, 0x8c, 0x7d, 0xb8, 0x95, 0xbb, 0xb3, 0x9c, 0xa6, + 0xa1, 0xc9, 0x50, 0x3d, 0xce, 0xb0, 0xc1, 0xb6, 0xff, 0x55, 0x82, 0x5a, 0xdc, 0x11, 0x9a, 0xb6, + 0xdf, 0x9a, 0xd7, 0xf6, 0xa3, 0xb7, 0x60, 0x89, 0x74, 0x3a, 0x11, 0x65, 0x2c, 0x3f, 0x31, 0x62, + 0xf8, 0xbb, 0xca, 0x50, 0xc5, 0x40, 0x7f, 0xe0, 0x18, 0x4e, 0x96, 0x8a, 0x20, 0xe2, 0x92, 0x18, + 0x55, 0x5d, 0x2a, 0x82, 0x88, 0x63, 0x29, 0x45, 0xaf, 0x40, 0x4d, 0xbe, 0x16, 0xbb, 0xc1, 0x40, + 0xdf, 0x4c, 0x57, 0x64, 0xc9, 0xd1, 0x32, 0x6c, 0x46, 0xd1, 0x2e, 0x94, 0xf9, 0x80, 0xe9, 0xc4, + 0xdd, 0xc9, 0xbf, 0xba, 0xf6, 0xde, 0x41, 0x6b, 0x49, 0xb4, 0xa8, 0xed, 0xbd, 0x03, 0x2c, 0x20, + 0xb2, 0x85, 0x60, 0xf1, 0x8c, 0x8e, 0xa0, 0x1e, 0x5c, 0x98, 0x8a, 0x0f, 0x6a, 0x66, 0x9e, 0x0d, + 0x3e, 0x3b, 0xf5, 0x6c, 0xb0, 0xac, 0xd5, 0x52, 0xaf, 0x05, 0x2f, 0x65, 0x6a, 0x45, 0xc2, 0xdd, + 0x87, 0x42, 0xa8, 0x4b, 0x87, 0xfd, 0xe7, 0x12, 0x5c, 0x8c, 0x67, 0x4a, 0x9e, 0x28, 0x6e, 0x67, + 0xe6, 0x7a, 0x79, 0x6a, 0xae, 0x17, 0x66, 0x0c, 0xfe, 0xff, 0x46, 0xf1, 0xec, 0x37, 0x8a, 0xbf, + 0x59, 0xb0, 0x96, 0xbd, 0x7c, 0xfd, 0x57, 0x13, 0xab, 0x97, 0xb9, 0xa5, 0xaa, 0xde, 0xe0, 0xcb, + 0xf9, 0xc1, 0xf3, 0xbf, 0x81, 0x8d, 0x4b, 0xb0, 0x9c, 0xca, 0x26, 0x14, 0xc2, 0x8a, 0x4b, 0x23, + 0xee, 0x75, 0x3d, 0x97, 0x88, 0x6b, 0xb9, 0xf5, 0xa9, 0xae, 0xe5, 0x1b, 0x7a, 0xf6, 0x95, 0x7b, + 0x29, 0x4c, 0x9c, 0x99, 0x01, 0xdd, 0x81, 0x35, 0xdf, 0x1b, 0x7a, 0xfe, 0xc8, 0x7f, 0x48, 0x23, + 0xd3, 0x34, 0xd7, 0x5b, 0x68, 0x32, 0xde, 0x5e, 0xbb, 0x9f, 0x19, 0xc1, 0x53, 0x9a, 0x88, 0xc2, + 0x52, 0x10, 0xa6, 0x63, 0x74, 0xa7, 0x50, 0xed, 0x70, 0x1e, 0x28, 0x63, 0xd5, 0x5b, 0x18, 0xf2, + 0x6a, 0x29, 0x8e, 0xb1, 0xb7, 0xee, 0xc0, 0x4a, 0x5a, 0xb3, 0xd0, 0xc9, 0xff, 0x33, 0x0b, 0x36, + 0x4e, 0x8a, 0x8d, 0x28, 0x00, 0xbd, 0x28, 0x18, 0x85, 0xd3, 0x8f, 0x2f, 0xaf, 0x0b, 0x21, 0x56, + 0x63, 0xa2, 0x73, 0x8b, 0x28, 0x0b, 0x46, 0x91, 0x1b, 0x17, 0x0a, 0x73, 0x2e, 0x60, 0x2d, 0xc7, + 0x46, 0xc3, 0x30, 0xb6, 0x3c, 0xf7, 0x05, 0xe8, 0xef, 0x25, 0xa8, 0xb5, 0xdd, 0xf0, 0x7f, 0xe3, + 0x92, 0xbd, 0x9f, 0xb9, 0x64, 0xe7, 0x78, 0x51, 0x8f, 0x3d, 0x9f, 0x7b, 0xc7, 0x7e, 0x6b, 0xea, + 0x8e, 0x7d, 0xb5, 0x00, 0xe6, 0xe9, 0x57, 0xec, 0x5f, 0x96, 0x60, 0x25, 0x56, 0x3d, 0xf7, 0x97, + 0x96, 0x07, 0xd9, 0x4b, 0xcb, 0x95, 0xfc, 0x51, 0x9a, 0x73, 0x67, 0x59, 0x4b, 0x82, 0x23, 0x76, + 0xc3, 0x5e, 0x87, 0xb5, 0x6c, 0x5c, 0xe5, 0x5f, 0x9f, 0xed, 0x88, 0x74, 0xbb, 0x9e, 0x7b, 0x10, + 0x0e, 0x3c, 0x7e, 0xee, 0xc9, 0xdb, 0xce, 0x90, 0x37, 0xc7, 0xf3, 0x43, 0xda, 0xfb, 0x1c, 0x7f, + 0x7d, 0x56, 0xf2, 0xfe, 0xf5, 0x99, 0xc1, 0x3d, 0x9d, 0xc4, 0xef, 0x97, 0x60, 0x3d, 0xad, 0x7e, + 0xee, 0x89, 0x7c, 0x90, 0x25, 0xb2, 0x53, 0x2c, 0x5a, 0x73, 0xc8, 0x8c, 0xb2, 0x41, 0x92, 0x84, + 0xde, 0x00, 0x74, 0x42, 0x9c, 0x9d, 0x27, 0x4f, 0x1b, 0x0b, 0x1f, 0x3c, 0x6d, 0x2c, 0x7c, 0xf8, + 0xb4, 0xb1, 0xf0, 0xe3, 0x49, 0xc3, 0x7a, 0x32, 0x69, 0x58, 0x1f, 0x4c, 0x1a, 0xd6, 0x87, 0x93, + 0x86, 0xf5, 0xc7, 0x49, 0xc3, 0x7a, 0xef, 0xa3, 0xc6, 0xc2, 0x3b, 0xb5, 0x78, 0xf2, 0x7f, 0x07, + 0x00, 0x00, 0xff, 0xff, 0x6f, 0xf8, 0x33, 0x3d, 0xcb, 0x22, 0x00, 0x00, } func (m *Gateway) Marshal() (dAtA []byte, err error) { @@ -7797,7 +7797,7 @@ func (m *ListenerAddress) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Type = string(dAtA[iNdEx:postIndex]) + m.Type = AddressType(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 2: if wireType != 2 { diff --git a/api/v1alpha1/generated.proto b/api/v1alpha1/generated.proto index 0d6aaec8a7..7a91c06f8f 100644 --- a/api/v1alpha1/generated.proto +++ b/api/v1alpha1/generated.proto @@ -126,6 +126,7 @@ message GatewayClassSpec { // Support: Custom // // +optional + // +protobuf=false optional LocalObjectReference parametersRef = 2; } @@ -200,10 +201,18 @@ message GatewaySpec { // ports, protocols are bound on this Gateway. repeated Listener listeners = 2; - // Routes associated with this Gateway. Routes define protocol-specific - // routing to backends (e.g. Services). Typically the resource is - // "httproute" or "tcproute" in group "networking.x.k8s.io", or an + // Routes is a list of resources to associate with the Gateway. A route is a + // resource capable of servicing a request and allows a cluster operator to + // expose a cluster resource (i.e. Service) by externally-reachable URL, + // load-balance traffic and terminate SSL/TLS. Typically, a route is a + // "httproute" or "tcproute" in group "networking.x.k8s.io". However, an // implementation may support other resources. + // + // If unspecified, no routes will be associated to the Gateway. + // + // Support: Core + // + // +optional repeated LocalObjectReference routes = 3; } diff --git a/api/v1alpha1/httproute_types.go b/api/v1alpha1/httproute_types.go index cbbf007ba9..e990d14ab5 100644 --- a/api/v1alpha1/httproute_types.go +++ b/api/v1alpha1/httproute_types.go @@ -136,6 +136,7 @@ type HTTPRouteMatch struct { // within a known namespace. // // +k8s:deepcopy-gen=false +// +protobuf=false type RouteMatchExtensionObjectReference = LocalObjectReference // HTTPRouteFilter defines a filter-like action to be applied to @@ -162,6 +163,7 @@ type HTTPRouteFilter struct { // object within a known namespace. // // +k8s:deepcopy-gen=false +// +protobuf=false type RouteFilterExtensionObjectReference = LocalObjectReference // HTTPHeaderFilter defines the filter behavior for a request match. @@ -229,18 +231,21 @@ type HTTPRouteAction struct { // action within a known namespace. // // +k8s:deepcopy-gen=false +// +protobuf=false type RouteActionTargetObjectReference = LocalObjectReference // RouteActionExtensionObjectReference identifies a route-action extension // object within a known namespace. // // +k8s:deepcopy-gen=false +// +protobuf=false type RouteActionExtensionObjectReference = LocalObjectReference // RouteHostExtensionObjectReference identifies a route-host extension object // within a known namespace. // // +k8s:deepcopy-gen=false +// +protobuf=false type RouteHostExtensionObjectReference = LocalObjectReference // HTTPRouteStatus defines the observed state of HTTPRoute. diff --git a/kubebuilder.mk b/kubebuilder.mk index 5a211705d0..4e7fa321fb 100644 --- a/kubebuilder.mk +++ b/kubebuilder.mk @@ -85,6 +85,7 @@ generate: proto: $(DOCKER) run -it \ --mount type=bind,source=$(ROOT),target=/go/src/sigs.k8s.io/service-apis \ + --mount type=bind,source=$(GOPATH)/pkg/mod,target=/go/pkg/mod \ --env GOPATH=/go \ --env GOCACHE=/go/.cache \ --rm \