From ffabc725dfdc464d69f4c8d660cd2eb092db2a2c Mon Sep 17 00:00:00 2001 From: Fangyuan Li Date: Tue, 28 Apr 2020 11:18:22 -0700 Subject: [PATCH 1/2] Make fields in Conditions required 1. As recommended here: https://github.com/kubernetes/enhancements/pull/1624, mark Message, Reason, LastTransitionTime, Type and Status required fields; 2. Change pointer fields to non-pointers; --- api/v1alpha1/gateway_types.go | 20 ++++++++++++++------ api/v1alpha1/gatewayclass_types.go | 16 ++++++++++------ 2 files changed, 24 insertions(+), 12 deletions(-) diff --git a/api/v1alpha1/gateway_types.go b/api/v1alpha1/gateway_types.go index 3e59f67688..6468c7281d 100644 --- a/api/v1alpha1/gateway_types.go +++ b/api/v1alpha1/gateway_types.go @@ -269,18 +269,22 @@ const ( // GatewayCondition is an error status for a given route. type GatewayCondition struct { // Type indicates the type of condition. + // +required 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". + // +required 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 + // This field may be empty. + // +required Message string `json:"message,omitempty" protobuf:"bytes,3,opt,name=message"` // Reason indicates why the condition is in this state. - // +optional + // This field must not be empty. + // +required Reason string `json:"reason,omitempty" protobuf:"bytes,4,opt,name=reason"` // LastTransitionTime indicates the last time this condition changed. - // +optional + // +required LastTransitionTime metav1.Time `json:"lastTransitionTime,omitempty" protobuf:"bytes,5,opt,name=lastTransitionTime"` } @@ -321,18 +325,22 @@ const ( // ListenerCondition is an error status for a given listener. type ListenerCondition struct { // Type indicates the type of condition. + // +required 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". + // +required 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 + // This field may be empty. + // +required Message string `json:"message,omitempty" protobuf:"bytes,3,opt,name=message"` // Reason indicates why the condition is in this state. - // +optional + // This field must not be empty. + // +required Reason string `json:"reason,omitempty" protobuf:"bytes,4,opt,name=reason"` // LastTransitionTime indicates the last time this condition changed. - // +optional + // +required LastTransitionTime metav1.Time `json:"lastTransitionTime,omitempty" protobuf:"bytes,5,opt,name=lastTransitionTime"` } diff --git a/api/v1alpha1/gatewayclass_types.go b/api/v1alpha1/gatewayclass_types.go index 92722eda40..014b222a2a 100644 --- a/api/v1alpha1/gatewayclass_types.go +++ b/api/v1alpha1/gatewayclass_types.go @@ -148,8 +148,10 @@ type GatewayClassStatus struct { // Support: Core, unless otherwise specified. type GatewayClassCondition struct { // Type of this condition. + // +required Type GatewayClassConditionType `json:"type" protobuf:"bytes,1,opt,name=type"` // Status of this condition. + // +required Status GatewayClassConditionStatus `json:"status" protobuf:"bytes,2,opt,name=status"` // Reason is a machine consumable string for the last @@ -157,17 +159,19 @@ type GatewayClassCondition struct { // string. Reason will be defined by the controller. // // Support: Custom; values will be controller-specific. + // This field must not be empty. // - // +optional - Reason *string `json:"reason,omitempty" protobuf:"bytes,3,opt,name=reason"` + // +required + Reason string `json:"reason,omitempty" protobuf:"bytes,3,opt,name=reason"` // Message is a human readable reason for last transition. + // This field may be empty. // - // +optional - Message *string `json:"message,omitempty" protobuf:"bytes,4,opt,name=message"` + // +required + Message string `json:"message,omitempty" protobuf:"bytes,4,opt,name=message"` // LastTransitionTime is the time of the last change to this condition. // - // +optional - LastTransitionTime *metav1.Time `json:"lastTransitionTime,omitempty" protobuf:"bytes,5,opt,name=lastTransitionTime"` + // +required + LastTransitionTime metav1.Time `json:"lastTransitionTime,omitempty" protobuf:"bytes,5,opt,name=lastTransitionTime"` } // +kubebuilder:object:root=true From 9dfdb75f45d6fcf457fdbe9d533c6019701ff494 Mon Sep 17 00:00:00 2001 From: Fangyuan Li Date: Tue, 28 Apr 2020 14:17:17 -0700 Subject: [PATCH 2/2] Update proto and crd 1. Run `make -f kubebuilder.mk proto`; --- api/v1alpha1/generated.pb.go | 345 +++++++++--------- api/v1alpha1/generated.proto | 30 +- .../networking.x-k8s.io_gatewayclasses.yaml | 4 +- .../bases/networking.x-k8s.io_gateways.yaml | 7 +- 4 files changed, 192 insertions(+), 194 deletions(-) diff --git a/api/v1alpha1/generated.pb.go b/api/v1alpha1/generated.pb.go index b7e0ce4609..fa6a592302 100644 --- a/api/v1alpha1/generated.pb.go +++ b/api/v1alpha1/generated.pb.go @@ -1130,141 +1130,141 @@ func init() { } var fileDescriptor_40fafbfb106ed5b2 = []byte{ - // 2143 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x59, 0xcd, 0x8f, 0x1b, 0x49, - 0x15, 0x4f, 0xfb, 0x63, 0xc6, 0x7e, 0xf3, 0x99, 0x62, 0x36, 0x78, 0x87, 0x95, 0x3d, 0xea, 0x65, - 0x51, 0x12, 0x48, 0x3b, 0x99, 0x0d, 0x61, 0x12, 0x96, 0xc3, 0x78, 0xd8, 0xec, 0x20, 0x4d, 0x92, - 0xd9, 0x1a, 0x13, 0x76, 0x97, 0x68, 0xa1, 0xd2, 0x2e, 0x7b, 0x9a, 0x69, 0xbb, 0xad, 0xee, 0xf2, - 0x84, 0x91, 0x38, 0xb0, 0x11, 0x12, 0x07, 0x2e, 0xcb, 0x11, 0xad, 0x38, 0xed, 0x3f, 0xc1, 0x85, - 0x7b, 0xc4, 0x69, 0x2f, 0x48, 0x2b, 0x0e, 0x86, 0x38, 0x42, 0x1c, 0x39, 0x20, 0x90, 0xc8, 0x09, - 0xd5, 0x47, 0x97, 0xbb, 0xdb, 0xf6, 0xa4, 0x9d, 0x64, 0x40, 0x83, 0xf6, 0xd6, 0xf5, 0xea, 0xd5, - 0xaf, 0x5e, 0xbd, 0x7a, 0xf5, 0xab, 0x57, 0xaf, 0xe1, 0x9b, 0x81, 0xd3, 0x0a, 0xac, 0x83, 0x8d, - 0xc0, 0x72, 0xbc, 0x6a, 0x40, 0xfd, 0x43, 0xc7, 0xa6, 0x97, 0x48, 0xd7, 0x09, 0xaa, 0xa4, 0xeb, - 0x54, 0x0f, 0xaf, 0x10, 0xb7, 0xbb, 0x4f, 0xae, 0x54, 0x5b, 0xb4, 0x43, 0x7d, 0xc2, 0x68, 0xc3, - 0xea, 0xfa, 0x1e, 0xf3, 0xd0, 0x9a, 0x1c, 0x61, 0xa9, 0x11, 0x3f, 0xe2, 0x23, 0x2c, 0xd2, 0x75, - 0xac, 0x70, 0xc4, 0xea, 0xa5, 0x96, 0xc3, 0xf6, 0x7b, 0xf7, 0x2d, 0xdb, 0x6b, 0x57, 0x5b, 0x5e, - 0xcb, 0xab, 0x8a, 0x81, 0xf7, 0x7b, 0x4d, 0xd1, 0x12, 0x0d, 0xf1, 0x25, 0x01, 0x57, 0x4d, 0x65, - 0x02, 0x9f, 0xd5, 0xf6, 0x7c, 0x5a, 0x3d, 0x1c, 0x99, 0x74, 0xf5, 0xea, 0x50, 0xa7, 0x4d, 0xec, - 0x7d, 0xa7, 0x43, 0xfd, 0xa3, 0x6a, 0xf7, 0xa0, 0x55, 0x15, 0xf6, 0xb6, 0x29, 0x23, 0xe3, 0x46, - 0x5d, 0x9b, 0x34, 0xca, 0xef, 0x75, 0x98, 0xd3, 0xa6, 0xd5, 0xc0, 0xde, 0xa7, 0x6d, 0x32, 0x32, - 0xee, 0x7a, 0xd4, 0x33, 0xb6, 0xd7, 0x61, 0xbe, 0xe7, 0xba, 0xd4, 0xbf, 0x14, 0x0e, 0xe3, 0x10, - 0x62, 0x28, 0x4d, 0x0e, 0x35, 0x7f, 0x67, 0xc0, 0xd2, 0x4d, 0xcf, 0x7f, 0x40, 0xfc, 0x46, 0xdd, - 0xab, 0x13, 0xbf, 0x45, 0x19, 0x6a, 0x41, 0x91, 0x89, 0x2f, 0x4c, 0x9b, 0x25, 0x63, 0xcd, 0x38, - 0x3f, 0xb7, 0x7e, 0xcd, 0x7a, 0x96, 0x17, 0xad, 0x1d, 0xcf, 0x26, 0xee, 0x9d, 0xfb, 0x3f, 0xa1, - 0x36, 0x1f, 0x47, 0x7d, 0xda, 0xb1, 0x69, 0xed, 0xec, 0xa3, 0x7e, 0xe5, 0xcc, 0xa0, 0x5f, 0x29, - 0xd6, 0x43, 0x40, 0x3c, 0xc4, 0x46, 0x6f, 0x01, 0xc8, 0xc6, 0xae, 0xe7, 0xb3, 0x52, 0x66, 0xcd, - 0x38, 0x9f, 0xaf, 0xbd, 0x36, 0xe8, 0x57, 0xa0, 0xae, 0xa5, 0x4f, 0x63, 0x2d, 0x1c, 0xd1, 0x37, - 0xff, 0x91, 0x81, 0xd9, 0x77, 0x08, 0xa3, 0x0f, 0xc8, 0x11, 0xba, 0x07, 0x05, 0x76, 0xd4, 0xa5, - 0xb7, 0x28, 0x23, 0xca, 0x62, 0x2b, 0xb4, 0x38, 0xea, 0x4c, 0xab, 0x7b, 0xd0, 0xb2, 0x84, 0xe9, - 0x7c, 0x0b, 0xac, 0xc3, 0x2b, 0x56, 0x5d, 0x8d, 0xaa, 0x2d, 0x2b, 0x4b, 0x0b, 0xa1, 0x04, 0x6b, - 0x44, 0xf4, 0x63, 0x28, 0x70, 0xfd, 0x06, 0x61, 0x44, 0x58, 0x39, 0xb7, 0x7e, 0x39, 0x1d, 0xba, - 0x74, 0x87, 0xc0, 0x47, 0x0a, 0x1f, 0x86, 0x32, 0xac, 0x51, 0xd1, 0x1d, 0xc8, 0x05, 0x5d, 0x6a, - 0x97, 0xb2, 0x02, 0xfd, 0xd2, 0xb3, 0xbd, 0xad, 0x16, 0xbe, 0xd7, 0xa5, 0x76, 0x6d, 0x5e, 0x41, - 0xe7, 0x78, 0x0b, 0x0b, 0x20, 0xf4, 0x03, 0x98, 0x09, 0x18, 0x61, 0xbd, 0xa0, 0x94, 0x13, 0x90, - 0xd5, 0xf4, 0x90, 0x62, 0x58, 0x6d, 0x51, 0x81, 0xce, 0xc8, 0x36, 0x56, 0x70, 0xe6, 0xc3, 0x2c, - 0xcc, 0x2b, 0xcd, 0x2d, 0x97, 0x04, 0x41, 0xcc, 0xf5, 0xb9, 0x13, 0x75, 0xbd, 0x71, 0x22, 0xae, - 0xaf, 0x2b, 0xd7, 0xcb, 0x8d, 0x5d, 0x4f, 0xed, 0x27, 0xb1, 0xfa, 0x89, 0xfe, 0xbf, 0xa7, 0xfd, - 0x2f, 0xb7, 0xf4, 0xea, 0x94, 0xb8, 0xc7, 0x6f, 0xc2, 0x93, 0x0c, 0xbc, 0x12, 0x55, 0xdf, 0xf2, - 0x3a, 0x0d, 0x87, 0x39, 0x5e, 0x07, 0x7d, 0x07, 0x72, 0xdc, 0x77, 0xc2, 0x57, 0xc5, 0xda, 0x85, - 0xd0, 0x32, 0xee, 0xd9, 0xa7, 0xfd, 0xca, 0xab, 0x63, 0x07, 0xf1, 0x4e, 0x2c, 0x86, 0xa1, 0x1d, - 0x6d, 0x76, 0x46, 0x00, 0x5c, 0x8d, 0x1b, 0xf0, 0xb4, 0x5f, 0x19, 0xc3, 0x7e, 0x96, 0x46, 0x8a, - 0x9b, 0x89, 0x4c, 0x98, 0xf1, 0x29, 0x09, 0xbc, 0x8e, 0x70, 0x42, 0xb1, 0x06, 0x1c, 0x09, 0x0b, - 0x09, 0x56, 0x3d, 0xe8, 0x0d, 0x98, 0x6d, 0xd3, 0x20, 0x20, 0x2d, 0x2a, 0xa2, 0xa7, 0x58, 0x9b, - 0x1b, 0xf4, 0x2b, 0xb3, 0xb7, 0xa4, 0x08, 0x87, 0x7d, 0xc8, 0x07, 0xe4, 0x92, 0x80, 0xd5, 0x7d, - 0xd2, 0x09, 0xa4, 0xd1, 0x4e, 0x9b, 0x96, 0xf2, 0xc2, 0xb7, 0x17, 0x53, 0xc6, 0x9b, 0xd3, 0xa6, - 0xb5, 0x73, 0x83, 0x7e, 0x05, 0xed, 0x8c, 0x20, 0xe1, 0x31, 0xe8, 0xe6, 0xa7, 0x19, 0x58, 0x8e, - 0x3a, 0x6c, 0xc7, 0x09, 0x58, 0x2c, 0xdc, 0xb3, 0x2f, 0x3d, 0xdc, 0xef, 0x8d, 0x84, 0x7b, 0x4a, - 0x74, 0x6e, 0x5b, 0x1c, 0x3d, 0x94, 0x44, 0x42, 0x7d, 0x0f, 0xf2, 0x0e, 0xa3, 0x6d, 0xbe, 0xb9, - 0xd9, 0x28, 0x74, 0xba, 0x98, 0xac, 0x2d, 0x28, 0xe8, 0xfc, 0xf7, 0x38, 0x08, 0x96, 0x58, 0xe6, - 0x1f, 0xb3, 0x71, 0x2f, 0xf1, 0x43, 0x80, 0xd6, 0x01, 0x86, 0xf7, 0x90, 0x0a, 0x46, 0x7d, 0x0c, - 0xb7, 0x74, 0x0f, 0x8e, 0x68, 0xa1, 0x5f, 0x1b, 0x50, 0x22, 0xae, 0xeb, 0x3d, 0xa0, 0x0d, 0x85, - 0x77, 0x9b, 0xb4, 0x69, 0xd0, 0x25, 0x36, 0x0d, 0xd4, 0xe9, 0x7c, 0x33, 0xa5, 0x33, 0xc8, 0x7d, - 0xea, 0xee, 0x51, 0x97, 0xda, 0xcc, 0xf3, 0x6b, 0x6b, 0x6a, 0xde, 0xd2, 0xe6, 0x04, 0x70, 0x3c, - 0x71, 0x5a, 0xf4, 0x4b, 0x03, 0xce, 0xa9, 0x4e, 0xec, 0xf5, 0x18, 0x8d, 0x58, 0x94, 0x7d, 0x7e, - 0x8b, 0x56, 0x07, 0xfd, 0xca, 0xb9, 0xcd, 0xb1, 0xb0, 0x78, 0xc2, 0x74, 0xc8, 0x83, 0x85, 0x2e, - 0xf1, 0x49, 0x9b, 0x32, 0xea, 0x07, 0xfc, 0x62, 0xce, 0xbd, 0xd8, 0xc5, 0x3c, 0xe8, 0x57, 0x16, - 0x76, 0xa3, 0x80, 0x38, 0x8e, 0x6f, 0x7e, 0x64, 0x00, 0x1a, 0xa5, 0x24, 0x74, 0x20, 0x76, 0x56, - 0x1e, 0xf7, 0xa0, 0x64, 0x88, 0x40, 0xfa, 0xd6, 0x74, 0x81, 0xa4, 0xe9, 0x22, 0x16, 0x12, 0x0a, - 0x12, 0x47, 0xe0, 0xcd, 0xbf, 0x46, 0x4e, 0xa0, 0xa6, 0xb8, 0x8d, 0x18, 0xc5, 0x7d, 0x35, 0x41, - 0x71, 0x2b, 0x49, 0xfd, 0x13, 0x63, 0xb7, 0x0b, 0x43, 0xe6, 0x92, 0xf4, 0xb6, 0xa4, 0xe0, 0x46, - 0xd9, 0xeb, 0x6b, 0x9a, 0x08, 0x25, 0xc7, 0x69, 0x5e, 0x4f, 0x90, 0xe1, 0xe1, 0x4b, 0x62, 0xb9, - 0x55, 0x85, 0x9f, 0x96, 0xe9, 0x7e, 0x93, 0x81, 0x39, 0xe5, 0xb7, 0x11, 0x92, 0x33, 0x4e, 0x94, - 0xe4, 0x32, 0x2f, 0x9d, 0xe4, 0x6e, 0x87, 0x24, 0x97, 0x15, 0xb1, 0x79, 0x21, 0x75, 0x6c, 0x4e, - 0xe0, 0xb7, 0x03, 0x38, 0xa7, 0x14, 0x12, 0x67, 0x08, 0x55, 0xa1, 0xd8, 0x09, 0x0f, 0xa8, 0x8a, - 0x46, 0x9d, 0xef, 0xea, 0x93, 0x8b, 0x87, 0x3a, 0x68, 0x0d, 0x72, 0xbc, 0xa1, 0xa2, 0x4f, 0xa7, - 0x0d, 0x5c, 0x17, 0x8b, 0x1e, 0xf3, 0xef, 0x86, 0xde, 0x08, 0xc1, 0xa3, 0xaf, 0x43, 0xde, 0xe6, - 0x47, 0x46, 0xc1, 0x6b, 0x0b, 0xc5, 0x39, 0xc2, 0xb2, 0x0f, 0xfd, 0x10, 0x8a, 0xae, 0x13, 0x30, - 0x9e, 0xd9, 0x87, 0xd4, 0x7e, 0x31, 0x05, 0x2d, 0xa8, 0x21, 0x43, 0x9b, 0x43, 0x49, 0x80, 0x87, - 0x78, 0xe8, 0x43, 0x98, 0xf1, 0x39, 0x15, 0x85, 0x84, 0x97, 0x82, 0x70, 0x04, 0x75, 0xd5, 0x9c, - 0x4e, 0xc3, 0xe9, 0xb4, 0x34, 0xe7, 0x0d, 0x43, 0x5e, 0xa0, 0x61, 0x85, 0x6a, 0xfe, 0xc9, 0x80, - 0x85, 0x58, 0xe6, 0x89, 0x9a, 0x63, 0x18, 0x66, 0x8a, 0xb4, 0x2c, 0x2d, 0xb9, 0x20, 0x32, 0xea, - 0xb6, 0xcb, 0xe9, 0xdd, 0xa6, 0x32, 0xb4, 0x63, 0x9d, 0x67, 0xfe, 0xc1, 0x80, 0xe5, 0xed, 0x7a, - 0x7d, 0x77, 0x9b, 0x92, 0x06, 0xf5, 0x6f, 0x3a, 0x2e, 0xa3, 0x3e, 0xfa, 0x00, 0xb2, 0xa4, 0xd1, - 0x50, 0x0b, 0xfb, 0xf6, 0xb3, 0x67, 0x4c, 0x02, 0x58, 0x9b, 0x8d, 0xc6, 0xdb, 0x1d, 0xe6, 0x1f, - 0xd5, 0xe6, 0xd4, 0xe4, 0xd9, 0xcd, 0x46, 0x03, 0x73, 0x50, 0x99, 0x71, 0xb5, 0xbd, 0x43, 0x2a, - 0x16, 0xa4, 0x33, 0x2e, 0x2e, 0xc1, 0xaa, 0x67, 0xf5, 0x1a, 0x14, 0x42, 0x04, 0xb4, 0x0c, 0xd9, - 0x03, 0x7a, 0x24, 0xa3, 0x0b, 0xf3, 0x4f, 0xb4, 0x02, 0xf9, 0x43, 0xe2, 0xf6, 0x54, 0x90, 0x62, - 0xd9, 0xb8, 0x91, 0xd9, 0x30, 0xcc, 0x7f, 0x67, 0xa0, 0xc8, 0x6d, 0x11, 0x1b, 0x78, 0xea, 0x5f, - 0x5c, 0xef, 0xc6, 0x5e, 0x5c, 0xd5, 0x74, 0xdb, 0x20, 0x96, 0x3e, 0x31, 0xe7, 0x7f, 0x3f, 0xf1, - 0xe6, 0xba, 0x32, 0x0d, 0xe8, 0xf1, 0x09, 0xff, 0x9f, 0x0d, 0x58, 0xd2, 0xba, 0x9b, 0xb6, 0xb8, - 0x07, 0x3f, 0x84, 0x62, 0x33, 0x7c, 0xb9, 0xab, 0x2d, 0x48, 0x31, 0x63, 0xe2, 0xb1, 0x5f, 0x5b, - 0xe0, 0xc1, 0xab, 0x85, 0x78, 0x08, 0x89, 0x5c, 0x98, 0xa7, 0x3f, 0x65, 0xb4, 0x13, 0x38, 0x5e, - 0x87, 0x27, 0x1c, 0x99, 0x17, 0x4a, 0x38, 0x96, 0x07, 0xfd, 0xca, 0xfc, 0xdb, 0x11, 0x3c, 0x1c, - 0x43, 0xe7, 0x3c, 0x30, 0x5c, 0xa1, 0x3a, 0x29, 0xef, 0xc3, 0xec, 0xbe, 0x08, 0xfc, 0x40, 0xad, - 0x6f, 0x7d, 0xfa, 0xd3, 0x22, 0xdf, 0x13, 0x52, 0x12, 0xe0, 0x10, 0xef, 0xbf, 0xbc, 0xb8, 0x8f, - 0x32, 0xb0, 0xa0, 0x17, 0xb7, 0xed, 0x05, 0x0c, 0x7d, 0x03, 0x0a, 0xfb, 0x5e, 0xc0, 0xc4, 0x75, - 0x20, 0xb9, 0x5d, 0x1f, 0x87, 0x6d, 0x25, 0xc7, 0x5a, 0x03, 0xd5, 0x21, 0xef, 0xf7, 0x5c, 0x1a, - 0xd2, 0xd4, 0x34, 0xd1, 0x8a, 0x7b, 0x2e, 0x1d, 0xde, 0x1b, 0xbc, 0x15, 0x60, 0x09, 0x36, 0xe2, - 0x83, 0xec, 0x89, 0xfa, 0xe0, 0xb7, 0x51, 0x1f, 0x9c, 0xfa, 0x2c, 0x63, 0x37, 0x9e, 0x65, 0x7c, - 0x7d, 0x8a, 0x1d, 0x99, 0x90, 0x67, 0x7c, 0x92, 0x85, 0x45, 0xad, 0x73, 0x8b, 0x30, 0x7b, 0x9f, - 0x07, 0x49, 0x97, 0xb0, 0xfd, 0xfa, 0x30, 0xdb, 0xd5, 0x26, 0xed, 0x2a, 0x39, 0xd6, 0x1a, 0xe8, - 0x35, 0xc8, 0xf1, 0x6f, 0x95, 0x5d, 0x14, 0x38, 0x39, 0x71, 0x2d, 0x2c, 0xa4, 0xc8, 0x02, 0x90, - 0xb1, 0x2f, 0xd0, 0x64, 0xc2, 0xba, 0xc8, 0xd9, 0x71, 0x5b, 0x4b, 0x71, 0x44, 0x03, 0x35, 0x60, - 0x46, 0xb6, 0x4a, 0x39, 0xb1, 0xc2, 0xb7, 0xa6, 0x58, 0xa1, 0xb0, 0xde, 0x92, 0xc0, 0xf2, 0xa6, - 0xd2, 0xbc, 0x26, 0x85, 0x58, 0x61, 0x8f, 0x84, 0x60, 0xfe, 0x24, 0x43, 0x70, 0xf5, 0x3a, 0xcc, - 0x45, 0x8c, 0x9a, 0xea, 0xf2, 0xfb, 0x38, 0x1a, 0xbd, 0xfc, 0x14, 0xa1, 0x77, 0x21, 0xdf, 0xe6, - 0xeb, 0x4c, 0x96, 0xa5, 0xd2, 0xfa, 0xa7, 0x56, 0xe4, 0x21, 0x20, 0x3e, 0xb1, 0x44, 0x42, 0xdf, - 0x87, 0x99, 0xa6, 0x20, 0x2d, 0x15, 0xb0, 0xd3, 0x5c, 0x20, 0x8a, 0xed, 0xc4, 0x85, 0x2f, 0xbf, - 0xb1, 0x02, 0xe3, 0xb0, 0x44, 0x5c, 0x19, 0xea, 0x84, 0x4f, 0x03, 0x2b, 0xef, 0x1a, 0x09, 0x2b, - 0xbf, 0xb1, 0x02, 0x33, 0x7f, 0x6f, 0x44, 0x5c, 0x22, 0xb2, 0xd5, 0x3a, 0xe4, 0x39, 0x65, 0x85, - 0x49, 0xdb, 0x34, 0x34, 0xc5, 0x49, 0x6f, 0x78, 0x30, 0x78, 0x2b, 0xc0, 0x12, 0x0c, 0xdd, 0x85, - 0xd9, 0x06, 0x6d, 0x92, 0x9e, 0xcb, 0x94, 0x5b, 0xa6, 0xc6, 0x15, 0x57, 0xc0, 0x77, 0x25, 0x06, - 0x0e, 0xc1, 0xcc, 0x87, 0xd1, 0x1b, 0x47, 0xe5, 0x9e, 0x1e, 0xcc, 0xb5, 0x64, 0x1e, 0x89, 0x69, - 0x33, 0x5c, 0xc7, 0x46, 0xea, 0xe4, 0x33, 0x19, 0x90, 0x5f, 0x52, 0x0b, 0x0a, 0x73, 0x7a, 0x0e, - 0x8a, 0xa3, 0x33, 0x98, 0xbf, 0xc8, 0x42, 0x21, 0x4c, 0x1d, 0xf5, 0xfb, 0xc0, 0x98, 0xf4, 0x3e, - 0x40, 0xef, 0xc1, 0x2c, 0x69, 0x34, 0x7c, 0x1a, 0x04, 0xe9, 0x43, 0x24, 0x84, 0xdf, 0x94, 0x03, - 0xa5, 0x37, 0x54, 0x03, 0x87, 0x70, 0x82, 0x3d, 0x3c, 0x9f, 0x89, 0x10, 0xc9, 0x2b, 0xf6, 0xf0, - 0x7c, 0x86, 0x85, 0x14, 0x9d, 0x87, 0x82, 0xf8, 0x5f, 0x60, 0x7b, 0xae, 0x7a, 0xc2, 0xce, 0x0b, - 0x16, 0x52, 0x32, 0xac, 0x7b, 0xd1, 0x4d, 0xc8, 0x32, 0x37, 0x50, 0x07, 0x39, 0x05, 0x2d, 0xd6, - 0x77, 0xf6, 0xb6, 0xbc, 0x4e, 0xd3, 0x69, 0xd5, 0x66, 0x79, 0x26, 0x5b, 0xdf, 0xd9, 0xc3, 0x1c, - 0x60, 0x84, 0x19, 0x66, 0x4e, 0xf4, 0x72, 0x6a, 0xc1, 0x52, 0xc2, 0x4d, 0xa8, 0x1a, 0x2b, 0x33, - 0x7c, 0x25, 0x51, 0x66, 0x98, 0x53, 0x6a, 0x91, 0xea, 0xc2, 0xeb, 0x31, 0xf2, 0x18, 0x06, 0xf3, - 0x5d, 0x2e, 0x54, 0x5c, 0x62, 0xfe, 0x2d, 0x03, 0x67, 0xc3, 0x99, 0x86, 0x25, 0x8d, 0xeb, 0xb1, - 0xb9, 0xde, 0x48, 0xcc, 0xf5, 0xca, 0xc8, 0x80, 0x2f, 0x6a, 0x1a, 0xcf, 0xae, 0x69, 0xfc, 0xd3, - 0x80, 0xc5, 0xf8, 0x63, 0xed, 0x7f, 0x7a, 0xbe, 0x5a, 0xb1, 0x57, 0xad, 0xcc, 0x1a, 0xde, 0x4c, - 0x0f, 0x9e, 0xbe, 0x66, 0xf6, 0x2b, 0x03, 0x56, 0xc6, 0x9d, 0x01, 0x1e, 0x9f, 0x2d, 0xdf, 0xeb, - 0x75, 0x93, 0xb5, 0x84, 0x77, 0xb8, 0x10, 0xcb, 0x3e, 0x9e, 0x72, 0xf8, 0x34, 0xf0, 0x7a, 0xbe, - 0x1d, 0xc6, 0xb1, 0x4e, 0x39, 0xb0, 0x92, 0x63, 0xad, 0xa1, 0x1d, 0x9a, 0x9d, 0x58, 0xd0, 0x78, - 0x98, 0x81, 0x95, 0x71, 0xf5, 0x00, 0xf4, 0x33, 0x38, 0xab, 0x0b, 0x23, 0xa1, 0x50, 0x5d, 0xa5, - 0xcf, 0x55, 0x53, 0x7d, 0x55, 0x4d, 0x7e, 0xf6, 0x76, 0x12, 0x15, 0x8f, 0x4e, 0x84, 0x5c, 0x58, - 0x10, 0xf5, 0x07, 0x3d, 0xf3, 0x0b, 0xd4, 0x97, 0x45, 0x29, 0x15, 0x47, 0xd1, 0x70, 0x1c, 0xdc, - 0x7c, 0x92, 0x81, 0xa2, 0xe6, 0x39, 0x74, 0x04, 0x4b, 0x36, 0xf5, 0x99, 0xd3, 0x74, 0x6c, 0xc2, - 0x68, 0xe4, 0x9e, 0x79, 0x5e, 0x72, 0xfb, 0xb2, 0x5a, 0xfa, 0xd2, 0x56, 0x1c, 0x16, 0x27, 0xe7, - 0x41, 0x37, 0x60, 0xb1, 0xed, 0x74, 0x9c, 0x76, 0xaf, 0x7d, 0x97, 0xfa, 0x9c, 0xfb, 0xd4, 0x1e, - 0xa3, 0x41, 0xbf, 0xb2, 0x78, 0x2b, 0xd6, 0x83, 0x13, 0x9a, 0xc8, 0x86, 0x59, 0xaf, 0x1b, 0x8d, - 0xde, 0x8d, 0x29, 0xc8, 0xdd, 0xba, 0x23, 0x87, 0xca, 0x6c, 0x50, 0x93, 0x8a, 0x92, 0xe2, 0x10, - 0x79, 0xf5, 0x06, 0xcc, 0x47, 0x35, 0xa7, 0x4a, 0xd1, 0xfe, 0x95, 0x81, 0x42, 0xdd, 0xee, 0xfe, - 0x7f, 0x94, 0x27, 0x76, 0x63, 0xe5, 0x89, 0x14, 0x7f, 0x6a, 0xc2, 0x95, 0x4f, 0xac, 0x4e, 0xbc, - 0x97, 0xa8, 0x4e, 0x5c, 0x9e, 0x02, 0xf3, 0xf8, 0xe2, 0xc4, 0x27, 0x19, 0x98, 0x0f, 0x55, 0x4f, - 0xfd, 0xc3, 0xee, 0x4e, 0xfc, 0x61, 0x77, 0x31, 0xbd, 0x97, 0x26, 0xbc, 0xeb, 0x16, 0x87, 0xce, - 0xe1, 0xbb, 0x61, 0x2e, 0xc3, 0x62, 0xdc, 0xaf, 0xe2, 0x97, 0x7a, 0xdd, 0x27, 0xcd, 0xa6, 0x63, - 0xef, 0x75, 0x5d, 0x87, 0x9d, 0xfa, 0xe0, 0xad, 0xc7, 0x82, 0x37, 0x45, 0xd1, 0x26, 0xba, 0xfa, - 0x14, 0xbf, 0xd4, 0x73, 0x69, 0x7f, 0xa9, 0xc7, 0x70, 0x8f, 0x0f, 0xe2, 0x4f, 0x33, 0xb0, 0x1c, - 0x55, 0x3f, 0xf5, 0x81, 0xbc, 0x17, 0x0f, 0x64, 0x6b, 0x3a, 0x6f, 0x4d, 0x08, 0x66, 0x14, 0x77, - 0x92, 0x08, 0xe8, 0x15, 0x40, 0x63, 0xfc, 0x6c, 0x3d, 0x7a, 0x5c, 0x3e, 0xf3, 0xd9, 0xe3, 0xf2, - 0x99, 0xcf, 0x1f, 0x97, 0xcf, 0xfc, 0x7c, 0x50, 0x36, 0x1e, 0x0d, 0xca, 0xc6, 0x67, 0x83, 0xb2, - 0xf1, 0xf9, 0xa0, 0x6c, 0xfc, 0x65, 0x50, 0x36, 0x3e, 0x7e, 0x52, 0x3e, 0xf3, 0x41, 0x21, 0x9c, - 0xfc, 0x3f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x6a, 0x96, 0x35, 0x76, 0xde, 0x25, 0x00, 0x00, + // 2130 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x59, 0xcd, 0x8f, 0x1c, 0x47, + 0x15, 0x77, 0xcf, 0xc7, 0xee, 0xcc, 0xdb, 0x4f, 0x17, 0x1b, 0x33, 0x59, 0xa2, 0x99, 0x55, 0x07, + 0x90, 0x6d, 0x70, 0x8f, 0xbd, 0x31, 0x66, 0x6d, 0xc2, 0x61, 0x67, 0x89, 0xb3, 0x48, 0x6b, 0x7b, + 0x53, 0x3b, 0x98, 0x24, 0x58, 0x81, 0x72, 0x4f, 0xcd, 0x6c, 0xb3, 0x3d, 0xd3, 0xa3, 0xee, 0x9a, + 0x35, 0x2b, 0x71, 0x20, 0x16, 0x12, 0x07, 0x2e, 0xe1, 0x88, 0x22, 0x4e, 0xf9, 0x27, 0xb8, 0x70, + 0xb7, 0x38, 0xe5, 0x82, 0x14, 0x71, 0x18, 0xf0, 0x44, 0x88, 0x63, 0x0e, 0x08, 0x24, 0x7c, 0x42, + 0xf5, 0xd1, 0xd5, 0xdd, 0xf3, 0xb1, 0xdb, 0x63, 0x67, 0x89, 0x16, 0x71, 0xeb, 0x7a, 0xf5, 0xea, + 0x57, 0xaf, 0x5e, 0xbd, 0xfa, 0xd5, 0xab, 0xd7, 0xf0, 0xad, 0xc0, 0x69, 0x05, 0xd6, 0xc1, 0x46, + 0x60, 0x39, 0x5e, 0x35, 0xa0, 0xfe, 0xa1, 0x63, 0xd3, 0x2b, 0xa4, 0xeb, 0x04, 0x55, 0xd2, 0x75, + 0xaa, 0x87, 0xd7, 0x88, 0xdb, 0xdd, 0x27, 0xd7, 0xaa, 0x2d, 0xda, 0xa1, 0x3e, 0x61, 0xb4, 0x61, + 0x75, 0x7d, 0x8f, 0x79, 0x68, 0x4d, 0x8e, 0xb0, 0xd4, 0x88, 0x1f, 0xf3, 0x11, 0x16, 0xe9, 0x3a, + 0x56, 0x38, 0x62, 0xf5, 0x4a, 0xcb, 0x61, 0xfb, 0xbd, 0x87, 0x96, 0xed, 0xb5, 0xab, 0x2d, 0xaf, + 0xe5, 0x55, 0xc5, 0xc0, 0x87, 0xbd, 0xa6, 0x68, 0x89, 0x86, 0xf8, 0x92, 0x80, 0xab, 0xa6, 0x32, + 0x81, 0xcf, 0x6a, 0x7b, 0x3e, 0xad, 0x1e, 0x8e, 0x4c, 0xba, 0x7a, 0x3d, 0xd2, 0x69, 0x13, 0x7b, + 0xdf, 0xe9, 0x50, 0xff, 0xa8, 0xda, 0x3d, 0x68, 0x55, 0x85, 0xbd, 0x6d, 0xca, 0xc8, 0xb8, 0x51, + 0x37, 0x26, 0x8d, 0xf2, 0x7b, 0x1d, 0xe6, 0xb4, 0x69, 0x35, 0xb0, 0xf7, 0x69, 0x9b, 0x8c, 0x8c, + 0xbb, 0x19, 0xf7, 0x8c, 0xed, 0x75, 0x98, 0xef, 0xb9, 0x2e, 0xf5, 0xaf, 0x84, 0xc3, 0x38, 0x84, + 0x18, 0x4a, 0x87, 0x87, 0x9a, 0xbf, 0x37, 0x60, 0xe9, 0xb6, 0xe7, 0x3f, 0x22, 0x7e, 0xa3, 0xee, + 0xd5, 0x89, 0xdf, 0xa2, 0x0c, 0xb5, 0xa0, 0xc8, 0xc4, 0x17, 0xa6, 0xcd, 0x92, 0xb1, 0x66, 0x5c, + 0x9c, 0x5b, 0xbf, 0x61, 0x9d, 0xe4, 0x45, 0x6b, 0xc7, 0xb3, 0x89, 0x7b, 0xef, 0xe1, 0x4f, 0xa9, + 0xcd, 0xc7, 0x51, 0x9f, 0x76, 0x6c, 0x5a, 0x3b, 0xff, 0xa4, 0x5f, 0x39, 0x37, 0xe8, 0x57, 0x8a, + 0xf5, 0x10, 0x10, 0x47, 0xd8, 0xe8, 0x75, 0x00, 0xd9, 0xd8, 0xf5, 0x7c, 0x56, 0xca, 0xac, 0x19, + 0x17, 0xf3, 0xb5, 0x57, 0x06, 0xfd, 0x0a, 0xd4, 0xb5, 0xf4, 0x59, 0xa2, 0x85, 0x63, 0xfa, 0xe6, + 0x3f, 0x32, 0x30, 0xfb, 0x26, 0x61, 0xf4, 0x11, 0x39, 0x42, 0x0f, 0xa0, 0xc0, 0x8e, 0xba, 0xf4, + 0x0e, 0x65, 0x44, 0x59, 0x6c, 0x85, 0x16, 0xc7, 0x9d, 0x69, 0x75, 0x0f, 0x5a, 0x96, 0x30, 0x9d, + 0x6f, 0x81, 0x75, 0x78, 0xcd, 0xaa, 0xab, 0x51, 0xb5, 0x65, 0x65, 0x69, 0x21, 0x94, 0x60, 0x8d, + 0x88, 0x7e, 0x02, 0x05, 0xae, 0xdf, 0x20, 0x8c, 0x08, 0x2b, 0xe7, 0xd6, 0xaf, 0xa6, 0x43, 0x97, + 0xee, 0x10, 0xf8, 0x48, 0xe1, 0x43, 0x24, 0xc3, 0x1a, 0x15, 0xdd, 0x83, 0x5c, 0xd0, 0xa5, 0x76, + 0x29, 0x2b, 0xd0, 0xaf, 0x9c, 0xec, 0x6d, 0xb5, 0xf0, 0xbd, 0x2e, 0xb5, 0x6b, 0xf3, 0x0a, 0x3a, + 0xc7, 0x5b, 0x58, 0x00, 0xa1, 0x1f, 0xc2, 0x4c, 0xc0, 0x08, 0xeb, 0x05, 0xa5, 0x9c, 0x80, 0xac, + 0xa6, 0x87, 0x14, 0xc3, 0x6a, 0x8b, 0x0a, 0x74, 0x46, 0xb6, 0xb1, 0x82, 0x33, 0x1f, 0x67, 0x61, + 0x5e, 0x69, 0x6e, 0xb9, 0x24, 0x08, 0x12, 0xae, 0xcf, 0x9d, 0xaa, 0xeb, 0x8d, 0x53, 0x71, 0x7d, + 0x5d, 0xb9, 0x5e, 0x6e, 0xec, 0x7a, 0x6a, 0x3f, 0x89, 0xd5, 0x4f, 0xf4, 0xff, 0x03, 0xed, 0x7f, + 0xb9, 0xa5, 0xd7, 0xa7, 0xc4, 0x3d, 0x7e, 0x13, 0x3e, 0xcb, 0xc0, 0x4b, 0x71, 0xf5, 0x2d, 0xaf, + 0xd3, 0x70, 0x98, 0xe3, 0x75, 0xd0, 0x77, 0x21, 0xc7, 0x7d, 0x27, 0x7c, 0x55, 0xac, 0x5d, 0x0a, + 0x2d, 0xe3, 0x9e, 0x7d, 0xd6, 0xaf, 0xbc, 0x3c, 0x76, 0x10, 0xef, 0xc4, 0x62, 0x18, 0xda, 0xd1, + 0x66, 0x67, 0x04, 0xc0, 0xf5, 0xa4, 0x01, 0xcf, 0xfa, 0x95, 0x31, 0xec, 0x67, 0x69, 0xa4, 0xa4, + 0x99, 0xe8, 0xeb, 0x30, 0xe3, 0x53, 0x12, 0x78, 0x1d, 0xe1, 0x84, 0x62, 0xb4, 0x1c, 0x2c, 0xa4, + 0x58, 0xf5, 0xa2, 0x4b, 0x30, 0xdb, 0xa6, 0x41, 0x40, 0x5a, 0x54, 0x44, 0x50, 0xb1, 0xb6, 0xa4, + 0x14, 0x67, 0xef, 0x48, 0x31, 0x0e, 0xfb, 0xd1, 0x21, 0x20, 0x97, 0x04, 0xac, 0xee, 0x93, 0x4e, + 0x20, 0x8d, 0x77, 0xda, 0xb4, 0x94, 0x17, 0x3e, 0xbe, 0x9c, 0x32, 0xee, 0x9c, 0x36, 0xad, 0xad, + 0xaa, 0x19, 0xd0, 0xce, 0x08, 0x1a, 0x1e, 0x33, 0x83, 0xf9, 0x51, 0x06, 0x96, 0xe3, 0xce, 0xdb, + 0x71, 0x02, 0x96, 0x08, 0xfd, 0xec, 0xe7, 0x1e, 0xfa, 0x0f, 0x46, 0x42, 0x3f, 0x25, 0x3a, 0xb7, + 0x2d, 0x89, 0x1e, 0x4a, 0x62, 0x61, 0xbf, 0x07, 0x79, 0x87, 0xd1, 0x36, 0xdf, 0xe8, 0x6c, 0x1c, + 0x3a, 0x5d, 0x7c, 0xd6, 0x16, 0x14, 0x74, 0xfe, 0xfb, 0x1c, 0x04, 0x4b, 0x2c, 0xf3, 0x4f, 0xd9, + 0xa4, 0x97, 0xf8, 0x81, 0x40, 0xeb, 0x00, 0xd1, 0x9d, 0xa4, 0x02, 0x53, 0x1f, 0xc9, 0x2d, 0xdd, + 0x83, 0x63, 0x5a, 0xe8, 0x37, 0x06, 0x94, 0x88, 0xeb, 0x7a, 0x8f, 0x68, 0x43, 0xe1, 0xdd, 0x25, + 0x6d, 0x1a, 0x74, 0x89, 0x4d, 0x03, 0x75, 0x52, 0x5f, 0x4b, 0xe9, 0x0c, 0xf2, 0x90, 0xba, 0x7b, + 0xd4, 0xa5, 0x36, 0xf3, 0xfc, 0xda, 0x9a, 0x9a, 0xb7, 0xb4, 0x39, 0x01, 0x1c, 0x4f, 0x9c, 0x16, + 0xfd, 0xca, 0x80, 0x0b, 0xaa, 0x13, 0x7b, 0x3d, 0x46, 0x63, 0x16, 0x65, 0x9f, 0xdf, 0xa2, 0xd5, + 0x41, 0xbf, 0x72, 0x61, 0x73, 0x2c, 0x2c, 0x9e, 0x30, 0x1d, 0xf2, 0x60, 0xa1, 0x4b, 0x7c, 0xd2, + 0xa6, 0x8c, 0xfa, 0x01, 0xbf, 0xa4, 0x73, 0x2f, 0x76, 0x49, 0x0f, 0xfa, 0x95, 0x85, 0xdd, 0x38, + 0x20, 0x4e, 0xe2, 0x9b, 0xef, 0x1b, 0x80, 0x46, 0xe9, 0x09, 0x1d, 0x88, 0x9d, 0x95, 0x47, 0x3f, + 0x28, 0x19, 0x22, 0x90, 0xbe, 0x3d, 0x5d, 0x20, 0x69, 0xea, 0x48, 0x84, 0x84, 0x82, 0xc4, 0x31, + 0x78, 0xf3, 0x6f, 0xb1, 0x13, 0xa8, 0xe9, 0x6e, 0x23, 0x41, 0x77, 0x5f, 0x1d, 0xa2, 0xbb, 0x95, + 0x61, 0xfd, 0x53, 0x63, 0xba, 0x18, 0x83, 0x65, 0x4f, 0x60, 0xb0, 0x88, 0x14, 0x73, 0xc7, 0x92, + 0xe2, 0x17, 0xc5, 0x74, 0xbf, 0xcd, 0xc0, 0x9c, 0xf2, 0xdb, 0x08, 0xc9, 0x19, 0xa7, 0x4a, 0x72, + 0x99, 0xcf, 0x9d, 0xe4, 0xee, 0x86, 0x24, 0x97, 0x15, 0xb1, 0x79, 0x29, 0x75, 0x6c, 0x4e, 0xe0, + 0xb7, 0x03, 0xb8, 0xa0, 0x14, 0x86, 0xce, 0x10, 0xaa, 0x42, 0xb1, 0x13, 0x1e, 0x50, 0x15, 0x8d, + 0x3a, 0xf7, 0xd5, 0x27, 0x17, 0x47, 0x3a, 0x68, 0x0d, 0x72, 0xbc, 0xa1, 0xa2, 0x4f, 0xa7, 0x10, + 0x5c, 0x17, 0x8b, 0x1e, 0xf3, 0x33, 0x43, 0x6f, 0x84, 0xe0, 0xd1, 0x57, 0x21, 0x6f, 0xf3, 0x23, + 0xa3, 0xe0, 0xb5, 0x85, 0xe2, 0x1c, 0x61, 0xd9, 0x87, 0x7e, 0x04, 0x45, 0xd7, 0x09, 0x18, 0xcf, + 0xf2, 0x43, 0x6a, 0xbf, 0x9c, 0x82, 0x16, 0xd4, 0x90, 0xc8, 0xe6, 0x50, 0x12, 0xe0, 0x08, 0x0f, + 0xbd, 0x07, 0x33, 0x3e, 0xa7, 0xa2, 0x90, 0xf0, 0x52, 0x10, 0x8e, 0xa0, 0xae, 0x9a, 0xd3, 0x69, + 0x38, 0x9d, 0x96, 0xe6, 0xbc, 0x28, 0xe4, 0x05, 0x1a, 0x56, 0xa8, 0xe6, 0x9f, 0x0d, 0x58, 0x48, + 0x64, 0xa1, 0xa8, 0x39, 0x86, 0x61, 0xa6, 0x48, 0xd1, 0xd2, 0x92, 0x0b, 0x22, 0xa3, 0x6e, 0xbb, + 0x9a, 0xde, 0x6d, 0x2a, 0x5b, 0x3b, 0xd6, 0x79, 0xe6, 0x1f, 0x0d, 0x58, 0xde, 0xae, 0xd7, 0x77, + 0xb7, 0x29, 0x69, 0x50, 0xff, 0xb6, 0xe3, 0x32, 0xea, 0xa3, 0x77, 0x21, 0x4b, 0x1a, 0x0d, 0xb5, + 0xb0, 0xef, 0x9c, 0x3c, 0xe3, 0x30, 0x80, 0xb5, 0xd9, 0x68, 0xbc, 0xd1, 0x61, 0xfe, 0x51, 0x6d, + 0x4e, 0x4d, 0x9e, 0xdd, 0x6c, 0x34, 0x30, 0x07, 0x45, 0x26, 0x27, 0x9a, 0xb6, 0x77, 0x48, 0xc5, + 0x82, 0x8a, 0x35, 0x90, 0x24, 0xc3, 0x25, 0x58, 0xf5, 0xac, 0xde, 0x80, 0x42, 0x88, 0x80, 0x96, + 0x21, 0x7b, 0x40, 0x8f, 0x64, 0x74, 0x61, 0xfe, 0x89, 0x56, 0x20, 0x7f, 0x48, 0xdc, 0x9e, 0x0a, + 0x52, 0x2c, 0x1b, 0xb7, 0x32, 0x1b, 0x86, 0xf9, 0xef, 0x0c, 0x14, 0xb9, 0x2d, 0x62, 0x03, 0xcf, + 0xfc, 0xeb, 0xeb, 0xad, 0xc4, 0xeb, 0xab, 0x9a, 0x6e, 0x1b, 0xc4, 0xd2, 0x27, 0xe6, 0xff, 0xef, + 0x0c, 0xbd, 0xbf, 0xae, 0x4d, 0x03, 0x7a, 0x7c, 0xf2, 0xff, 0x17, 0x03, 0x96, 0xb4, 0xee, 0xa6, + 0x2d, 0xee, 0xc1, 0xf7, 0xa0, 0xd8, 0x0c, 0x5f, 0xf1, 0x6a, 0x0b, 0x52, 0xcc, 0x38, 0xf4, 0xf0, + 0xaf, 0x2d, 0xf0, 0xe0, 0xd5, 0x42, 0x1c, 0x41, 0x22, 0x17, 0xe6, 0xe9, 0xcf, 0x18, 0xed, 0x04, + 0x8e, 0xd7, 0xe1, 0x09, 0x47, 0xe6, 0x85, 0x12, 0x8e, 0xe5, 0x41, 0xbf, 0x32, 0xff, 0x46, 0x0c, + 0x0f, 0x27, 0xd0, 0x39, 0x0f, 0x44, 0x2b, 0x54, 0x27, 0xe5, 0x1d, 0x98, 0xdd, 0x17, 0x81, 0x1f, + 0xa8, 0xf5, 0xad, 0x4f, 0x7f, 0x5a, 0x6a, 0x73, 0xfc, 0x46, 0x96, 0x92, 0x00, 0x87, 0x78, 0xff, + 0xe5, 0xc5, 0xbd, 0x9f, 0x81, 0x05, 0xbd, 0xb8, 0x6d, 0x2f, 0x60, 0xe8, 0x9b, 0x50, 0xd8, 0xf7, + 0x02, 0x26, 0xae, 0x03, 0xc9, 0xed, 0xfa, 0x38, 0x6c, 0x2b, 0x39, 0xd6, 0x1a, 0xa8, 0x0e, 0x79, + 0xbf, 0xe7, 0xd2, 0x90, 0xa6, 0xa6, 0x89, 0x56, 0xdc, 0x73, 0x69, 0x74, 0x6f, 0xf0, 0x56, 0x80, + 0x25, 0xd8, 0x88, 0x0f, 0xb2, 0xa7, 0xea, 0x83, 0xdf, 0xc5, 0x7d, 0x70, 0xe6, 0xb3, 0x8c, 0xdd, + 0x64, 0x96, 0xf1, 0x8d, 0x29, 0x76, 0x64, 0x42, 0x9e, 0xf1, 0x61, 0x16, 0x16, 0xb5, 0xce, 0x1d, + 0xc2, 0xec, 0x7d, 0x1e, 0x24, 0x5d, 0xc2, 0xf6, 0xeb, 0x51, 0xb6, 0xab, 0x4d, 0xda, 0x55, 0x72, + 0xac, 0x35, 0xd0, 0x2b, 0x90, 0xe3, 0xdf, 0x2a, 0xbb, 0x28, 0x70, 0x72, 0xe2, 0x5a, 0x58, 0x48, + 0x91, 0x05, 0x20, 0x63, 0x5f, 0xa0, 0xa9, 0xb7, 0x39, 0x67, 0xc7, 0x6d, 0x2d, 0xc5, 0x31, 0x0d, + 0xd4, 0x80, 0x19, 0xd9, 0x2a, 0xe5, 0xc4, 0x0a, 0x5f, 0x9f, 0x62, 0x85, 0xc2, 0x7a, 0x4b, 0x02, + 0xcb, 0x9b, 0x4a, 0xf3, 0x9a, 0x14, 0x62, 0x85, 0x3d, 0x12, 0x82, 0xf9, 0xd3, 0x0c, 0xc1, 0xd5, + 0x9b, 0x30, 0x17, 0x33, 0x6a, 0xaa, 0xcb, 0xef, 0x83, 0x78, 0xf4, 0xf2, 0x53, 0x84, 0xde, 0x82, + 0x7c, 0x9b, 0xaf, 0x73, 0xb8, 0x44, 0x95, 0xd6, 0x3f, 0xb5, 0x22, 0x0f, 0x01, 0xf1, 0x89, 0x25, + 0x12, 0xfa, 0x01, 0xcc, 0x34, 0x05, 0x69, 0xa9, 0x80, 0x9d, 0xe6, 0x02, 0x51, 0x6c, 0x27, 0x2e, + 0x7c, 0xf9, 0x8d, 0x15, 0x18, 0x87, 0x25, 0xe2, 0xca, 0x50, 0x27, 0x7c, 0x1a, 0x58, 0x79, 0xd7, + 0x48, 0x58, 0xf9, 0x8d, 0x15, 0x98, 0xf9, 0x07, 0x23, 0xe6, 0x12, 0x91, 0xad, 0xd6, 0x21, 0xcf, + 0x29, 0x2b, 0x4c, 0xda, 0xa6, 0xa1, 0x29, 0x4e, 0x7a, 0xd1, 0xc1, 0xe0, 0xad, 0x00, 0x4b, 0x30, + 0x74, 0x1f, 0x66, 0x1b, 0xb4, 0x49, 0x7a, 0x2e, 0x53, 0x6e, 0x99, 0x1a, 0x57, 0x5c, 0x01, 0xdf, + 0x93, 0x18, 0x38, 0x04, 0x33, 0x1f, 0xc7, 0x6f, 0x1c, 0x95, 0x7b, 0x7a, 0x30, 0xd7, 0x92, 0x79, + 0x24, 0xa6, 0xcd, 0x70, 0x1d, 0x1b, 0xa9, 0x93, 0xcf, 0xe1, 0x80, 0xfc, 0x92, 0x5a, 0x50, 0x98, + 0xd3, 0x73, 0x50, 0x1c, 0x9f, 0xc1, 0xfc, 0x65, 0x16, 0x0a, 0x61, 0xea, 0xa8, 0xdf, 0x07, 0xc6, + 0xa4, 0xf7, 0x01, 0x7a, 0x1b, 0x66, 0x49, 0xa3, 0xe1, 0xd3, 0x20, 0x48, 0x1f, 0x22, 0x21, 0xfc, + 0xa6, 0x1c, 0x28, 0xbd, 0xa1, 0x1a, 0x38, 0x84, 0x13, 0xec, 0xe1, 0xf9, 0x4c, 0x84, 0x48, 0x5e, + 0xb1, 0x87, 0xe7, 0x33, 0x2c, 0xa4, 0xe8, 0x22, 0x14, 0xc4, 0xbf, 0x03, 0xdb, 0x73, 0xd5, 0x13, + 0x76, 0x5e, 0xb0, 0x90, 0x92, 0x61, 0xdd, 0x8b, 0x6e, 0x43, 0x96, 0xb9, 0x81, 0x3a, 0xc8, 0x29, + 0x68, 0xb1, 0xbe, 0xb3, 0xb7, 0xe5, 0x75, 0x9a, 0x4e, 0xab, 0x36, 0xcb, 0x33, 0xd9, 0xfa, 0xce, + 0x1e, 0xe6, 0x00, 0x23, 0xcc, 0x30, 0x73, 0xaa, 0x97, 0x53, 0x0b, 0x96, 0x86, 0xdc, 0x84, 0xaa, + 0x89, 0x32, 0xc3, 0x57, 0x86, 0xca, 0x0c, 0x73, 0x4a, 0x2d, 0x56, 0x5d, 0x78, 0x35, 0x41, 0x1e, + 0x51, 0x30, 0xdf, 0xe7, 0x42, 0xc5, 0x25, 0xe6, 0xdf, 0x33, 0x70, 0x3e, 0x9c, 0x29, 0x2a, 0x69, + 0xdc, 0x4c, 0xcc, 0xf5, 0xb5, 0xa1, 0xb9, 0x5e, 0x1a, 0x19, 0xf0, 0xff, 0x9a, 0xc6, 0xc9, 0x35, + 0x8d, 0x7f, 0x1a, 0xb0, 0x98, 0x7c, 0xac, 0x7d, 0xa1, 0xe7, 0xab, 0x95, 0x78, 0xd5, 0xca, 0xac, + 0xe1, 0xb5, 0xf4, 0xe0, 0xe9, 0x6b, 0x66, 0xbf, 0x36, 0x60, 0x65, 0xdc, 0x19, 0xe0, 0xf1, 0xd9, + 0xf2, 0xbd, 0x5e, 0x77, 0xb8, 0x96, 0xf0, 0x26, 0x17, 0x62, 0xd9, 0xc7, 0x53, 0x0e, 0x9f, 0x06, + 0x5e, 0xcf, 0xb7, 0xc3, 0x38, 0xd6, 0x29, 0x07, 0x56, 0x72, 0xac, 0x35, 0xb4, 0x43, 0xb3, 0x13, + 0x0b, 0x1a, 0x8f, 0x33, 0xb0, 0x32, 0xae, 0x1e, 0x80, 0x7e, 0x0e, 0xe7, 0x75, 0x61, 0x24, 0x14, + 0xaa, 0xab, 0xf4, 0xb9, 0x6a, 0xaa, 0x2f, 0xab, 0xc9, 0xcf, 0xdf, 0x1d, 0x46, 0xc5, 0xa3, 0x13, + 0x21, 0x17, 0x16, 0x44, 0xfd, 0x41, 0xcf, 0xfc, 0x02, 0xf5, 0x65, 0x51, 0x4a, 0xc5, 0x71, 0x34, + 0x9c, 0x04, 0x37, 0x3f, 0xcd, 0x40, 0x51, 0xf3, 0x1c, 0x3a, 0x82, 0x25, 0x9b, 0xfa, 0xcc, 0x69, + 0x3a, 0x36, 0x61, 0x34, 0x76, 0xcf, 0x3c, 0x2f, 0xb9, 0x7d, 0x59, 0x2d, 0x7d, 0x69, 0x2b, 0x09, + 0x8b, 0x87, 0xe7, 0x41, 0xb7, 0x60, 0xb1, 0xed, 0x74, 0x9c, 0x76, 0xaf, 0x7d, 0x9f, 0xfa, 0x9c, + 0xfb, 0xd4, 0x1e, 0xa3, 0x41, 0xbf, 0xb2, 0x78, 0x27, 0xd1, 0x83, 0x87, 0x34, 0x91, 0x0d, 0xb3, + 0x5e, 0x37, 0x1e, 0xbd, 0x1b, 0x53, 0x90, 0xbb, 0x75, 0x4f, 0x0e, 0x95, 0xd9, 0xa0, 0x26, 0x15, + 0x25, 0xc5, 0x21, 0xf2, 0xea, 0x2d, 0x98, 0x8f, 0x6b, 0x4e, 0x95, 0xa2, 0xfd, 0x2b, 0x03, 0x85, + 0xba, 0xdd, 0xfd, 0xdf, 0x28, 0x4f, 0xec, 0x26, 0xca, 0x13, 0x29, 0xfe, 0xd4, 0x84, 0x2b, 0x9f, + 0x58, 0x9d, 0x78, 0x7b, 0xa8, 0x3a, 0x71, 0x75, 0x0a, 0xcc, 0xe3, 0x8b, 0x13, 0x1f, 0x66, 0x60, + 0x3e, 0x54, 0x3d, 0xf3, 0x0f, 0xbb, 0x7b, 0xc9, 0x87, 0xdd, 0xe5, 0xf4, 0x5e, 0x9a, 0xf0, 0xae, + 0x5b, 0x8c, 0x9c, 0xc3, 0x77, 0xc3, 0x5c, 0x86, 0xc5, 0xa4, 0x5f, 0xc5, 0xef, 0xf5, 0xba, 0x4f, + 0x9a, 0x4d, 0xc7, 0xde, 0xeb, 0xba, 0x0e, 0x3b, 0xf3, 0xc1, 0x5b, 0x4f, 0x04, 0x6f, 0x8a, 0xa2, + 0x4d, 0x7c, 0xf5, 0x29, 0x7e, 0xaf, 0xe7, 0xd2, 0xfe, 0x5e, 0x4f, 0xe0, 0x1e, 0x1f, 0xc4, 0x1f, + 0x65, 0x60, 0x39, 0xae, 0x7e, 0xe6, 0x03, 0x79, 0x2f, 0x19, 0xc8, 0xd6, 0x74, 0xde, 0x9a, 0x10, + 0xcc, 0x28, 0xe9, 0x24, 0x11, 0xd0, 0x2b, 0x80, 0xc6, 0xf8, 0xd9, 0x7a, 0xf2, 0xb4, 0x7c, 0xee, + 0xe3, 0xa7, 0xe5, 0x73, 0x9f, 0x3c, 0x2d, 0x9f, 0xfb, 0xc5, 0xa0, 0x6c, 0x3c, 0x19, 0x94, 0x8d, + 0x8f, 0x07, 0x65, 0xe3, 0x93, 0x41, 0xd9, 0xf8, 0xeb, 0xa0, 0x6c, 0x7c, 0xf0, 0x69, 0xf9, 0xdc, + 0xbb, 0x85, 0x70, 0xf2, 0xff, 0x04, 0x00, 0x00, 0xff, 0xff, 0x12, 0xe8, 0x00, 0x54, 0xea, 0x25, + 0x00, 0x00, } func (m *ForwardToTarget) Marshal() (dAtA []byte, err error) { @@ -1451,32 +1451,26 @@ func (m *GatewayClassCondition) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l - if m.LastTransitionTime != nil { - { - size, err := m.LastTransitionTime.MarshalToSizedBuffer(dAtA[:i]) - if err != nil { - return 0, err - } - i -= size - i = encodeVarintGenerated(dAtA, i, uint64(size)) + { + size, err := m.LastTransitionTime.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err } - i-- - dAtA[i] = 0x2a - } - if m.Message != nil { - i -= len(*m.Message) - copy(dAtA[i:], *m.Message) - i = encodeVarintGenerated(dAtA, i, uint64(len(*m.Message))) - i-- - dAtA[i] = 0x22 - } - if m.Reason != nil { - i -= len(*m.Reason) - copy(dAtA[i:], *m.Reason) - i = encodeVarintGenerated(dAtA, i, uint64(len(*m.Reason))) - i-- - dAtA[i] = 0x1a + i -= size + i = encodeVarintGenerated(dAtA, i, uint64(size)) } + i-- + dAtA[i] = 0x2a + i -= len(m.Message) + copy(dAtA[i:], m.Message) + i = encodeVarintGenerated(dAtA, i, uint64(len(m.Message))) + i-- + dAtA[i] = 0x22 + i -= len(m.Reason) + copy(dAtA[i:], m.Reason) + i = encodeVarintGenerated(dAtA, i, uint64(len(m.Reason))) + i-- + dAtA[i] = 0x1a i -= len(m.Status) copy(dAtA[i:], m.Status) i = encodeVarintGenerated(dAtA, i, uint64(len(m.Status))) @@ -3207,18 +3201,12 @@ func (m *GatewayClassCondition) Size() (n int) { n += 1 + l + sovGenerated(uint64(l)) l = len(m.Status) n += 1 + l + sovGenerated(uint64(l)) - if m.Reason != nil { - l = len(*m.Reason) - n += 1 + l + sovGenerated(uint64(l)) - } - if m.Message != nil { - l = len(*m.Message) - n += 1 + l + sovGenerated(uint64(l)) - } - if m.LastTransitionTime != nil { - l = m.LastTransitionTime.Size() - n += 1 + l + sovGenerated(uint64(l)) - } + l = len(m.Reason) + n += 1 + l + sovGenerated(uint64(l)) + l = len(m.Message) + n += 1 + l + sovGenerated(uint64(l)) + l = m.LastTransitionTime.Size() + n += 1 + l + sovGenerated(uint64(l)) return n } @@ -3866,9 +3854,9 @@ func (this *GatewayClassCondition) String() string { s := strings.Join([]string{`&GatewayClassCondition{`, `Type:` + fmt.Sprintf("%v", this.Type) + `,`, `Status:` + fmt.Sprintf("%v", this.Status) + `,`, - `Reason:` + valueToStringGenerated(this.Reason) + `,`, - `Message:` + valueToStringGenerated(this.Message) + `,`, - `LastTransitionTime:` + strings.Replace(fmt.Sprintf("%v", this.LastTransitionTime), "Time", "v1.Time", 1) + `,`, + `Reason:` + fmt.Sprintf("%v", this.Reason) + `,`, + `Message:` + fmt.Sprintf("%v", this.Message) + `,`, + `LastTransitionTime:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.LastTransitionTime), "Time", "v1.Time", 1), `&`, ``, 1) + `,`, `}`, }, "") return s @@ -4965,8 +4953,7 @@ func (m *GatewayClassCondition) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - s := string(dAtA[iNdEx:postIndex]) - m.Reason = &s + m.Reason = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 4: if wireType != 2 { @@ -4998,8 +4985,7 @@ func (m *GatewayClassCondition) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - s := string(dAtA[iNdEx:postIndex]) - m.Message = &s + m.Message = string(dAtA[iNdEx:postIndex]) iNdEx = postIndex case 5: if wireType != 2 { @@ -5030,9 +5016,6 @@ func (m *GatewayClassCondition) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if m.LastTransitionTime == nil { - m.LastTransitionTime = &v1.Time{} - } if err := m.LastTransitionTime.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } diff --git a/api/v1alpha1/generated.proto b/api/v1alpha1/generated.proto index 53dc782fdb..72a798edb4 100644 --- a/api/v1alpha1/generated.proto +++ b/api/v1alpha1/generated.proto @@ -83,9 +83,11 @@ message GatewayClass { // Support: Core, unless otherwise specified. message GatewayClassCondition { // Type of this condition. + // +required optional string type = 1; // Status of this condition. + // +required optional string status = 2; // Reason is a machine consumable string for the last @@ -93,18 +95,20 @@ message GatewayClassCondition { // string. Reason will be defined by the controller. // // Support: Custom; values will be controller-specific. + // This field must not be empty. // - // +optional + // +required optional string reason = 3; // Message is a human readable reason for last transition. + // This field may be empty. // - // +optional + // +required optional string message = 4; // LastTransitionTime is the time of the last change to this condition. // - // +optional + // +required optional k8s.io.apimachinery.pkg.apis.meta.v1.Time lastTransitionTime = 5; } @@ -198,22 +202,26 @@ message GatewayClassStatus { // GatewayCondition is an error status for a given route. message GatewayCondition { // Type indicates the type of condition. + // +required optional string type = 1; // Status describes the current state of this condition. Can be "True", // "False", or "Unknown". + // +required optional string status = 2; // Message is a human-understandable message describing the condition. - // +optional + // This field may be empty. + // +required optional string message = 3; // Reason indicates why the condition is in this state. - // +optional + // This field must not be empty. + // +required optional string reason = 4; // LastTransitionTime indicates the last time this condition changed. - // +optional + // +required optional k8s.io.apimachinery.pkg.apis.meta.v1.Time lastTransitionTime = 5; } @@ -578,22 +586,26 @@ message ListenerAddress { // ListenerCondition is an error status for a given listener. message ListenerCondition { // Type indicates the type of condition. + // +required optional string type = 1; // Status describes the current state of this condition. Can be "True", // "False", or "Unknown". + // +required optional string status = 2; // Message is a human-understandable message describing the condition. - // +optional + // This field may be empty. + // +required optional string message = 3; // Reason indicates why the condition is in this state. - // +optional + // This field must not be empty. + // +required optional string reason = 4; // LastTransitionTime indicates the last time this condition changed. - // +optional + // +required optional k8s.io.apimachinery.pkg.apis.meta.v1.Time lastTransitionTime = 5; } diff --git a/config/crd/bases/networking.x-k8s.io_gatewayclasses.yaml b/config/crd/bases/networking.x-k8s.io_gatewayclasses.yaml index 48ce004253..697d6ae80d 100644 --- a/config/crd/bases/networking.x-k8s.io_gatewayclasses.yaml +++ b/config/crd/bases/networking.x-k8s.io_gatewayclasses.yaml @@ -209,12 +209,14 @@ spec: type: string message: description: Message is a human readable reason for last transition. + This field may be empty. type: string reason: description: "Reason is a machine consumable string for the last transition. It should be a one-word, CamelCase string. Reason will be defined by the controller. \n Support: Custom; - values will be controller-specific." + values will be controller-specific. This field must not be + empty." type: string status: description: Status of this condition. diff --git a/config/crd/bases/networking.x-k8s.io_gateways.yaml b/config/crd/bases/networking.x-k8s.io_gateways.yaml index e4faeb911b..518a95d668 100644 --- a/config/crd/bases/networking.x-k8s.io_gateways.yaml +++ b/config/crd/bases/networking.x-k8s.io_gateways.yaml @@ -317,10 +317,11 @@ spec: type: string message: description: Message is a human-understandable message describing - the condition. + the condition. This field may be empty. type: string reason: description: Reason indicates why the condition is in this state. + This field must not be empty. type: string status: description: Status describes the current state of this condition. @@ -372,11 +373,11 @@ spec: type: string message: description: Message is a human-understandable message - describing the condition. + describing the condition. This field may be empty. type: string reason: description: Reason indicates why the condition is in - this state. + this state. This field must not be empty. type: string status: description: Status describes the current state of this