From eef37231d19dcf83f9ddefebe2a3a8d2f55aae62 Mon Sep 17 00:00:00 2001 From: Derek Wang Date: Tue, 29 Mar 2022 10:57:38 -0700 Subject: [PATCH] feat: more jetstream configurations (#1771) * feat: more jetstream configurations Signed-off-by: Derek Wang --- api/event-bus.html | 24 ++ api/event-bus.md | 23 ++ api/jsonschema/schema.json | 7 + api/openapi-spec/swagger.json | 7 + common/common.go | 6 +- controllers/config.go | 5 +- .../installer/assets/jetstream/nats.conf | 1 + controllers/eventbus/installer/jetstream.go | 44 ++- .../eventbus/installer/jetstream_test.go | 20 +- .../controller-config.yaml | 7 + manifests/install.yaml | 7 + manifests/namespace-install.yaml | 7 + pkg/apis/eventbus/v1alpha1/generated.pb.go | 318 +++++++++++------- pkg/apis/eventbus/v1alpha1/generated.proto | 8 + .../eventbus/v1alpha1/jetstream_eventbus.go | 6 + .../eventbus/v1alpha1/openapi_generated.go | 13 + .../v1alpha1/zz_generated.deepcopy.go | 5 + 17 files changed, 372 insertions(+), 136 deletions(-) diff --git a/api/event-bus.html b/api/event-bus.html index 01dc6d6243..2e39ac7b9c 100644 --- a/api/event-bus.html +++ b/api/event-bus.html @@ -583,6 +583,19 @@

JetStreamBus Check https://docs.nats.io/ for all the available arguments.

+ + +streamConfig
+ +string + + + +(Optional) +

Optional configuration for the streams to be created in this JetStream service, if specified, it will be merged with the default configuration in controller-config. +It accepts a YAML format configuration, available fields include, “maxBytes”, “maxMsgs”, “maxAge” (e.g. 72h), “replicas” (1, 3, 5), “duplicates” (e.g. 5m).

+ +

JetStreamConfig @@ -624,6 +637,17 @@

JetStreamConfig + + +streamConfig
+ +string + + + +(Optional) + +

NATSBus diff --git a/api/event-bus.md b/api/event-bus.md index 284a0ea879..9834382e57 100644 --- a/api/event-bus.md +++ b/api/event-bus.md @@ -588,6 +588,21 @@ available arguments.

+ + +streamConfig
string + + +(Optional) +

+Optional configuration for the streams to be created in this JetStream +service, if specified, it will be merged with the default configuration +in controller-config. It accepts a YAML format configuration, available +fields include, “maxBytes”, “maxMsgs”, “maxAge” (e.g. 72h), “replicas” +(1, 3, 5), “duplicates” (e.g. 5m). +

+ +

@@ -629,6 +644,14 @@ JetStream (Nats) URL + + +streamConfig
string + + +(Optional) + +

diff --git a/api/jsonschema/schema.json b/api/jsonschema/schema.json index 7b4f3025e4..e77a189273 100644 --- a/api/jsonschema/schema.json +++ b/api/jsonschema/schema.json @@ -464,6 +464,10 @@ }, "type": "array" }, + "streamConfig": { + "description": "Optional configuration for the streams to be created in this JetStream service, if specified, it will be merged with the default configuration in controller-config. It accepts a YAML format configuration, available fields include, \"maxBytes\", \"maxMsgs\", \"maxAge\" (e.g. 72h), \"replicas\" (1, 3, 5), \"duplicates\" (e.g. 5m).", + "type": "string" + }, "tolerations": { "description": "If specified, the pod's tolerations.", "items": { @@ -483,6 +487,9 @@ "auth": { "$ref": "#/definitions/io.argoproj.eventbus.v1alpha1.JetStreamAuth" }, + "streamConfig": { + "type": "string" + }, "url": { "description": "JetStream (Nats) URL", "type": "string" diff --git a/api/openapi-spec/swagger.json b/api/openapi-spec/swagger.json index 56164eef93..78838a85a0 100644 --- a/api/openapi-spec/swagger.json +++ b/api/openapi-spec/swagger.json @@ -457,6 +457,10 @@ "type": "string" } }, + "streamConfig": { + "description": "Optional configuration for the streams to be created in this JetStream service, if specified, it will be merged with the default configuration in controller-config. It accepts a YAML format configuration, available fields include, \"maxBytes\", \"maxMsgs\", \"maxAge\" (e.g. 72h), \"replicas\" (1, 3, 5), \"duplicates\" (e.g. 5m).", + "type": "string" + }, "tolerations": { "description": "If specified, the pod's tolerations.", "type": "array", @@ -476,6 +480,9 @@ "auth": { "$ref": "#/definitions/io.argoproj.eventbus.v1alpha1.JetStreamAuth" }, + "streamConfig": { + "type": "string" + }, "url": { "description": "JetStream (Nats) URL", "type": "string" diff --git a/common/common.go b/common/common.go index 46eb0bfa12..0ed1908013 100644 --- a/common/common.go +++ b/common/common.go @@ -63,8 +63,10 @@ const ( // Default EventBus name DefaultEventBusName = "default" - // key of server auth secret - JetStreamServerAuthSecretKey = "auth" + // key of auth server secret + JetStreamServerSecretAuthKey = "auth" + // key of encryption server secret + JetStreamServerSecretEncryptionKey = "encryption" // key of client auth secret JetStreamClientAuthSecretKey = "client-auth" // key of nats-js.conf in the configmap diff --git a/controllers/config.go b/controllers/config.go index 533abe1a0a..63cad488d9 100644 --- a/controllers/config.go +++ b/controllers/config.go @@ -28,8 +28,9 @@ type NatsStreamingVersion struct { } type JetStreamConfig struct { - Settings string `json:"settings"` - Versions []JetStreamVersion `json:"versions"` + Settings string `json:"settings"` + StreamConfig string `json:"streamConfig"` + Versions []JetStreamVersion `json:"versions"` } type JetStreamVersion struct { diff --git a/controllers/eventbus/installer/assets/jetstream/nats.conf b/controllers/eventbus/installer/assets/jetstream/nats.conf index 1eade13193..2dc882d06e 100644 --- a/controllers/eventbus/installer/assets/jetstream/nats.conf +++ b/controllers/eventbus/installer/assets/jetstream/nats.conf @@ -13,6 +13,7 @@ server_name: $POD_NAME # # ################################### jetstream { + key: $JS_KEY store_dir: "/data/jetstream/store" {{.Settings}} } diff --git a/controllers/eventbus/installer/jetstream.go b/controllers/eventbus/installer/jetstream.go index 2d041795a5..d505ad2c1e 100644 --- a/controllers/eventbus/installer/jetstream.go +++ b/controllers/eventbus/installer/jetstream.go @@ -9,6 +9,7 @@ import ( "strings" "text/template" + "github.com/spf13/viper" "go.uber.org/zap" appv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" @@ -18,6 +19,7 @@ import ( "k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/util/intstr" "sigs.k8s.io/controller-runtime/pkg/client" + "sigs.k8s.io/yaml" "github.com/argoproj/argo-events/common" "github.com/argoproj/argo-events/controllers" @@ -58,7 +60,23 @@ func (r *jetStreamInstaller) Install(ctx context.Context) (*v1alpha1.BusConfig, if js := r.eventBus.Spec.JetStream; js == nil { return nil, fmt.Errorf("invalid jetstream eventbus spec") } - if err := r.createAuthSecrets(ctx); err != nil { + // merge + v := viper.New() + v.SetConfigType("yaml") + if err := v.ReadConfig(bytes.NewBufferString(r.config.EventBus.JetStream.StreamConfig)); err != nil { + return nil, fmt.Errorf("invalid jetstream config in global configuration, %w", err) + } + if x := r.eventBus.Spec.JetStream.StreamConfig; x != nil { + if err := v.MergeConfig(bytes.NewBufferString(*x)); err != nil { + return nil, fmt.Errorf("failed to merge customized stream config, %w", err) + } + } + b, err := yaml.Marshal(v.AllSettings()) + if err != nil { + return nil, fmt.Errorf("failed to marshal merged buffer config, %w", err) + } + + if err := r.createSecrets(ctx); err != nil { r.logger.Errorw("failed to create jetstream auth secrets", zap.Error(err)) r.eventBus.Status.MarkDeployFailed("JetStreamAuthSecretsFailed", err.Error()) return nil, err @@ -90,6 +108,7 @@ func (r *jetStreamInstaller) Install(ctx context.Context) (*v1alpha1.BusConfig, Key: common.JetStreamClientAuthSecretKey, }, }, + StreamConfig: string(b), }, }, nil } @@ -268,11 +287,11 @@ func (r *jetStreamInstaller) buildStatefulSetSpec(jsVersion *controllers.JetStre { Secret: &corev1.SecretProjection{ LocalObjectReference: corev1.LocalObjectReference{ - Name: generateJetStreamServerAuthSecretName(r.eventBus), + Name: generateJetStreamServerSecretName(r.eventBus), }, Items: []corev1.KeyToPath{ { - Key: common.JetStreamServerAuthSecretKey, + Key: common.JetStreamServerSecretAuthKey, Path: "auth.conf", }, }, @@ -300,6 +319,7 @@ func (r *jetStreamInstaller) buildStatefulSetSpec(jsVersion *controllers.JetStre {Name: "SERVER_NAME", Value: "$(POD_NAME)"}, {Name: "POD_NAMESPACE", ValueFrom: &corev1.EnvVarSource{FieldRef: &corev1.ObjectFieldSelector{FieldPath: "metadata.namespace"}}}, {Name: "CLUSTER_ADVERTISE", Value: "$(POD_NAME)." + generateJetStreamServiceName(r.eventBus) + ".$(POD_NAMESPACE).svc.cluster.local"}, + {Name: "JS_KEY", ValueFrom: &corev1.EnvVarSource{SecretKeyRef: &corev1.SecretKeySelector{LocalObjectReference: corev1.LocalObjectReference{Name: generateJetStreamServerSecretName(r.eventBus)}, Key: common.JetStreamServerSecretEncryptionKey}}}, }, VolumeMounts: []corev1.VolumeMount{ {Name: "config-volume", MountPath: "/etc/nats-config"}, @@ -418,7 +438,8 @@ func (r *jetStreamInstaller) buildStatefulSetSpec(jsVersion *controllers.JetStre return spec } -func (r *jetStreamInstaller) createAuthSecrets(ctx context.Context) error { +func (r *jetStreamInstaller) createSecrets(ctx context.Context) error { + encryptionKey := common.RandomString(12) token := common.RandomString(24) sysPassword := common.RandomString(24) authTpl := template.Must(template.ParseFS(jetStremAssets, "assets/jetstream/server-auth.conf")) @@ -433,10 +454,10 @@ func (r *jetStreamInstaller) createAuthSecrets(ctx context.Context) error { return fmt.Errorf("failed to parse nats auth template, error: %w", err) } - serverAuthObj := &corev1.Secret{ + serverObj := &corev1.Secret{ ObjectMeta: metav1.ObjectMeta{ Namespace: r.eventBus.Namespace, - Name: generateJetStreamServerAuthSecretName(r.eventBus), + Name: generateJetStreamServerSecretName(r.eventBus), Labels: r.labels, OwnerReferences: []metav1.OwnerReference{ *metav1.NewControllerRef(r.eventBus.GetObjectMeta(), v1alpha1.SchemaGroupVersionKind), @@ -444,7 +465,8 @@ func (r *jetStreamInstaller) createAuthSecrets(ctx context.Context) error { }, Type: corev1.SecretTypeOpaque, Data: map[string][]byte{ - common.JetStreamServerAuthSecretKey: authTplOutput.Bytes(), + common.JetStreamServerSecretAuthKey: authTplOutput.Bytes(), + common.JetStreamServerSecretEncryptionKey: []byte(encryptionKey), }, } @@ -466,7 +488,7 @@ func (r *jetStreamInstaller) createAuthSecrets(ctx context.Context) error { oldServerObjExisting, oldClientObjExisting := true, true oldSObj := &corev1.Secret{} - if err := r.client.Get(ctx, client.ObjectKeyFromObject(serverAuthObj), oldSObj); err != nil { + if err := r.client.Get(ctx, client.ObjectKeyFromObject(serverObj), oldSObj); err != nil { if apierrors.IsNotFound(err) { oldServerObjExisting = false } else { @@ -501,7 +523,7 @@ func (r *jetStreamInstaller) createAuthSecrets(ctx context.Context) error { r.logger.Infow("deleted malformed nats client auth secret successfully") } - if err := r.client.Create(ctx, serverAuthObj); err != nil { + if err := r.client.Create(ctx, serverObj); err != nil { return fmt.Errorf("failed to create nats server auth secret, err: %w", err) } r.logger.Infow("created nats server auth secret successfully") @@ -626,8 +648,8 @@ func (r *jetStreamInstaller) getPVCs(ctx context.Context) ([]corev1.PersistentVo return pvcl.Items, nil } -func generateJetStreamServerAuthSecretName(eventBus *v1alpha1.EventBus) string { - return fmt.Sprintf("eventbus-%s-js-server-auth", eventBus.Name) +func generateJetStreamServerSecretName(eventBus *v1alpha1.EventBus) string { + return fmt.Sprintf("eventbus-%s-js-server", eventBus.Name) } func generateJetStreamClientAuthSecretName(eventBus *v1alpha1.EventBus) string { diff --git a/controllers/eventbus/installer/jetstream_test.go b/controllers/eventbus/installer/jetstream_test.go index 2fbb76f568..d6899c1d92 100644 --- a/controllers/eventbus/installer/jetstream_test.go +++ b/controllers/eventbus/installer/jetstream_test.go @@ -52,8 +52,8 @@ func TestJetStreamBadInstallation(t *testing.T) { func TestJetStreamGenerateNames(t *testing.T) { n := generateJetStreamStatefulSetName(testJetStreamEventBus) assert.Equal(t, "eventbus-"+testJetStreamEventBus.Name+"-js", n) - n = generateJetStreamServerAuthSecretName(testJetStreamEventBus) - assert.Equal(t, "eventbus-"+testJetStreamEventBus.Name+"-js-server-auth", n) + n = generateJetStreamServerSecretName(testJetStreamEventBus) + assert.Equal(t, "eventbus-"+testJetStreamEventBus.Name+"-js-server", n) n = generateJetStreamClientAuthSecretName(testJetStreamEventBus) assert.Equal(t, "eventbus-"+testJetStreamEventBus.Name+"-js-client-auth", n) n = generateJetStreamConfigMapName(testJetStreamEventBus) @@ -89,6 +89,13 @@ func TestJetStreamCreateObjects(t *testing.T) { assert.Equal(t, testJSReloaderImage, sts.Spec.Template.Spec.Containers[1].Image) assert.Equal(t, testJetStreamExporterImage, sts.Spec.Template.Spec.Containers[2].Image) assert.True(t, len(sts.Spec.Template.Spec.Volumes) > 1) + envNames := []string{} + for _, e := range sts.Spec.Template.Spec.Containers[0].Env { + envNames = append(envNames, e.Name) + } + for _, e := range []string{"POD_NAME", "SERVER_NAME", "POD_NAMESPACE", "CLUSTER_ADVERTISE", "JS_KEY"} { + assert.Contains(t, envNames, e) + } }) t.Run("test create svc", func(t *testing.T) { @@ -106,13 +113,14 @@ func TestJetStreamCreateObjects(t *testing.T) { t.Run("test create auth secrets", func(t *testing.T) { testObj := testJetStreamEventBus.DeepCopy() i.eventBus = testObj - err := i.createAuthSecrets(ctx) + err := i.createSecrets(ctx) assert.NoError(t, err) s := &corev1.Secret{} - err = cl.Get(ctx, types.NamespacedName{Namespace: testObj.Namespace, Name: generateJetStreamServerAuthSecretName(testObj)}, s) + err = cl.Get(ctx, types.NamespacedName{Namespace: testObj.Namespace, Name: generateJetStreamServerSecretName(testObj)}, s) assert.NoError(t, err) - assert.Equal(t, 1, len(s.Data)) - assert.Contains(t, s.Data, common.JetStreamServerAuthSecretKey) + assert.Equal(t, 2, len(s.Data)) + assert.Contains(t, s.Data, common.JetStreamServerSecretAuthKey) + assert.Contains(t, s.Data, common.JetStreamServerSecretEncryptionKey) s = &corev1.Secret{} err = cl.Get(ctx, types.NamespacedName{Namespace: testObj.Namespace, Name: generateJetStreamClientAuthSecretName(testObj)}, s) assert.NoError(t, err) diff --git a/manifests/base/eventbus-controller/controller-config.yaml b/manifests/base/eventbus-controller/controller-config.yaml index 34b23a9955..aca6fcac04 100644 --- a/manifests/base/eventbus-controller/controller-config.yaml +++ b/manifests/base/eventbus-controller/controller-config.yaml @@ -19,6 +19,13 @@ data: max_memory_store: -1 # e.g. 20G. -1 means no limit, Up to 1TB if available max_file_store: 1TB + streamConfig: | + # The default properties of the streams to be created in this JetStream service + maxMsgs: 50000 + maxAge: 168h + maxBytes: -1 + replicas: 3 + duplicates: 300s versions: - version: 2.7.4 natsImage: nats:2.7.4 diff --git a/manifests/install.yaml b/manifests/install.yaml index 7425620774..23b0eaac99 100644 --- a/manifests/install.yaml +++ b/manifests/install.yaml @@ -294,6 +294,13 @@ data: max_memory_store: -1 # e.g. 20G. -1 means no limit, Up to 1TB if available max_file_store: 1TB + streamConfig: | + # The default properties of the streams to be created in this JetStream service + maxMsgs: 50000 + maxAge: 168h + maxBytes: -1 + replicas: 3 + duplicates: 300s versions: - version: 2.7.4 natsImage: nats:2.7.4 diff --git a/manifests/namespace-install.yaml b/manifests/namespace-install.yaml index 1c7bb42d58..11bdfd3cde 100644 --- a/manifests/namespace-install.yaml +++ b/manifests/namespace-install.yaml @@ -214,6 +214,13 @@ data: max_memory_store: -1 # e.g. 20G. -1 means no limit, Up to 1TB if available max_file_store: 1TB + streamConfig: | + # The default properties of the streams to be created in this JetStream service + maxMsgs: 50000 + maxAge: 168h + maxBytes: -1 + replicas: 3 + duplicates: 300s versions: - version: 2.7.4 natsImage: nats:2.7.4 diff --git a/pkg/apis/eventbus/v1alpha1/generated.pb.go b/pkg/apis/eventbus/v1alpha1/generated.pb.go index 74a083cc4c..71a4123f05 100644 --- a/pkg/apis/eventbus/v1alpha1/generated.pb.go +++ b/pkg/apis/eventbus/v1alpha1/generated.pb.go @@ -435,121 +435,122 @@ func init() { } var fileDescriptor_871e47633eb7aad4 = []byte{ - // 1811 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x58, 0x4f, 0x6f, 0x1b, 0xc7, - 0x15, 0xd7, 0x8a, 0x14, 0x45, 0x0e, 0x29, 0x51, 0x1c, 0x29, 0xcd, 0x5a, 0x88, 0x49, 0x83, 0x45, - 0x0a, 0x15, 0xb1, 0x97, 0x75, 0x50, 0xb4, 0x6e, 0x2e, 0x2e, 0x57, 0x91, 0x6b, 0x39, 0xa2, 0xa3, - 0x0e, 0x15, 0x17, 0x4d, 0x83, 0xba, 0xa3, 0xd5, 0x88, 0x5a, 0x89, 0xbb, 0xc3, 0xee, 0xcc, 0x12, - 0x62, 0x4f, 0x45, 0x3f, 0x41, 0x50, 0x14, 0x45, 0x7b, 0xe8, 0xb9, 0x40, 0x3f, 0x40, 0x3f, 0x83, - 0x0f, 0x3d, 0xe4, 0xd6, 0x9c, 0x88, 0x98, 0x41, 0x81, 0x02, 0xfd, 0x06, 0x3e, 0x15, 0x33, 0x3b, - 0xfb, 0x87, 0xdc, 0x55, 0xac, 0x98, 0x74, 0x83, 0x9e, 0xc4, 0x79, 0xef, 0xcd, 0xef, 0xfd, 0xd9, - 0xb7, 0xef, 0xfd, 0x56, 0xe0, 0x51, 0xcf, 0xe6, 0x67, 0xfe, 0xb1, 0x61, 0x51, 0xa7, 0x85, 0xbd, - 0x1e, 0x1d, 0x78, 0xf4, 0x5c, 0xfe, 0xb8, 0x43, 0x86, 0xc4, 0xe5, 0xac, 0x35, 0xb8, 0xe8, 0xb5, - 0xf0, 0xc0, 0x66, 0x2d, 0x79, 0x3e, 0xf6, 0x59, 0x6b, 0x78, 0x17, 0xf7, 0x07, 0x67, 0xf8, 0x6e, - 0xab, 0x47, 0x5c, 0xe2, 0x61, 0x4e, 0x4e, 0x8c, 0x81, 0x47, 0x39, 0x85, 0xef, 0xc5, 0x58, 0x46, - 0x88, 0x25, 0x7f, 0x3c, 0x0d, 0xb0, 0x8c, 0xc1, 0x45, 0xcf, 0x10, 0x58, 0x46, 0x88, 0x65, 0x84, - 0x58, 0xdb, 0xf7, 0xaf, 0x1d, 0x87, 0x45, 0x1d, 0x87, 0xba, 0xb3, 0xce, 0xb7, 0xef, 0x24, 0x00, - 0x7a, 0xb4, 0x47, 0x5b, 0x52, 0x7c, 0xec, 0x9f, 0xca, 0x93, 0x3c, 0xc8, 0x5f, 0xca, 0xbc, 0x79, - 0x71, 0x8f, 0x19, 0x36, 0x15, 0x90, 0x2d, 0x8b, 0x7a, 0xa4, 0x35, 0x4c, 0xe5, 0xb3, 0xfd, 0xfd, - 0xd8, 0xc6, 0xc1, 0xd6, 0x99, 0xed, 0x12, 0x6f, 0x14, 0xc6, 0xd1, 0xf2, 0x08, 0xa3, 0xbe, 0x67, - 0x91, 0xaf, 0x75, 0x8b, 0xb5, 0x1c, 0xc2, 0x71, 0x96, 0xaf, 0xd6, 0x55, 0xb7, 0x3c, 0xdf, 0xe5, - 0xb6, 0x93, 0x76, 0xf3, 0x83, 0x97, 0x5d, 0x60, 0xd6, 0x19, 0x71, 0xf0, 0xec, 0xbd, 0xe6, 0x7f, - 0x34, 0x50, 0x32, 0x7d, 0xb6, 0x4b, 0xdd, 0x53, 0xbb, 0x07, 0x4f, 0x40, 0xde, 0xc5, 0x9c, 0xe9, - 0xda, 0x2d, 0x6d, 0xa7, 0xfc, 0xee, 0x03, 0xe3, 0xd5, 0x9f, 0xa0, 0xf1, 0xb8, 0x7d, 0xd4, 0x0d, - 0x50, 0xcd, 0xe2, 0x64, 0xdc, 0xc8, 0x8b, 0x33, 0x92, 0xe8, 0xf0, 0x12, 0x94, 0xce, 0x09, 0x67, - 0xdc, 0x23, 0xd8, 0xd1, 0x97, 0xa5, 0xab, 0x0f, 0xe6, 0x71, 0xf5, 0x88, 0xf0, 0xae, 0x04, 0x53, - 0xfe, 0xd6, 0x26, 0xe3, 0x46, 0x29, 0x12, 0xa2, 0xd8, 0x59, 0xf3, 0xef, 0xcb, 0xa0, 0xb6, 0x4b, - 0x5d, 0x8e, 0x45, 0x7d, 0x8e, 0x88, 0x33, 0xe8, 0x63, 0x4e, 0xe0, 0xcf, 0x41, 0x29, 0x7c, 0x7c, - 0x61, 0xea, 0x3b, 0x46, 0x50, 0x4f, 0xe1, 0xd2, 0x10, 0x0d, 0x61, 0x0c, 0xef, 0x1a, 0x48, 0x19, - 0x21, 0xf2, 0x6b, 0xdf, 0xf6, 0x88, 0x23, 0xe2, 0x32, 0x6b, 0xcf, 0xc6, 0x8d, 0x25, 0xe1, 0x30, - 0xd4, 0x32, 0x14, 0xa3, 0xc1, 0x63, 0x50, 0xb5, 0x1d, 0xdc, 0x23, 0x87, 0x7e, 0xbf, 0x7f, 0x48, - 0xfb, 0xb6, 0x35, 0x92, 0x09, 0x97, 0xcc, 0x7b, 0xea, 0x5a, 0x75, 0x7f, 0x5a, 0xfd, 0x62, 0xdc, - 0xb8, 0x99, 0xee, 0x45, 0x23, 0x36, 0x40, 0xb3, 0x80, 0xc2, 0x07, 0x23, 0x96, 0xef, 0xd9, 0x7c, - 0x24, 0x72, 0x23, 0x97, 0x5c, 0xcf, 0xc9, 0x24, 0xbe, 0x9d, 0x95, 0x44, 0x77, 0xda, 0xd4, 0xdc, - 0x14, 0x41, 0xcc, 0x08, 0xd1, 0x2c, 0x60, 0xf3, 0x1f, 0xcb, 0xa0, 0xb8, 0x27, 0x0a, 0x6f, 0xfa, - 0x0c, 0xfe, 0x0a, 0x14, 0x45, 0xdf, 0x9e, 0x60, 0x8e, 0x55, 0xb9, 0xbe, 0x97, 0xf0, 0x14, 0xb5, - 0x5f, 0xfc, 0xc8, 0x84, 0xb5, 0xf0, 0xfd, 0xe1, 0xf1, 0x39, 0xb1, 0x78, 0x87, 0x70, 0x6c, 0x42, - 0x95, 0x3f, 0x88, 0x65, 0x28, 0x42, 0x85, 0xe7, 0x20, 0xcf, 0x06, 0xc4, 0x52, 0xcd, 0xf1, 0x70, - 0x9e, 0xe6, 0x08, 0xa3, 0xee, 0x0e, 0x88, 0x65, 0x56, 0x94, 0xd7, 0xbc, 0x38, 0x21, 0xe9, 0x03, - 0x7a, 0xa0, 0xc0, 0x38, 0xe6, 0x3e, 0x53, 0x55, 0x7b, 0xb4, 0x10, 0x6f, 0x12, 0xd1, 0x5c, 0x57, - 0xfe, 0x0a, 0xc1, 0x19, 0x29, 0x4f, 0xcd, 0x7f, 0x6a, 0xa0, 0x12, 0x9a, 0x1e, 0xd8, 0x8c, 0xc3, - 0x4f, 0x52, 0x25, 0x35, 0xae, 0x57, 0x52, 0x71, 0x5b, 0x16, 0x74, 0x43, 0xb9, 0x2a, 0x86, 0x92, - 0x44, 0x39, 0x6d, 0xb0, 0x62, 0x73, 0xe2, 0x30, 0x7d, 0xf9, 0x56, 0x6e, 0xa7, 0xfc, 0xee, 0xfb, - 0x8b, 0xc8, 0xd0, 0x5c, 0x53, 0x0e, 0x57, 0xf6, 0x05, 0x34, 0x0a, 0x3c, 0x34, 0xff, 0x9d, 0xc8, - 0x4c, 0x14, 0x19, 0xe2, 0xa9, 0x91, 0xb2, 0x3b, 0xef, 0x48, 0x11, 0x9e, 0x67, 0xe7, 0x89, 0x9f, - 0x9e, 0x27, 0x0f, 0x17, 0x32, 0x4f, 0x64, 0x9a, 0x57, 0x0e, 0x93, 0x2f, 0x34, 0xb0, 0x3e, 0xfd, - 0xbc, 0xe1, 0xd3, 0xa8, 0x97, 0x82, 0x74, 0x7f, 0x78, 0xfd, 0x30, 0x82, 0x3d, 0x66, 0x7c, 0x75, - 0xe3, 0x40, 0x07, 0x14, 0x2c, 0x39, 0xe4, 0x54, 0x9e, 0x7b, 0xf3, 0xe4, 0x19, 0xcd, 0xfd, 0xd8, - 0x5d, 0x70, 0x46, 0xca, 0x49, 0xf3, 0x67, 0x60, 0x2d, 0x4a, 0xbd, 0xed, 0xf3, 0x33, 0xf8, 0x00, - 0xac, 0x70, 0x7a, 0x41, 0x5c, 0x95, 0xdf, 0xdb, 0x57, 0x4c, 0x18, 0x8f, 0xf0, 0x0f, 0xc8, 0xa8, - 0x4b, 0xfa, 0xc4, 0xe2, 0xd4, 0x33, 0x4b, 0xa2, 0x4d, 0x8e, 0xc4, 0x3d, 0x14, 0x5c, 0x6f, 0xfe, - 0x65, 0x0d, 0x54, 0x92, 0x65, 0x86, 0xdf, 0x05, 0xab, 0x43, 0xe2, 0x31, 0x9b, 0x06, 0xd0, 0x25, - 0xb3, 0xaa, 0x42, 0x5a, 0x7d, 0x12, 0x88, 0x51, 0xa8, 0x87, 0x3b, 0xa0, 0xe8, 0x91, 0x41, 0xdf, - 0xb6, 0x30, 0x93, 0x55, 0x58, 0x31, 0x2b, 0xa2, 0xef, 0x91, 0x92, 0xa1, 0x48, 0x0b, 0x7f, 0xaf, - 0x81, 0x9a, 0x35, 0x3b, 0xee, 0xd5, 0x6b, 0xde, 0x99, 0xa7, 0x72, 0xa9, 0x1d, 0x62, 0xbe, 0x31, - 0x19, 0x37, 0xd2, 0xab, 0x05, 0xa5, 0xdd, 0xc3, 0xbf, 0x69, 0xe0, 0x86, 0x47, 0xfa, 0x14, 0x9f, - 0x10, 0x2f, 0x75, 0x41, 0xcf, 0xbf, 0x8e, 0xe0, 0x6e, 0x4e, 0xc6, 0x8d, 0x1b, 0xe8, 0x2a, 0x9f, - 0xe8, 0xea, 0x70, 0xe0, 0x5f, 0x35, 0xa0, 0x3b, 0x84, 0x7b, 0xb6, 0xc5, 0xd2, 0xb1, 0xae, 0xbc, - 0x8e, 0x58, 0xdf, 0x9a, 0x8c, 0x1b, 0x7a, 0xe7, 0x0a, 0x97, 0xe8, 0xca, 0x60, 0xe0, 0xef, 0x34, - 0x50, 0x1e, 0x88, 0x0e, 0x61, 0x9c, 0xb8, 0x16, 0xd1, 0x0b, 0x32, 0xb8, 0x0f, 0xe7, 0x09, 0xee, - 0x30, 0x86, 0xeb, 0x72, 0x41, 0x9a, 0x7a, 0x23, 0xb3, 0x3a, 0x19, 0x37, 0xca, 0x09, 0x05, 0x4a, - 0x3a, 0x85, 0x56, 0x62, 0x8c, 0xaf, 0xca, 0x00, 0x7e, 0xf4, 0xb5, 0x27, 0x40, 0x47, 0x01, 0x04, - 0x5d, 0x1d, 0x9e, 0x12, 0xd3, 0xfc, 0x0f, 0x1a, 0xa8, 0xb8, 0xf4, 0x84, 0x84, 0xaf, 0x97, 0x5e, - 0x94, 0x53, 0xfd, 0xe3, 0x45, 0x8d, 0x3c, 0xe3, 0x71, 0x02, 0x7c, 0xcf, 0xe5, 0xde, 0xc8, 0xdc, - 0x52, 0x2f, 0x63, 0x25, 0xa9, 0x42, 0x53, 0x51, 0xc0, 0x8f, 0x40, 0x99, 0xd3, 0xbe, 0x20, 0x97, - 0x36, 0x75, 0x99, 0x5e, 0x92, 0x41, 0xd5, 0xb3, 0x06, 0xc4, 0x51, 0x64, 0x66, 0x6e, 0x2a, 0xe0, - 0x72, 0x2c, 0x63, 0x28, 0x89, 0x03, 0x49, 0x9a, 0xdd, 0x00, 0x59, 0xd9, 0xef, 0x64, 0x41, 0x1f, - 0xd2, 0x93, 0x57, 0x22, 0x38, 0xd0, 0x05, 0x1b, 0x11, 0xaf, 0x0a, 0x06, 0x18, 0xd3, 0xcb, 0x32, - 0x85, 0x4c, 0x2a, 0x78, 0x40, 0x2d, 0xdc, 0x0f, 0xa8, 0x0b, 0x22, 0xa7, 0xc4, 0x13, 0x4f, 0xdf, - 0xd4, 0x55, 0x32, 0x1b, 0xfb, 0x33, 0x48, 0x28, 0x85, 0x0d, 0x7f, 0x02, 0x6a, 0x03, 0xcf, 0xa6, - 0x32, 0x84, 0x3e, 0x66, 0xec, 0x31, 0x76, 0x88, 0x5e, 0x91, 0x93, 0xef, 0x86, 0x82, 0xa9, 0x1d, - 0xce, 0x1a, 0xa0, 0xf4, 0x1d, 0x31, 0x0d, 0x43, 0xa1, 0xbe, 0x16, 0x4f, 0xc3, 0xf0, 0x2e, 0x8a, - 0xb4, 0xf0, 0x01, 0x28, 0xe2, 0xd3, 0x53, 0xdb, 0x15, 0x96, 0xeb, 0xb2, 0x84, 0x6f, 0x65, 0xa5, - 0xd6, 0x56, 0x36, 0x01, 0x4e, 0x78, 0x42, 0xd1, 0x5d, 0xf8, 0x08, 0x40, 0x46, 0xbc, 0xa1, 0x6d, - 0x91, 0xb6, 0x65, 0x51, 0xdf, 0xe5, 0x32, 0xf6, 0xaa, 0x8c, 0x7d, 0x5b, 0xc5, 0x0e, 0xbb, 0x29, - 0x0b, 0x94, 0x71, 0x4b, 0x44, 0xcf, 0x08, 0xe7, 0xb6, 0xdb, 0x63, 0xfa, 0x86, 0x44, 0x90, 0x5e, - 0xbb, 0x4a, 0x86, 0x22, 0x2d, 0x7c, 0x07, 0x94, 0x18, 0xc7, 0x1e, 0x6f, 0x7b, 0x3d, 0xa6, 0xd7, - 0x6e, 0xe5, 0x76, 0x4a, 0xc1, 0x6a, 0xee, 0x86, 0x42, 0x14, 0xeb, 0xb7, 0xef, 0x83, 0x5a, 0xaa, - 0x89, 0xe1, 0x06, 0xc8, 0x5d, 0x90, 0x51, 0xb0, 0x5e, 0x90, 0xf8, 0x09, 0xb7, 0xc0, 0xca, 0x10, - 0xf7, 0x7d, 0x12, 0x70, 0x72, 0x14, 0x1c, 0xde, 0x5b, 0xbe, 0xa7, 0x35, 0xff, 0xac, 0x81, 0xea, - 0xcc, 0x67, 0x05, 0xbc, 0x09, 0x72, 0xbe, 0xd7, 0x57, 0xeb, 0xa9, 0xac, 0x12, 0xcd, 0x7d, 0x84, - 0x0e, 0x90, 0x90, 0xc3, 0x1e, 0xc8, 0x63, 0x9f, 0x9f, 0xa9, 0xc5, 0xbc, 0xbf, 0x90, 0xb7, 0x51, - 0xec, 0xdc, 0x80, 0xee, 0x88, 0x5f, 0x48, 0x3a, 0x68, 0xfe, 0x4b, 0x03, 0xab, 0x8a, 0x0a, 0x41, - 0x17, 0x14, 0x5c, 0xcc, 0xed, 0x21, 0x51, 0x0b, 0x79, 0x2e, 0xf2, 0xfa, 0x58, 0x22, 0x45, 0xa3, - 0x0e, 0x08, 0x42, 0x10, 0xc8, 0x90, 0xf2, 0x02, 0xcf, 0x41, 0x81, 0x5c, 0x52, 0x6e, 0x87, 0xd4, - 0x7c, 0x51, 0x9f, 0x88, 0xd2, 0xd7, 0x9e, 0x44, 0x46, 0xca, 0x43, 0xf3, 0x4b, 0x0d, 0x80, 0xd8, - 0xe4, 0x65, 0xe5, 0x7f, 0x07, 0x94, 0xac, 0xbe, 0xcf, 0x38, 0xf1, 0xf6, 0xdf, 0x57, 0xdf, 0x58, - 0xb2, 0x3f, 0x76, 0x43, 0x21, 0x8a, 0xf5, 0xf0, 0xb6, 0x7a, 0x56, 0x39, 0x69, 0xa7, 0x87, 0x05, - 0x7e, 0x31, 0x6e, 0x54, 0xc4, 0xdf, 0xb0, 0x04, 0x41, 0xc1, 0xe1, 0x2f, 0x40, 0x05, 0x5b, 0x16, - 0x61, 0x2c, 0x78, 0x79, 0xd5, 0x8e, 0xbe, 0x26, 0xf7, 0xd9, 0x10, 0x63, 0xb3, 0x9d, 0xb8, 0x8e, - 0xa6, 0xc0, 0x9a, 0x9f, 0x56, 0xc1, 0xfa, 0x74, 0xe1, 0xe1, 0xed, 0x04, 0xc1, 0xd1, 0xe4, 0x2b, - 0x1d, 0x91, 0xfb, 0x0c, 0x92, 0x73, 0x3b, 0xd1, 0x77, 0x2f, 0xcf, 0x65, 0x76, 0x4d, 0xe6, 0xbe, - 0x89, 0x35, 0x99, 0xcd, 0xcb, 0xf2, 0xdf, 0x2c, 0x2f, 0xfb, 0xff, 0xa1, 0x3a, 0x7f, 0x9c, 0x25, - 0x00, 0x05, 0xb9, 0xa8, 0x3e, 0x59, 0xdc, 0xbb, 0xbf, 0x18, 0x0a, 0xb0, 0xba, 0x20, 0x0a, 0x90, - 0x64, 0x55, 0xc5, 0xd7, 0xc5, 0xaa, 0x32, 0x78, 0x46, 0xe9, 0x35, 0xf0, 0x8c, 0x26, 0x28, 0x38, - 0xf8, 0xb2, 0xdd, 0x23, 0x92, 0xc5, 0x94, 0x82, 0xc1, 0xd7, 0x91, 0x12, 0xa4, 0x34, 0xff, 0x73, - 0x2e, 0x92, 0xbd, 0xd0, 0x2b, 0xaf, 0xb4, 0xd0, 0x33, 0x79, 0xcd, 0xda, 0x9c, 0xbc, 0x66, 0xfd, - 0xda, 0xbc, 0xa6, 0x3a, 0x07, 0xaf, 0x79, 0x1b, 0xac, 0x3a, 0xf8, 0xb2, 0xc3, 0x14, 0x15, 0xc9, - 0x9b, 0x65, 0xf1, 0xf9, 0xd9, 0x09, 0x44, 0x28, 0xd4, 0x89, 0xc0, 0x1c, 0x7c, 0x69, 0x8e, 0x38, - 0x11, 0x3c, 0x24, 0xa2, 0x2c, 0x1d, 0x25, 0x43, 0x91, 0x56, 0x01, 0x76, 0xfd, 0x63, 0xa6, 0xc3, - 0x29, 0x40, 0x21, 0x42, 0xa1, 0x0e, 0x1a, 0x00, 0x38, 0xf8, 0xf2, 0x10, 0x8f, 0xc4, 0x47, 0x98, - 0xbe, 0x29, 0x21, 0xd7, 0x27, 0xe3, 0x06, 0xe8, 0x44, 0x52, 0x94, 0xb0, 0x80, 0x07, 0x60, 0xcb, - 0xc3, 0xa7, 0xfc, 0x21, 0xc1, 0x1e, 0x3f, 0x26, 0x98, 0x1f, 0xd9, 0x0e, 0xa1, 0x3e, 0xd7, 0xb7, - 0xa2, 0x05, 0xb0, 0x85, 0x32, 0xf4, 0x28, 0xf3, 0x16, 0xdc, 0x07, 0x9b, 0x42, 0xbe, 0x27, 0x5e, - 0x61, 0x9b, 0xba, 0x21, 0xd8, 0x1b, 0x12, 0xec, 0xcd, 0xc9, 0xb8, 0xb1, 0x89, 0xd2, 0x6a, 0x94, - 0x75, 0x07, 0xfe, 0x18, 0x6c, 0x08, 0xf1, 0x01, 0xc1, 0x8c, 0x84, 0x38, 0xdf, 0x92, 0x38, 0x5b, - 0xa2, 0x13, 0xd1, 0x8c, 0x0e, 0xa5, 0xac, 0xe1, 0x2e, 0xa8, 0x09, 0xd9, 0x2e, 0x75, 0x1c, 0x3b, - 0xca, 0xeb, 0x4d, 0x09, 0x21, 0x07, 0x39, 0x9a, 0x55, 0xa2, 0xb4, 0xfd, 0xfc, 0xe4, 0xef, 0x4f, - 0xcb, 0x60, 0x33, 0x63, 0xa9, 0x89, 0xfc, 0x18, 0xa7, 0x1e, 0xee, 0x91, 0xb8, 0xb5, 0xb5, 0x38, - 0xbf, 0xee, 0x8c, 0x0e, 0xa5, 0xac, 0xe1, 0x53, 0x00, 0x82, 0xe5, 0xdf, 0xa1, 0x27, 0xca, 0xb1, - 0x79, 0x5f, 0x3c, 0xea, 0x76, 0x24, 0x7d, 0x31, 0x6e, 0xdc, 0xc9, 0xfa, 0x07, 0x70, 0x18, 0x0f, - 0x7f, 0x42, 0xfb, 0xbe, 0x43, 0xe2, 0x0b, 0x28, 0x01, 0x09, 0x7f, 0x09, 0xc0, 0x50, 0xea, 0xbb, - 0xf6, 0x6f, 0xc2, 0xe5, 0xfe, 0x95, 0xff, 0x49, 0x34, 0xc2, 0xff, 0x55, 0x1b, 0x3f, 0xf5, 0xb1, - 0xcb, 0xc5, 0xfb, 0x21, 0x7b, 0xef, 0x49, 0x84, 0x82, 0x12, 0x88, 0xa6, 0xf1, 0xec, 0x79, 0x7d, - 0xe9, 0xb3, 0xe7, 0xf5, 0xa5, 0xcf, 0x9f, 0xd7, 0x97, 0x7e, 0x3b, 0xa9, 0x6b, 0xcf, 0x26, 0x75, - 0xed, 0xb3, 0x49, 0x5d, 0xfb, 0x7c, 0x52, 0xd7, 0xbe, 0x98, 0xd4, 0xb5, 0x4f, 0xbf, 0xac, 0x2f, - 0x7d, 0x5c, 0x0c, 0xd7, 0xca, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0xc9, 0x53, 0xf9, 0xb2, 0x50, - 0x1a, 0x00, 0x00, + // 1839 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x58, 0xdd, 0x6e, 0x1b, 0xc7, + 0x15, 0xd6, 0xea, 0x97, 0x1c, 0x52, 0x3f, 0x1c, 0x29, 0xcd, 0x5a, 0x88, 0x49, 0x83, 0x45, 0x0a, + 0x15, 0xb1, 0x97, 0x75, 0x10, 0xb4, 0x6e, 0x6e, 0x5c, 0xae, 0x22, 0xd7, 0x72, 0x44, 0x47, 0x1d, + 0x2a, 0x2e, 0x9a, 0x06, 0x75, 0x47, 0xab, 0x11, 0xb5, 0x12, 0x77, 0x87, 0xdd, 0x99, 0x25, 0xc4, + 0x5e, 0x15, 0x7d, 0x82, 0xa0, 0x28, 0x8a, 0xbe, 0x41, 0x81, 0x3e, 0x40, 0x9f, 0xc1, 0x17, 0xbd, + 0x08, 0x90, 0x8b, 0xe6, 0x8a, 0x88, 0x19, 0x14, 0x28, 0xd0, 0x37, 0xf0, 0x55, 0x31, 0xb3, 0xb3, + 0x3f, 0xdc, 0x5d, 0xc6, 0x8a, 0x49, 0xd5, 0xc8, 0x95, 0x38, 0xe7, 0x9c, 0xf9, 0xce, 0xcf, 0x9c, + 0x3d, 0xf3, 0x8d, 0xc0, 0xa3, 0x8e, 0xcd, 0xcf, 0xfc, 0x63, 0xc3, 0xa2, 0x4e, 0x03, 0x7b, 0x1d, + 0xda, 0xf3, 0xe8, 0xb9, 0xfc, 0x71, 0x87, 0xf4, 0x89, 0xcb, 0x59, 0xa3, 0x77, 0xd1, 0x69, 0xe0, + 0x9e, 0xcd, 0x1a, 0x72, 0x7d, 0xec, 0xb3, 0x46, 0xff, 0x2e, 0xee, 0xf6, 0xce, 0xf0, 0xdd, 0x46, + 0x87, 0xb8, 0xc4, 0xc3, 0x9c, 0x9c, 0x18, 0x3d, 0x8f, 0x72, 0x0a, 0xdf, 0x8f, 0xb1, 0x8c, 0x10, + 0x4b, 0xfe, 0x78, 0x1a, 0x60, 0x19, 0xbd, 0x8b, 0x8e, 0x21, 0xb0, 0x8c, 0x10, 0xcb, 0x08, 0xb1, + 0xb6, 0xef, 0x5f, 0x39, 0x0e, 0x8b, 0x3a, 0x0e, 0x75, 0xd3, 0xce, 0xb7, 0xef, 0x24, 0x00, 0x3a, + 0xb4, 0x43, 0x1b, 0x52, 0x7c, 0xec, 0x9f, 0xca, 0x95, 0x5c, 0xc8, 0x5f, 0xca, 0xbc, 0x7e, 0x71, + 0x8f, 0x19, 0x36, 0x15, 0x90, 0x0d, 0x8b, 0x7a, 0xa4, 0xd1, 0xcf, 0xe4, 0xb3, 0xfd, 0x5e, 0x6c, + 0xe3, 0x60, 0xeb, 0xcc, 0x76, 0x89, 0x37, 0x08, 0xe3, 0x68, 0x78, 0x84, 0x51, 0xdf, 0xb3, 0xc8, + 0xb7, 0xda, 0xc5, 0x1a, 0x0e, 0xe1, 0x38, 0xcf, 0x57, 0x63, 0xd2, 0x2e, 0xcf, 0x77, 0xb9, 0xed, + 0x64, 0xdd, 0xfc, 0xf8, 0x65, 0x1b, 0x98, 0x75, 0x46, 0x1c, 0x9c, 0xde, 0x57, 0xff, 0xaf, 0x06, + 0x8a, 0xa6, 0xcf, 0x76, 0xa9, 0x7b, 0x6a, 0x77, 0xe0, 0x09, 0x58, 0x74, 0x31, 0x67, 0xba, 0x76, + 0x4b, 0xdb, 0x29, 0xbd, 0xfb, 0xc0, 0x78, 0xf5, 0x13, 0x34, 0x1e, 0x37, 0x8f, 0xda, 0x01, 0xaa, + 0x59, 0x18, 0x0d, 0x6b, 0x8b, 0x62, 0x8d, 0x24, 0x3a, 0xbc, 0x04, 0xc5, 0x73, 0xc2, 0x19, 0xf7, + 0x08, 0x76, 0xf4, 0x79, 0xe9, 0xea, 0xc3, 0x69, 0x5c, 0x3d, 0x22, 0xbc, 0x2d, 0xc1, 0x94, 0xbf, + 0xd5, 0xd1, 0xb0, 0x56, 0x8c, 0x84, 0x28, 0x76, 0x56, 0xff, 0xc7, 0x3c, 0xa8, 0xec, 0x52, 0x97, + 0x63, 0x51, 0x9f, 0x23, 0xe2, 0xf4, 0xba, 0x98, 0x13, 0xf8, 0x2b, 0x50, 0x0c, 0x8f, 0x2f, 0x4c, + 0x7d, 0xc7, 0x08, 0xea, 0x29, 0x5c, 0x1a, 0xa2, 0x21, 0x8c, 0xfe, 0x5d, 0x03, 0x29, 0x23, 0x44, + 0x7e, 0xe7, 0xdb, 0x1e, 0x71, 0x44, 0x5c, 0x66, 0xe5, 0xd9, 0xb0, 0x36, 0x27, 0x1c, 0x86, 0x5a, + 0x86, 0x62, 0x34, 0x78, 0x0c, 0xd6, 0x6d, 0x07, 0x77, 0xc8, 0xa1, 0xdf, 0xed, 0x1e, 0xd2, 0xae, + 0x6d, 0x0d, 0x64, 0xc2, 0x45, 0xf3, 0x9e, 0xda, 0xb6, 0xbe, 0x3f, 0xae, 0x7e, 0x31, 0xac, 0xdd, + 0xcc, 0xf6, 0xa2, 0x11, 0x1b, 0xa0, 0x34, 0xa0, 0xf0, 0xc1, 0x88, 0xe5, 0x7b, 0x36, 0x1f, 0x88, + 0xdc, 0xc8, 0x25, 0xd7, 0x17, 0x64, 0x12, 0xdf, 0xcf, 0x4b, 0xa2, 0x3d, 0x6e, 0x6a, 0x6e, 0x8a, + 0x20, 0x52, 0x42, 0x94, 0x06, 0xac, 0xff, 0x73, 0x1e, 0x14, 0xf6, 0x44, 0xe1, 0x4d, 0x9f, 0xc1, + 0xdf, 0x82, 0x82, 0xe8, 0xdb, 0x13, 0xcc, 0xb1, 0x2a, 0xd7, 0x8f, 0x12, 0x9e, 0xa2, 0xf6, 0x8b, + 0x8f, 0x4c, 0x58, 0x0b, 0xdf, 0x1f, 0x1d, 0x9f, 0x13, 0x8b, 0xb7, 0x08, 0xc7, 0x26, 0x54, 0xf9, + 0x83, 0x58, 0x86, 0x22, 0x54, 0x78, 0x0e, 0x16, 0x59, 0x8f, 0x58, 0xaa, 0x39, 0x1e, 0x4e, 0xd3, + 0x1c, 0x61, 0xd4, 0xed, 0x1e, 0xb1, 0xcc, 0xb2, 0xf2, 0xba, 0x28, 0x56, 0x48, 0xfa, 0x80, 0x1e, + 0x58, 0x66, 0x1c, 0x73, 0x9f, 0xa9, 0xaa, 0x3d, 0x9a, 0x89, 0x37, 0x89, 0x68, 0xae, 0x29, 0x7f, + 0xcb, 0xc1, 0x1a, 0x29, 0x4f, 0xf5, 0x7f, 0x69, 0xa0, 0x1c, 0x9a, 0x1e, 0xd8, 0x8c, 0xc3, 0x4f, + 0x33, 0x25, 0x35, 0xae, 0x56, 0x52, 0xb1, 0x5b, 0x16, 0x74, 0x43, 0xb9, 0x2a, 0x84, 0x92, 0x44, + 0x39, 0x6d, 0xb0, 0x64, 0x73, 0xe2, 0x30, 0x7d, 0xfe, 0xd6, 0xc2, 0x4e, 0xe9, 0xdd, 0x0f, 0x66, + 0x91, 0xa1, 0xb9, 0xaa, 0x1c, 0x2e, 0xed, 0x0b, 0x68, 0x14, 0x78, 0xa8, 0xff, 0x27, 0x91, 0x99, + 0x28, 0x32, 0xc4, 0x63, 0x23, 0x65, 0x77, 0xda, 0x91, 0x22, 0x3c, 0xa7, 0xe7, 0x89, 0x9f, 0x9d, + 0x27, 0x0f, 0x67, 0x32, 0x4f, 0x64, 0x9a, 0x13, 0x87, 0xc9, 0x57, 0x1a, 0x58, 0x1b, 0x3f, 0x6f, + 0xf8, 0x34, 0xea, 0xa5, 0x20, 0xdd, 0x9f, 0x5c, 0x3d, 0x8c, 0xe0, 0x1e, 0x33, 0xbe, 0xb9, 0x71, + 0xa0, 0x03, 0x96, 0x2d, 0x39, 0xe4, 0x54, 0x9e, 0x7b, 0xd3, 0xe4, 0x19, 0xcd, 0xfd, 0xd8, 0x5d, + 0xb0, 0x46, 0xca, 0x49, 0xfd, 0x97, 0x60, 0x35, 0x4a, 0xbd, 0xe9, 0xf3, 0x33, 0xf8, 0x00, 0x2c, + 0x71, 0x7a, 0x41, 0x5c, 0x95, 0xdf, 0xdb, 0x13, 0x26, 0x8c, 0x47, 0xf8, 0x87, 0x64, 0xd0, 0x26, + 0x5d, 0x62, 0x71, 0xea, 0x99, 0x45, 0xd1, 0x26, 0x47, 0x62, 0x1f, 0x0a, 0xb6, 0xd7, 0xbf, 0x58, + 0x05, 0xe5, 0x64, 0x99, 0xe1, 0x0f, 0xc1, 0x4a, 0x9f, 0x78, 0xcc, 0xa6, 0x01, 0x74, 0xd1, 0x5c, + 0x57, 0x21, 0xad, 0x3c, 0x09, 0xc4, 0x28, 0xd4, 0xc3, 0x1d, 0x50, 0xf0, 0x48, 0xaf, 0x6b, 0x5b, + 0x98, 0xc9, 0x2a, 0x2c, 0x99, 0x65, 0xd1, 0xf7, 0x48, 0xc9, 0x50, 0xa4, 0x85, 0x7f, 0xd2, 0x40, + 0xc5, 0x4a, 0x8f, 0x7b, 0xf5, 0x99, 0xb7, 0xa6, 0xa9, 0x5c, 0xe6, 0x0e, 0x31, 0xdf, 0x18, 0x0d, + 0x6b, 0xd9, 0xab, 0x05, 0x65, 0xdd, 0xc3, 0xbf, 0x6b, 0xe0, 0x86, 0x47, 0xba, 0x14, 0x9f, 0x10, + 0x2f, 0xb3, 0x41, 0x5f, 0xbc, 0x8e, 0xe0, 0x6e, 0x8e, 0x86, 0xb5, 0x1b, 0x68, 0x92, 0x4f, 0x34, + 0x39, 0x1c, 0xf8, 0x37, 0x0d, 0xe8, 0x0e, 0xe1, 0x9e, 0x6d, 0xb1, 0x6c, 0xac, 0x4b, 0xd7, 0x11, + 0xeb, 0x5b, 0xa3, 0x61, 0x4d, 0x6f, 0x4d, 0x70, 0x89, 0x26, 0x06, 0x03, 0xff, 0xa8, 0x81, 0x52, + 0x4f, 0x74, 0x08, 0xe3, 0xc4, 0xb5, 0x88, 0xbe, 0x2c, 0x83, 0xfb, 0x68, 0x9a, 0xe0, 0x0e, 0x63, + 0xb8, 0x36, 0x17, 0xa4, 0xa9, 0x33, 0x30, 0xd7, 0x47, 0xc3, 0x5a, 0x29, 0xa1, 0x40, 0x49, 0xa7, + 0xd0, 0x4a, 0x8c, 0xf1, 0x15, 0x19, 0xc0, 0x4f, 0xbf, 0xf5, 0x04, 0x68, 0x29, 0x80, 0xa0, 0xab, + 0xc3, 0x55, 0x62, 0x9a, 0xff, 0x59, 0x03, 0x65, 0x97, 0x9e, 0x90, 0xf0, 0xf3, 0xd2, 0x0b, 0x72, + 0xaa, 0x7f, 0x32, 0xab, 0x91, 0x67, 0x3c, 0x4e, 0x80, 0xef, 0xb9, 0xdc, 0x1b, 0x98, 0x5b, 0xea, + 0x63, 0x2c, 0x27, 0x55, 0x68, 0x2c, 0x0a, 0xf8, 0x31, 0x28, 0x71, 0xda, 0x15, 0xe4, 0xd2, 0xa6, + 0x2e, 0xd3, 0x8b, 0x32, 0xa8, 0x6a, 0xde, 0x80, 0x38, 0x8a, 0xcc, 0xcc, 0x4d, 0x05, 0x5c, 0x8a, + 0x65, 0x0c, 0x25, 0x71, 0x20, 0xc9, 0xb2, 0x1b, 0x20, 0x2b, 0xfb, 0x83, 0x3c, 0xe8, 0x43, 0x7a, + 0xf2, 0x4a, 0x04, 0x07, 0xba, 0x60, 0x23, 0xe2, 0x55, 0xc1, 0x00, 0x63, 0x7a, 0x49, 0xa6, 0x90, + 0x4b, 0x05, 0x0f, 0xa8, 0x85, 0xbb, 0x01, 0x75, 0x41, 0xe4, 0x94, 0x78, 0xe2, 0xf4, 0x4d, 0x5d, + 0x25, 0xb3, 0xb1, 0x9f, 0x42, 0x42, 0x19, 0x6c, 0xf8, 0x73, 0x50, 0xe9, 0x79, 0x36, 0x95, 0x21, + 0x74, 0x31, 0x63, 0x8f, 0xb1, 0x43, 0xf4, 0xb2, 0x9c, 0x7c, 0x37, 0x14, 0x4c, 0xe5, 0x30, 0x6d, + 0x80, 0xb2, 0x7b, 0xc4, 0x34, 0x0c, 0x85, 0xfa, 0x6a, 0x3c, 0x0d, 0xc3, 0xbd, 0x28, 0xd2, 0xc2, + 0x07, 0xa0, 0x80, 0x4f, 0x4f, 0x6d, 0x57, 0x58, 0xae, 0xc9, 0x12, 0xbe, 0x95, 0x97, 0x5a, 0x53, + 0xd9, 0x04, 0x38, 0xe1, 0x0a, 0x45, 0x7b, 0xe1, 0x23, 0x00, 0x19, 0xf1, 0xfa, 0xb6, 0x45, 0x9a, + 0x96, 0x45, 0x7d, 0x97, 0xcb, 0xd8, 0xd7, 0x65, 0xec, 0xdb, 0x2a, 0x76, 0xd8, 0xce, 0x58, 0xa0, + 0x9c, 0x5d, 0x22, 0x7a, 0x46, 0x38, 0xb7, 0xdd, 0x0e, 0xd3, 0x37, 0x24, 0x82, 0xf4, 0xda, 0x56, + 0x32, 0x14, 0x69, 0xe1, 0x3b, 0xa0, 0xc8, 0x38, 0xf6, 0x78, 0xd3, 0xeb, 0x30, 0xbd, 0x72, 0x6b, + 0x61, 0xa7, 0x18, 0x5c, 0xcd, 0xed, 0x50, 0x88, 0x62, 0x3d, 0x7c, 0x0f, 0x94, 0x59, 0xe2, 0x45, + 0xa0, 0x43, 0x09, 0xbd, 0x21, 0x3a, 0x38, 0xf9, 0x52, 0x40, 0x63, 0x56, 0xdb, 0xf7, 0x41, 0x25, + 0xd3, 0xfa, 0x70, 0x03, 0x2c, 0x5c, 0x90, 0x41, 0x70, 0x29, 0x21, 0xf1, 0x13, 0x6e, 0x81, 0xa5, + 0x3e, 0xee, 0xfa, 0x24, 0x60, 0xf2, 0x28, 0x58, 0xbc, 0x3f, 0x7f, 0x4f, 0xab, 0x7f, 0xa1, 0x81, + 0xf5, 0xd4, 0x63, 0x04, 0xde, 0x04, 0x0b, 0xbe, 0xd7, 0x55, 0x97, 0x5a, 0x49, 0x95, 0x67, 0xe1, + 0x63, 0x74, 0x80, 0x84, 0x1c, 0x76, 0xc0, 0x22, 0xf6, 0xf9, 0x99, 0xba, 0xce, 0xf7, 0x67, 0xf2, + 0x0d, 0x8b, 0x9b, 0x3a, 0x20, 0x49, 0xe2, 0x17, 0x92, 0x0e, 0xe0, 0xbd, 0x54, 0x49, 0x16, 0x64, + 0x40, 0xd1, 0x87, 0x3d, 0xb9, 0x2c, 0xf5, 0x7f, 0x6b, 0x60, 0x45, 0x51, 0x2f, 0xe8, 0x82, 0x65, + 0x17, 0x73, 0xbb, 0x4f, 0x14, 0x01, 0x98, 0x8a, 0x2c, 0x3f, 0x96, 0x48, 0xd1, 0x68, 0x05, 0x82, + 0x80, 0x04, 0x32, 0xa4, 0xbc, 0xc0, 0x73, 0xb0, 0x4c, 0x2e, 0x29, 0xb7, 0xc3, 0xa7, 0xc0, 0xac, + 0x9e, 0xa4, 0xd2, 0xd7, 0x9e, 0x44, 0x46, 0xca, 0x43, 0xfd, 0x6b, 0x0d, 0x80, 0xd8, 0xe4, 0x65, + 0x07, 0xf7, 0x0e, 0x28, 0x5a, 0x5d, 0x9f, 0x71, 0xe2, 0xed, 0x7f, 0xa0, 0xde, 0x74, 0xb2, 0x1f, + 0x77, 0x43, 0x21, 0x8a, 0xf5, 0xf0, 0xb6, 0x3a, 0xe5, 0xa0, 0xe8, 0x7a, 0x78, 0x34, 0x2f, 0x86, + 0xb5, 0xb2, 0xf8, 0x1b, 0x96, 0x40, 0x1d, 0xd5, 0xaf, 0x41, 0x19, 0x5b, 0x16, 0x61, 0x2c, 0x18, + 0x16, 0x8a, 0x13, 0x5c, 0x91, 0x6b, 0xc9, 0x26, 0x6f, 0x26, 0xb6, 0xa3, 0x31, 0xb0, 0xfa, 0x67, + 0xeb, 0x60, 0x6d, 0xbc, 0xf0, 0xf0, 0x76, 0x82, 0x50, 0x69, 0x72, 0x84, 0x44, 0x8f, 0x89, 0x1c, + 0x52, 0x75, 0x3b, 0xd1, 0xb1, 0x2f, 0xcf, 0x25, 0x7d, 0x2d, 0x2f, 0xbc, 0x8e, 0x6b, 0x39, 0x9f, + 0x07, 0x2e, 0xbe, 0x5e, 0x1e, 0xf8, 0xdd, 0xa1, 0x56, 0x7f, 0x49, 0x13, 0x8e, 0x65, 0x79, 0x31, + 0x7e, 0x3a, 0xbb, 0x6f, 0x7f, 0x36, 0x94, 0x63, 0x65, 0x46, 0x94, 0x23, 0xc9, 0xe2, 0x0a, 0xd7, + 0xc5, 0xe2, 0x72, 0x78, 0x4d, 0xf1, 0x1a, 0x78, 0x4d, 0x1d, 0x2c, 0x3b, 0xf8, 0xb2, 0xd9, 0x21, + 0x92, 0x35, 0x15, 0x83, 0xc1, 0xd7, 0x92, 0x12, 0xa4, 0x34, 0xff, 0x77, 0xee, 0x93, 0x4f, 0x20, + 0xca, 0xaf, 0x44, 0x20, 0x72, 0x79, 0xd4, 0xea, 0x94, 0x3c, 0x6a, 0xed, 0xca, 0x3c, 0x6a, 0x7d, + 0x0a, 0x1e, 0xf5, 0x36, 0x58, 0x71, 0xf0, 0x65, 0x8b, 0x29, 0xea, 0xb3, 0x68, 0x96, 0xc4, 0x73, + 0xb7, 0x15, 0x88, 0x50, 0xa8, 0x13, 0x81, 0x39, 0xf8, 0xd2, 0x1c, 0x70, 0x22, 0x78, 0x4f, 0x44, + 0x91, 0x5a, 0x4a, 0x86, 0x22, 0xad, 0x02, 0x6c, 0xfb, 0xc7, 0x4c, 0x12, 0x9e, 0x18, 0x50, 0x88, + 0x50, 0xa8, 0x83, 0x06, 0x00, 0x0e, 0xbe, 0x3c, 0xc4, 0x03, 0xf1, 0xe8, 0xd3, 0x37, 0x25, 0xe4, + 0xda, 0x68, 0x58, 0x03, 0xad, 0x48, 0x8a, 0x12, 0x16, 0xf0, 0x00, 0x6c, 0x79, 0xf8, 0x94, 0x3f, + 0x24, 0xd8, 0xe3, 0xc7, 0x04, 0xf3, 0x23, 0xdb, 0x21, 0xd4, 0xe7, 0xfa, 0x56, 0x74, 0x01, 0x6c, + 0xa1, 0x1c, 0x3d, 0xca, 0xdd, 0x05, 0xf7, 0xc1, 0xa6, 0x90, 0xef, 0x89, 0x4f, 0xd8, 0xa6, 0x6e, + 0x08, 0xf6, 0x86, 0x04, 0x7b, 0x73, 0x34, 0xac, 0x6d, 0xa2, 0xac, 0x1a, 0xe5, 0xed, 0x81, 0x3f, + 0x03, 0x1b, 0x42, 0x7c, 0x40, 0x30, 0x23, 0x21, 0xce, 0xf7, 0x02, 0x5a, 0x23, 0x3a, 0x11, 0xa5, + 0x74, 0x28, 0x63, 0x0d, 0x77, 0x41, 0x45, 0xc8, 0x76, 0xa9, 0xe3, 0xd8, 0x51, 0x5e, 0x6f, 0x4a, + 0x08, 0x39, 0xc8, 0x51, 0x5a, 0x89, 0xb2, 0xf6, 0xd3, 0xd3, 0xc6, 0xbf, 0xce, 0x83, 0xcd, 0x9c, + 0x4b, 0x4d, 0xe4, 0xc7, 0x38, 0xf5, 0x70, 0x87, 0xc4, 0xad, 0xad, 0xc5, 0xf9, 0xb5, 0x53, 0x3a, + 0x94, 0xb1, 0x86, 0x4f, 0x01, 0x08, 0x2e, 0xff, 0x16, 0x3d, 0x51, 0x8e, 0xcd, 0xfb, 0xe2, 0xa8, + 0x9b, 0x91, 0xf4, 0xc5, 0xb0, 0x76, 0x27, 0xef, 0x1f, 0xce, 0x61, 0x3c, 0xfc, 0x09, 0xed, 0xfa, + 0x0e, 0x89, 0x37, 0xa0, 0x04, 0x24, 0xfc, 0x0d, 0x00, 0x7d, 0xa9, 0x6f, 0xdb, 0xbf, 0x0f, 0x2f, + 0xf7, 0x6f, 0xfc, 0xcf, 0xa5, 0x11, 0xfe, 0x6f, 0xdc, 0xf8, 0x85, 0x8f, 0x5d, 0x2e, 0xbe, 0x0f, + 0xd9, 0x7b, 0x4f, 0x22, 0x14, 0x94, 0x40, 0x34, 0x8d, 0x67, 0xcf, 0xab, 0x73, 0x9f, 0x3f, 0xaf, + 0xce, 0x7d, 0xf9, 0xbc, 0x3a, 0xf7, 0x87, 0x51, 0x55, 0x7b, 0x36, 0xaa, 0x6a, 0x9f, 0x8f, 0xaa, + 0xda, 0x97, 0xa3, 0xaa, 0xf6, 0xd5, 0xa8, 0xaa, 0x7d, 0xf6, 0x75, 0x75, 0xee, 0x93, 0x42, 0x78, + 0xad, 0xfc, 0x2f, 0x00, 0x00, 0xff, 0xff, 0x7a, 0x69, 0x55, 0x5f, 0xc0, 0x1a, 0x00, 0x00, } func (m *BusConfig) Marshal() (dAtA []byte, err error) { @@ -894,6 +895,15 @@ func (m *JetStreamBus) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + if m.StreamConfig != nil { + i -= len(*m.StreamConfig) + copy(dAtA[i:], *m.StreamConfig) + i = encodeVarintGenerated(dAtA, i, uint64(len(*m.StreamConfig))) + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0x92 + } if len(m.StartArgs) > 0 { for iNdEx := len(m.StartArgs) - 1; iNdEx >= 0; iNdEx-- { i -= len(m.StartArgs[iNdEx]) @@ -1098,6 +1108,11 @@ func (m *JetStreamConfig) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + i -= len(m.StreamConfig) + copy(dAtA[i:], m.StreamConfig) + i = encodeVarintGenerated(dAtA, i, uint64(len(m.StreamConfig))) + i-- + dAtA[i] = 0x1a if m.Auth != nil { { size, err := m.Auth.MarshalToSizedBuffer(dAtA[:i]) @@ -1711,6 +1726,10 @@ func (m *JetStreamBus) Size() (n int) { n += 2 + l + sovGenerated(uint64(l)) } } + if m.StreamConfig != nil { + l = len(*m.StreamConfig) + n += 2 + l + sovGenerated(uint64(l)) + } return n } @@ -1726,6 +1745,8 @@ func (m *JetStreamConfig) Size() (n int) { l = m.Auth.Size() n += 1 + l + sovGenerated(uint64(l)) } + l = len(m.StreamConfig) + n += 1 + l + sovGenerated(uint64(l)) return n } @@ -2020,6 +2041,7 @@ func (this *JetStreamBus) String() string { `ServiceAccountName:` + fmt.Sprintf("%v", this.ServiceAccountName) + `,`, `Settings:` + valueToStringGenerated(this.Settings) + `,`, `StartArgs:` + fmt.Sprintf("%v", this.StartArgs) + `,`, + `StreamConfig:` + valueToStringGenerated(this.StreamConfig) + `,`, `}`, }, "") return s @@ -2031,6 +2053,7 @@ func (this *JetStreamConfig) String() string { s := strings.Join([]string{`&JetStreamConfig{`, `URL:` + fmt.Sprintf("%v", this.URL) + `,`, `Auth:` + strings.Replace(this.Auth.String(), "JetStreamAuth", "JetStreamAuth", 1) + `,`, + `StreamConfig:` + fmt.Sprintf("%v", this.StreamConfig) + `,`, `}`, }, "") return s @@ -3671,6 +3694,39 @@ func (m *JetStreamBus) Unmarshal(dAtA []byte) error { } m.StartArgs = append(m.StartArgs, string(dAtA[iNdEx:postIndex])) iNdEx = postIndex + case 18: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field StreamConfig", 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 + } + s := string(dAtA[iNdEx:postIndex]) + m.StreamConfig = &s + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipGenerated(dAtA[iNdEx:]) @@ -3789,6 +3845,38 @@ func (m *JetStreamConfig) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex + case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field StreamConfig", 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.StreamConfig = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipGenerated(dAtA[iNdEx:]) diff --git a/pkg/apis/eventbus/v1alpha1/generated.proto b/pkg/apis/eventbus/v1alpha1/generated.proto index bf0e4b3822..6dbf07aae1 100644 --- a/pkg/apis/eventbus/v1alpha1/generated.proto +++ b/pkg/apis/eventbus/v1alpha1/generated.proto @@ -184,6 +184,11 @@ message JetStreamBus { // Check https://docs.nats.io/ for all the available arguments. // +optional repeated string startArgs = 17; + + // Optional configuration for the streams to be created in this JetStream service, if specified, it will be merged with the default configuration in controller-config. + // It accepts a YAML format configuration, available fields include, "maxBytes", "maxMsgs", "maxAge" (e.g. 72h), "replicas" (1, 3, 5), "duplicates" (e.g. 5m). + // +optional + optional string streamConfig = 18; } message JetStreamConfig { @@ -191,6 +196,9 @@ message JetStreamConfig { optional string url = 1; optional JetStreamAuth auth = 2; + + // +optional + optional string streamConfig = 3; } // NATSBus holds the NATS eventbus information diff --git a/pkg/apis/eventbus/v1alpha1/jetstream_eventbus.go b/pkg/apis/eventbus/v1alpha1/jetstream_eventbus.go index d785f95a4f..8b7d3122e1 100644 --- a/pkg/apis/eventbus/v1alpha1/jetstream_eventbus.go +++ b/pkg/apis/eventbus/v1alpha1/jetstream_eventbus.go @@ -78,6 +78,10 @@ type JetStreamBus struct { // Check https://docs.nats.io/ for all the available arguments. // +optional StartArgs []string `json:"startArgs,omitempty" protobuf:"bytes,17,rep,name=startArgs"` + // Optional configuration for the streams to be created in this JetStream service, if specified, it will be merged with the default configuration in controller-config. + // It accepts a YAML format configuration, available fields include, "maxBytes", "maxMsgs", "maxAge" (e.g. 72h), "replicas" (1, 3, 5), "duplicates" (e.g. 5m). + // +optional + StreamConfig *string `json:"streamConfig,omitempty" protobuf:"bytes,18,opt,name=streamConfig"` } func (j JetStreamBus) GetReplicas() int { @@ -94,6 +98,8 @@ type JetStreamConfig struct { // JetStream (Nats) URL URL string `json:"url,omitempty" protobuf:"bytes,1,opt,name=url"` Auth *JetStreamAuth `json:"auth,omitempty" protobuf:"bytes,2,opt,name=auth"` + // +optional + StreamConfig string `json:"streamConfig,omitempty" protobuf:"bytes,3,opt,name=streamConfig"` } type JetStreamAuth struct { diff --git a/pkg/apis/eventbus/v1alpha1/openapi_generated.go b/pkg/apis/eventbus/v1alpha1/openapi_generated.go index 4fa090b094..45aeb984a4 100644 --- a/pkg/apis/eventbus/v1alpha1/openapi_generated.go +++ b/pkg/apis/eventbus/v1alpha1/openapi_generated.go @@ -443,6 +443,13 @@ func schema_pkg_apis_eventbus_v1alpha1_JetStreamBus(ref common.ReferenceCallback }, }, }, + "streamConfig": { + SchemaProps: spec.SchemaProps{ + Description: "Optional configuration for the streams to be created in this JetStream service, if specified, it will be merged with the default configuration in controller-config. It accepts a YAML format configuration, available fields include, \"maxBytes\", \"maxMsgs\", \"maxAge\" (e.g. 72h), \"replicas\" (1, 3, 5), \"duplicates\" (e.g. 5m).", + Type: []string{"string"}, + Format: "", + }, + }, }, }, }, @@ -469,6 +476,12 @@ func schema_pkg_apis_eventbus_v1alpha1_JetStreamConfig(ref common.ReferenceCallb Ref: ref("github.com/argoproj/argo-events/pkg/apis/eventbus/v1alpha1.JetStreamAuth"), }, }, + "streamConfig": { + SchemaProps: spec.SchemaProps{ + Type: []string{"string"}, + Format: "", + }, + }, }, }, }, diff --git a/pkg/apis/eventbus/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/eventbus/v1alpha1/zz_generated.deepcopy.go index 37f3dd7d85..cc286bfa11 100644 --- a/pkg/apis/eventbus/v1alpha1/zz_generated.deepcopy.go +++ b/pkg/apis/eventbus/v1alpha1/zz_generated.deepcopy.go @@ -278,6 +278,11 @@ func (in *JetStreamBus) DeepCopyInto(out *JetStreamBus) { *out = make([]string, len(*in)) copy(*out, *in) } + if in.StreamConfig != nil { + in, out := &in.StreamConfig, &out.StreamConfig + *out = new(string) + **out = **in + } return }