diff --git a/api/event-bus.html b/api/event-bus.html index c606108c27..7cfdd6d5e5 100644 --- a/api/event-bus.html +++ b/api/event-bus.html @@ -80,6 +80,18 @@

ContainerTemplate + + +imagePullPolicy
+ + +Kubernetes core/v1.PullPolicy + + + + + +

EventBus @@ -604,6 +616,17 @@

NativeStrategy

Total size of messages per channel, 0 means unlimited. Defaults to 1GB

+ + +maxSubs
+ +uint64 + + + +

Maximum number of subscriptions per channel, 0 means unlimited. Defaults to 1000

+ +

PersistenceStrategy diff --git a/api/event-bus.md b/api/event-bus.md index 2d79d6355f..309ab45ec2 100644 --- a/api/event-bus.md +++ b/api/event-bus.md @@ -98,6 +98,15 @@ Kubernetes core/v1.ResourceRequirements + + +imagePullPolicy
+ +Kubernetes core/v1.PullPolicy + + + +

@@ -620,6 +629,17 @@ Total size of messages per channel, 0 means unlimited. Defaults to 1GB

+ + +maxSubs
uint64 + + +

+Maximum number of subscriptions per channel, 0 means unlimited. Defaults +to 1000 +

+ +

diff --git a/api/openapi-spec/swagger.json b/api/openapi-spec/swagger.json index b18993ba77..c6af3c4d71 100644 --- a/api/openapi-spec/swagger.json +++ b/api/openapi-spec/swagger.json @@ -280,6 +280,9 @@ "description": "ContainerTemplate defines customized spec for a container", "type": "object", "properties": { + "imagePullPolicy": { + "type": "string" + }, "resources": { "$ref": "#/definitions/io.k8s.api.core.v1.ResourceRequirements" } @@ -445,6 +448,11 @@ "type": "integer", "format": "int64" }, + "maxSubs": { + "description": "Maximum number of subscriptions per channel, 0 means unlimited. Defaults to 1000", + "type": "integer", + "format": "int64" + }, "metadata": { "description": "Metadata sets the pods's metadata, i.e. annotations and labels", "$ref": "#/definitions/io.argoproj.common.Metadata" diff --git a/controllers/eventbus/installer/nats.go b/controllers/eventbus/installer/nats.go index 337c1bf0d7..1488a60bf6 100644 --- a/controllers/eventbus/installer/nats.go +++ b/controllers/eventbus/installer/nats.go @@ -449,6 +449,10 @@ func (i *natsInstaller) buildConfigMap() (*corev1.ConfigMap, error) { if i.eventBus.Spec.NATS.Native.MaxMsgs != nil { maxMsgs = *i.eventBus.Spec.NATS.Native.MaxMsgs } + maxSubs := uint64(1000) + if i.eventBus.Spec.NATS.Native.MaxSubs != nil { + maxSubs = *i.eventBus.Spec.NATS.Native.MaxSubs + } maxBytes := "1GB" if i.eventBus.Spec.NATS.Native.MaxBytes != nil { maxBytes = *i.eventBus.Spec.NATS.Native.MaxBytes @@ -480,8 +484,9 @@ streaming { max_age: %s max_msgs: %v max_bytes: %s + max_subs: %v } -}`, strconv.Itoa(int(monitorPort)), strconv.Itoa(int(clusterPort)), strings.Join(routes, ","), clusterID, strings.Join(peers, ","), maxAge, maxMsgs, maxBytes) +}`, strconv.Itoa(int(monitorPort)), strconv.Itoa(int(clusterPort)), strings.Join(routes, ","), clusterID, strings.Join(peers, ","), maxAge, maxMsgs, maxBytes, maxSubs) cm := &corev1.ConfigMap{ ObjectMeta: metav1.ObjectMeta{ Namespace: i.eventBus.Namespace, @@ -573,6 +578,7 @@ func (i *natsInstaller) buildStatefulSetSpec(serviceName, configmapName, authSec if replicas < 3 { replicas = 3 } + var stanContainerPullPolicy, metricsContainerPullPolicy corev1.PullPolicy stanContainerResources := corev1.ResourceRequirements{ Requests: corev1.ResourceList{ corev1.ResourceCPU: apiresource.MustParse("0"), @@ -581,10 +587,12 @@ func (i *natsInstaller) buildStatefulSetSpec(serviceName, configmapName, authSec containerTmpl := i.eventBus.Spec.NATS.Native.ContainerTemplate if containerTmpl != nil { stanContainerResources = containerTmpl.Resources + stanContainerPullPolicy = containerTmpl.ImagePullPolicy } metricsContainerResources := corev1.ResourceRequirements{} if i.eventBus.Spec.NATS.Native.MetricsContainerTemplate != nil { metricsContainerResources = i.eventBus.Spec.NATS.Native.MetricsContainerTemplate.Resources + metricsContainerPullPolicy = i.eventBus.Spec.NATS.Native.MetricsContainerTemplate.ImagePullPolicy } podTemplateLabels := make(map[string]string) if i.eventBus.Spec.NATS.Native.Metadata != nil && @@ -654,8 +662,9 @@ func (i *natsInstaller) buildStatefulSetSpec(serviceName, configmapName, authSec }, Containers: []corev1.Container{ { - Name: "stan", - Image: i.streamingImage, + Name: "stan", + Image: i.streamingImage, + ImagePullPolicy: stanContainerPullPolicy, Ports: []corev1.ContainerPort{ {Name: "client", ContainerPort: clientPort}, {Name: "cluster", ContainerPort: clusterPort}, @@ -683,8 +692,9 @@ func (i *natsInstaller) buildStatefulSetSpec(serviceName, configmapName, authSec }, }, { - Name: "metrics", - Image: i.metricsImage, + Name: "metrics", + Image: i.metricsImage, + ImagePullPolicy: metricsContainerPullPolicy, Ports: []corev1.ContainerPort{ {Name: "metrics", ContainerPort: common.EventBusMetricsPort}, }, diff --git a/docs/eventbus.md b/docs/eventbus.md index bca374d75e..5887c0c434 100644 --- a/docs/eventbus.md +++ b/docs/eventbus.md @@ -165,7 +165,8 @@ affinity: deleted automatically. It can be cutomized by setting `spec.nats.native.maxAge`, i.e. `240h`. -- Max subscription number is 1000. +- Max subscription number is defaults to `1000`, it could be customized by + setting `spec.nats.native.maxSubs`. ### Exotic diff --git a/manifests/base/eventbus-controller/eventbus-controller-deployment.yaml b/manifests/base/eventbus-controller/eventbus-controller-deployment.yaml index 85bbb304f3..31647071f3 100644 --- a/manifests/base/eventbus-controller/eventbus-controller-deployment.yaml +++ b/manifests/base/eventbus-controller/eventbus-controller-deployment.yaml @@ -28,7 +28,7 @@ spec: fieldRef: fieldPath: metadata.namespace - name: NATS_STREAMING_IMAGE - value: nats-streaming:0.17.0 + value: nats-streaming:0.22.1 - name: NATS_METRICS_EXPORTER_IMAGE value: synadia/prometheus-nats-exporter:0.6.2 livenessProbe: diff --git a/manifests/install.yaml b/manifests/install.yaml index a73ddfa264..179ce3d24c 100644 --- a/manifests/install.yaml +++ b/manifests/install.yaml @@ -300,7 +300,7 @@ spec: fieldRef: fieldPath: metadata.namespace - name: NATS_STREAMING_IMAGE - value: nats-streaming:0.17.0 + value: nats-streaming:0.22.1 - name: NATS_METRICS_EXPORTER_IMAGE value: synadia/prometheus-nats-exporter:0.6.2 image: quay.io/argoproj/argo-events:v1.4.0 diff --git a/manifests/namespace-install.yaml b/manifests/namespace-install.yaml index 3b1c6134f6..4b0d917b25 100644 --- a/manifests/namespace-install.yaml +++ b/manifests/namespace-install.yaml @@ -221,7 +221,7 @@ spec: fieldRef: fieldPath: metadata.namespace - name: NATS_STREAMING_IMAGE - value: nats-streaming:0.17.0 + value: nats-streaming:0.22.1 - name: NATS_METRICS_EXPORTER_IMAGE value: synadia/prometheus-nats-exporter:0.6.2 image: quay.io/argoproj/argo-events:v1.4.0 diff --git a/pkg/apis/eventbus/v1alpha1/generated.pb.go b/pkg/apis/eventbus/v1alpha1/generated.pb.go index c6dab36e7d..cd62adcd83 100644 --- a/pkg/apis/eventbus/v1alpha1/generated.pb.go +++ b/pkg/apis/eventbus/v1alpha1/generated.pb.go @@ -347,94 +347,97 @@ func init() { } var fileDescriptor_871e47633eb7aad4 = []byte{ - // 1386 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x57, 0xdf, 0x6f, 0x1b, 0xc5, - 0x13, 0xcf, 0x25, 0x8e, 0x63, 0xaf, 0xdd, 0xc4, 0xde, 0xf6, 0xfb, 0xd5, 0x11, 0x15, 0xbb, 0xb2, - 0x54, 0x14, 0x89, 0xf6, 0x4c, 0x2b, 0x04, 0xa5, 0x2f, 0xc5, 0x97, 0xa6, 0xd0, 0x52, 0xa7, 0x61, - 0xdd, 0x56, 0x02, 0x2a, 0xca, 0xe6, 0x32, 0x71, 0x2e, 0xf1, 0xdd, 0xb9, 0xb7, 0x7b, 0x56, 0xcc, - 0x13, 0xe2, 0x2f, 0x40, 0x3c, 0x20, 0xfe, 0x03, 0xfe, 0x95, 0x3e, 0xf0, 0xd0, 0x37, 0xfa, 0x82, - 0xd5, 0xba, 0xe2, 0x9f, 0xe8, 0x13, 0xda, 0xbd, 0xbd, 0x1f, 0xf6, 0x39, 0x25, 0x25, 0xe1, 0xc9, - 0xb7, 0xb3, 0x33, 0x9f, 0xcf, 0xcc, 0xec, 0xce, 0xcc, 0x1a, 0xdd, 0xe9, 0xda, 0x7c, 0x2f, 0xd8, - 0x36, 0x2c, 0xcf, 0x69, 0x52, 0xbf, 0xeb, 0xf5, 0x7d, 0x6f, 0x5f, 0x7e, 0x5c, 0x86, 0x01, 0xb8, - 0x9c, 0x35, 0xfb, 0x07, 0xdd, 0x26, 0xed, 0xdb, 0xac, 0x29, 0xd7, 0xdb, 0x01, 0x6b, 0x0e, 0xae, - 0xd0, 0x5e, 0x7f, 0x8f, 0x5e, 0x69, 0x76, 0xc1, 0x05, 0x9f, 0x72, 0xd8, 0x31, 0xfa, 0xbe, 0xc7, - 0x3d, 0x7c, 0x3d, 0xc1, 0x32, 0x22, 0x2c, 0xf9, 0xf1, 0x38, 0xc4, 0x32, 0xfa, 0x07, 0x5d, 0x43, - 0x60, 0x19, 0x11, 0x96, 0x11, 0x61, 0xad, 0xde, 0x38, 0xb6, 0x1f, 0x96, 0xe7, 0x38, 0x9e, 0x3b, - 0x4d, 0xbe, 0x7a, 0x39, 0x05, 0xd0, 0xf5, 0xba, 0x5e, 0x53, 0x8a, 0xb7, 0x83, 0x5d, 0xb9, 0x92, - 0x0b, 0xf9, 0xa5, 0xd4, 0x1b, 0x07, 0xd7, 0x98, 0x61, 0x7b, 0x02, 0xb2, 0x69, 0x79, 0x3e, 0x34, - 0x07, 0x99, 0x78, 0x56, 0x3f, 0x4c, 0x74, 0x1c, 0x6a, 0xed, 0xd9, 0x2e, 0xf8, 0xc3, 0xc8, 0x8f, - 0xa6, 0x0f, 0xcc, 0x0b, 0x7c, 0x0b, 0xde, 0xca, 0x8a, 0x35, 0x1d, 0xe0, 0x74, 0x16, 0x57, 0xf3, - 0x28, 0x2b, 0x3f, 0x70, 0xb9, 0xed, 0x64, 0x69, 0x3e, 0xfa, 0x27, 0x03, 0x66, 0xed, 0x81, 0x43, - 0xa7, 0xed, 0x1a, 0x4f, 0x50, 0xd1, 0x0c, 0xd8, 0xba, 0xe7, 0xee, 0xda, 0x5d, 0xbc, 0x83, 0x72, - 0x2e, 0xe5, 0x4c, 0xd7, 0x2e, 0x68, 0x6b, 0xa5, 0xab, 0xb7, 0x8c, 0x7f, 0x7f, 0x80, 0xc6, 0x66, - 0xeb, 0x7e, 0x27, 0x44, 0x35, 0x0b, 0xe3, 0x51, 0x3d, 0x27, 0xd6, 0x44, 0xa2, 0x37, 0x5c, 0x54, - 0x5d, 0xf7, 0x5c, 0x4e, 0x85, 0x8f, 0xf7, 0xc1, 0xe9, 0xf7, 0x28, 0x07, 0xfc, 0x15, 0x2a, 0x46, - 0x29, 0x8c, 0xf8, 0xd7, 0x8c, 0x30, 0x26, 0x41, 0x61, 0x88, 0x43, 0x31, 0x06, 0x57, 0x0c, 0xa2, - 0x94, 0x08, 0x3c, 0x09, 0x6c, 0x1f, 0x1c, 0xe1, 0x87, 0x59, 0x7d, 0x3a, 0xaa, 0xcf, 0x8d, 0x47, - 0xf5, 0x62, 0xb4, 0xcb, 0x48, 0x82, 0xd6, 0xf8, 0x7d, 0x1e, 0x15, 0x36, 0x84, 0x83, 0x66, 0xc0, - 0xf0, 0x77, 0xa8, 0x20, 0x72, 0xbe, 0x43, 0x39, 0x55, 0x34, 0x1f, 0xa4, 0x68, 0xe2, 0xd4, 0x25, - 0xa1, 0x09, 0x6d, 0x41, 0x7c, 0x6f, 0x7b, 0x1f, 0x2c, 0xde, 0x06, 0x4e, 0x4d, 0xac, 0xe8, 0x50, - 0x22, 0x23, 0x31, 0x2a, 0xde, 0x47, 0x39, 0xd6, 0x07, 0x4b, 0x9f, 0x97, 0xe8, 0x9f, 0x9f, 0x24, - 0x89, 0x91, 0xd7, 0x9d, 0x3e, 0x58, 0x66, 0x59, 0xb1, 0xe6, 0xc4, 0x8a, 0x48, 0x0e, 0xec, 0xa3, - 0x3c, 0xe3, 0x94, 0x07, 0x4c, 0x5f, 0x90, 0x6c, 0x77, 0x4e, 0x85, 0x4d, 0x22, 0x9a, 0xcb, 0x8a, - 0x2f, 0x1f, 0xae, 0x89, 0x62, 0x6a, 0xfc, 0xa1, 0xa1, 0x72, 0xa4, 0x7a, 0xd7, 0x66, 0x1c, 0x3f, - 0xca, 0xa4, 0xd4, 0x38, 0x5e, 0x4a, 0x85, 0xb5, 0x4c, 0x68, 0x45, 0x51, 0x15, 0x22, 0x49, 0x2a, - 0x9d, 0x36, 0x5a, 0xb4, 0x39, 0x38, 0x4c, 0x9f, 0xbf, 0xb0, 0xb0, 0x56, 0xba, 0x7a, 0xf3, 0x34, - 0x22, 0x34, 0xcf, 0x28, 0xc2, 0xc5, 0xdb, 0x02, 0x9a, 0x84, 0x0c, 0x8d, 0x27, 0x49, 0x60, 0x22, - 0xc7, 0x98, 0x4e, 0x94, 0xc3, 0xfa, 0x49, 0xcb, 0x41, 0x10, 0x4f, 0xd7, 0xc2, 0x0b, 0x0d, 0x2d, - 0x4f, 0xe6, 0x1d, 0x3f, 0x8e, 0xcf, 0x34, 0xe4, 0xfd, 0xf8, 0xf8, 0xbc, 0x61, 0x2f, 0x34, 0xde, - 0x7c, 0x80, 0xd8, 0x41, 0x79, 0x4b, 0x56, 0xa6, 0xba, 0xa2, 0x1b, 0x27, 0x09, 0x2c, 0x6e, 0x1e, - 0x09, 0x5d, 0xb8, 0x26, 0x8a, 0xa4, 0xf1, 0x97, 0x86, 0x96, 0x54, 0xf8, 0xd8, 0x45, 0x79, 0x97, - 0x72, 0x7b, 0x00, 0x2a, 0xb6, 0x13, 0xdd, 0xd7, 0x4d, 0x89, 0xd4, 0xe1, 0xa2, 0x9d, 0x75, 0x87, - 0x26, 0x12, 0xdc, 0xa1, 0x8c, 0x28, 0x16, 0xbc, 0x8f, 0xf2, 0x70, 0xe8, 0x71, 0x3b, 0xaa, 0xc6, - 0xd3, 0x6a, 0x69, 0x92, 0x6b, 0x43, 0x22, 0x13, 0xc5, 0xd0, 0x78, 0xa5, 0x21, 0x94, 0xa8, 0xe0, - 0x77, 0xd1, 0x42, 0xe0, 0xf7, 0x64, 0x9c, 0x45, 0xb3, 0xa4, 0x72, 0xb3, 0xf0, 0x80, 0xdc, 0x25, - 0x42, 0x8e, 0xdf, 0x47, 0x45, 0xab, 0x17, 0x30, 0x0e, 0xfe, 0xed, 0x9b, 0xd2, 0xb9, 0xa2, 0x79, - 0x46, 0x74, 0xb0, 0xf5, 0x48, 0x48, 0x92, 0x7d, 0x7c, 0x09, 0xe5, 0x68, 0xc0, 0xf7, 0x64, 0x91, - 0x17, 0x4d, 0x5d, 0xdc, 0xa1, 0x56, 0xc0, 0xf7, 0x5e, 0x8f, 0xea, 0x65, 0xf1, 0x1b, 0xa5, 0x80, - 0x48, 0x2d, 0xfc, 0x0d, 0x2a, 0x53, 0xcb, 0x02, 0xc6, 0x3a, 0x60, 0xf9, 0xc0, 0xf5, 0x9c, 0x0c, - 0xfd, 0xe2, 0xac, 0x6e, 0x1a, 0x6a, 0x7c, 0x01, 0xc3, 0x0e, 0xf4, 0xc0, 0xe2, 0x9e, 0x6f, 0x56, - 0xc6, 0x02, 0x34, 0x65, 0x4e, 0x26, 0xc0, 0x1a, 0x7f, 0x96, 0xd1, 0xf2, 0x64, 0xe2, 0xf1, 0x25, - 0x54, 0xf0, 0xa1, 0xdf, 0xb3, 0x2d, 0x1a, 0x5e, 0xd9, 0xc5, 0xa4, 0x9e, 0x89, 0x92, 0x93, 0x58, - 0x23, 0x8e, 0x65, 0xfe, 0x58, 0xb1, 0x98, 0xa8, 0x4c, 0x5d, 0x6e, 0xb7, 0x76, 0x77, 0x6d, 0xd7, - 0xe6, 0x43, 0x99, 0x81, 0x82, 0x59, 0x53, 0xf8, 0xff, 0xbf, 0x09, 0x7d, 0x1f, 0x2c, 0x31, 0xce, - 0x5a, 0x29, 0x2d, 0x32, 0x61, 0x83, 0x7f, 0xd4, 0x50, 0xa9, 0x0f, 0x3e, 0xb3, 0x19, 0x07, 0xd7, - 0x02, 0x95, 0x8f, 0x7b, 0x27, 0xb9, 0x0a, 0x5b, 0x09, 0x5c, 0x7c, 0xff, 0x56, 0xc6, 0xa3, 0x7a, - 0x29, 0xb5, 0x41, 0xd2, 0xa4, 0xf8, 0x67, 0x0d, 0x55, 0xad, 0xe9, 0xa9, 0xa7, 0x2f, 0x4a, 0x57, - 0xda, 0x27, 0x71, 0x25, 0x33, 0x4a, 0xcd, 0xff, 0x8d, 0x47, 0xf5, 0xec, 0x84, 0x25, 0x59, 0x7a, - 0xfc, 0x9b, 0x86, 0x74, 0x07, 0xb8, 0x6f, 0x5b, 0x2c, 0xa3, 0xaf, 0xe7, 0xff, 0x0b, 0xdf, 0xce, - 0x8f, 0x47, 0x75, 0xbd, 0x7d, 0x04, 0x25, 0x39, 0xd2, 0x19, 0xfc, 0x8b, 0x86, 0xca, 0xae, 0xb7, - 0x03, 0xd1, 0x3d, 0xd5, 0x97, 0xe4, 0x34, 0x78, 0x74, 0x7a, 0xfd, 0xc3, 0xd8, 0x4c, 0xc1, 0x6f, - 0xb8, 0xdc, 0x1f, 0x9a, 0xe7, 0xd4, 0x35, 0x2b, 0xa7, 0xb7, 0xc8, 0x84, 0x1f, 0xf8, 0x01, 0x2a, - 0x71, 0xaf, 0x27, 0x9e, 0x54, 0xb6, 0xe7, 0x32, 0xbd, 0x20, 0xdd, 0xaa, 0xcd, 0xaa, 0xb5, 0xfb, - 0xb1, 0x9a, 0x79, 0x56, 0x01, 0x97, 0x12, 0x19, 0x23, 0x69, 0x1c, 0x6c, 0xa5, 0x66, 0x6a, 0x51, - 0x1e, 0xc4, 0x27, 0x6f, 0x3d, 0x06, 0xda, 0x0a, 0xc0, 0x2c, 0x8b, 0x52, 0x8c, 0x56, 0xa9, 0xd1, - 0x0a, 0x68, 0x85, 0x81, 0x15, 0xf8, 0x36, 0x1f, 0x8a, 0x8c, 0xc3, 0x21, 0xd7, 0x91, 0xe4, 0x7a, - 0x6f, 0x96, 0xff, 0x5b, 0xde, 0x4e, 0x67, 0x52, 0xdb, 0x3c, 0x3b, 0x1e, 0xd5, 0x57, 0xa6, 0x84, - 0x64, 0x1a, 0x13, 0x37, 0x50, 0xde, 0xa1, 0x87, 0xad, 0x2e, 0xe8, 0x25, 0x59, 0xf3, 0xb2, 0x79, - 0xb6, 0xa5, 0x84, 0xa8, 0x1d, 0xec, 0xa2, 0x8a, 0xed, 0xd0, 0x2e, 0x6c, 0x05, 0xbd, 0x5e, 0xd8, - 0x69, 0x98, 0x5e, 0x96, 0xb9, 0x9c, 0xf9, 0x0a, 0xbc, 0xeb, 0x59, 0xb4, 0x17, 0xbe, 0xbe, 0x08, - 0xec, 0x82, 0x2f, 0x4a, 0xcc, 0xd4, 0x55, 0x56, 0x2b, 0xb7, 0xa7, 0x90, 0x48, 0x06, 0x1b, 0xdf, - 0x41, 0x98, 0x81, 0x3f, 0xb0, 0x2d, 0x68, 0x59, 0x96, 0x17, 0xb8, 0x7c, 0x93, 0x3a, 0xa0, 0x9f, - 0x91, 0xfe, 0xad, 0x2a, 0x1c, 0xdc, 0xc9, 0x68, 0x90, 0x19, 0x56, 0xf8, 0x33, 0x54, 0xed, 0xfb, - 0xb6, 0x27, 0x43, 0xee, 0x51, 0xc6, 0x24, 0xd4, 0xb2, 0x84, 0x7a, 0x47, 0x41, 0x55, 0xb7, 0xa6, - 0x15, 0x48, 0xd6, 0x06, 0xaf, 0xa1, 0x42, 0x24, 0xd4, 0x57, 0x64, 0x23, 0x95, 0x27, 0x17, 0xd9, - 0x92, 0x78, 0x17, 0xdf, 0x42, 0x05, 0x1a, 0xb5, 0xc4, 0x8a, 0x3c, 0xb2, 0xf3, 0xb3, 0xd2, 0x14, - 0xb5, 0xc0, 0x10, 0x27, 0x6e, 0x8f, 0xb1, 0x2d, 0xbe, 0x88, 0x96, 0x1c, 0x7a, 0xd8, 0x66, 0x5d, - 0xa6, 0x57, 0x2f, 0x68, 0x6b, 0x39, 0xb3, 0x34, 0x1e, 0xd5, 0x97, 0xda, 0xa1, 0x88, 0x44, 0x7b, - 0xc2, 0x31, 0x87, 0x1e, 0x9a, 0x43, 0x0e, 0x4c, 0xc7, 0x32, 0xb0, 0xf0, 0x4a, 0x29, 0x19, 0x89, - 0x77, 0x57, 0x6f, 0xa0, 0x6a, 0xa6, 0x8e, 0x70, 0x05, 0x2d, 0x1c, 0xc0, 0x30, 0x1c, 0x85, 0x44, - 0x7c, 0xe2, 0x73, 0x68, 0x71, 0x40, 0x7b, 0x01, 0x84, 0x53, 0x80, 0x84, 0x8b, 0xeb, 0xf3, 0xd7, - 0xb4, 0xc6, 0xaf, 0xf3, 0xe8, 0xec, 0x8c, 0xee, 0x8a, 0x3f, 0x45, 0x15, 0xc6, 0x3d, 0x9f, 0x76, - 0x21, 0xc9, 0x71, 0x38, 0x5b, 0xcf, 0x89, 0x23, 0xef, 0x4c, 0xed, 0x91, 0x8c, 0x36, 0x7e, 0x8c, - 0x50, 0x38, 0xc9, 0xda, 0xde, 0x8e, 0x22, 0x36, 0x6f, 0x88, 0x57, 0x7c, 0x2b, 0x96, 0xbe, 0x1e, - 0xd5, 0x2f, 0x67, 0xff, 0x08, 0x26, 0xdd, 0x9e, 0x3f, 0xf4, 0x7a, 0x81, 0x03, 0x89, 0x01, 0x49, - 0x41, 0xe2, 0x6f, 0x11, 0x1a, 0xc8, 0xfd, 0x8e, 0xfd, 0x3d, 0xa8, 0x07, 0xf9, 0x1b, 0x5f, 0xc2, - 0x46, 0xf4, 0x1f, 0xc5, 0xf8, 0x32, 0x10, 0x13, 0x8b, 0x0f, 0xcd, 0x65, 0xe1, 0xd0, 0xc3, 0x18, - 0x85, 0xa4, 0x10, 0x4d, 0xe3, 0xe9, 0xcb, 0xda, 0xdc, 0xb3, 0x97, 0xb5, 0xb9, 0xe7, 0x2f, 0x6b, - 0x73, 0x3f, 0x8c, 0x6b, 0xda, 0xd3, 0x71, 0x4d, 0x7b, 0x36, 0xae, 0x69, 0xcf, 0xc7, 0x35, 0xed, - 0xc5, 0xb8, 0xa6, 0xfd, 0xf4, 0xaa, 0x36, 0xf7, 0x75, 0x21, 0xea, 0x6f, 0x7f, 0x07, 0x00, 0x00, - 0xff, 0xff, 0xd9, 0xdd, 0x9f, 0xc3, 0xcc, 0x0f, 0x00, 0x00, + // 1436 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x57, 0xdd, 0x6e, 0x1b, 0xc5, + 0x17, 0xcf, 0xe6, 0xd3, 0x1e, 0x3b, 0x89, 0x3d, 0xe9, 0xff, 0xaf, 0x25, 0x6a, 0xed, 0xc8, 0x52, + 0x51, 0x24, 0xda, 0x35, 0xad, 0x10, 0x94, 0xde, 0x14, 0x6f, 0x9a, 0x42, 0x4a, 0x9d, 0x86, 0x71, + 0x5b, 0x09, 0xa8, 0x28, 0x93, 0xc9, 0xc4, 0xd9, 0x64, 0x77, 0xc7, 0xdd, 0x99, 0xb5, 0x62, 0xae, + 0x10, 0xe2, 0x01, 0x10, 0x17, 0x88, 0x37, 0xe0, 0x55, 0x7a, 0xc1, 0x45, 0xc5, 0x0d, 0xbd, 0xb2, + 0x5a, 0x57, 0xbc, 0x44, 0xaf, 0xd0, 0xcc, 0xce, 0x7e, 0xf8, 0xa3, 0x25, 0x25, 0xe1, 0xca, 0x3b, + 0x67, 0xce, 0xf9, 0xfd, 0xce, 0x39, 0x33, 0xe7, 0x9c, 0x31, 0xb8, 0xdd, 0x76, 0xc4, 0x41, 0xb8, + 0x6b, 0x11, 0xe6, 0xd5, 0x71, 0xd0, 0x66, 0x9d, 0x80, 0x1d, 0xaa, 0x8f, 0xcb, 0xb4, 0x4b, 0x7d, + 0xc1, 0xeb, 0x9d, 0xa3, 0x76, 0x1d, 0x77, 0x1c, 0x5e, 0x57, 0xeb, 0xdd, 0x90, 0xd7, 0xbb, 0x57, + 0xb0, 0xdb, 0x39, 0xc0, 0x57, 0xea, 0x6d, 0xea, 0xd3, 0x00, 0x0b, 0xba, 0x67, 0x75, 0x02, 0x26, + 0x18, 0xbc, 0x9e, 0x62, 0x59, 0x31, 0x96, 0xfa, 0x78, 0x14, 0x61, 0x59, 0x9d, 0xa3, 0xb6, 0x25, + 0xb1, 0xac, 0x18, 0xcb, 0x8a, 0xb1, 0x56, 0x6f, 0x9c, 0xd8, 0x0f, 0xc2, 0x3c, 0x8f, 0xf9, 0xa3, + 0xe4, 0xab, 0x97, 0x33, 0x00, 0x6d, 0xd6, 0x66, 0x75, 0x25, 0xde, 0x0d, 0xf7, 0xd5, 0x4a, 0x2d, + 0xd4, 0x97, 0x56, 0xaf, 0x1d, 0x5d, 0xe3, 0x96, 0xc3, 0x24, 0x64, 0x9d, 0xb0, 0x80, 0xd6, 0xbb, + 0x63, 0xf1, 0xac, 0x7e, 0x90, 0xea, 0x78, 0x98, 0x1c, 0x38, 0x3e, 0x0d, 0x7a, 0xb1, 0x1f, 0xf5, + 0x80, 0x72, 0x16, 0x06, 0x84, 0xbe, 0x95, 0x15, 0xaf, 0x7b, 0x54, 0xe0, 0x49, 0x5c, 0xf5, 0xd7, + 0x59, 0x05, 0xa1, 0x2f, 0x1c, 0x6f, 0x9c, 0xe6, 0xc3, 0x7f, 0x32, 0xe0, 0xe4, 0x80, 0x7a, 0x78, + 0xd4, 0xae, 0xf6, 0x18, 0xe4, 0xed, 0x90, 0x6f, 0x30, 0x7f, 0xdf, 0x69, 0xc3, 0x3d, 0x30, 0xeb, + 0x63, 0xc1, 0x4d, 0x63, 0xcd, 0x58, 0x2f, 0x5c, 0xbd, 0x65, 0xfd, 0xfb, 0x03, 0xb4, 0xb6, 0x1b, + 0xf7, 0x5a, 0x11, 0xaa, 0x9d, 0x1b, 0xf4, 0xab, 0xb3, 0x72, 0x8d, 0x14, 0x7a, 0xed, 0x0f, 0x03, + 0x94, 0x37, 0x98, 0x2f, 0xb0, 0x74, 0xf2, 0x1e, 0xf5, 0x3a, 0x2e, 0x16, 0x14, 0x7e, 0x09, 0xf2, + 0x71, 0x0e, 0x63, 0x07, 0xd6, 0xad, 0x28, 0x28, 0xc9, 0x61, 0xc9, 0x53, 0xb1, 0xba, 0x57, 0x2c, + 0xa4, 0x95, 0x10, 0x7d, 0x1c, 0x3a, 0x01, 0xf5, 0xa4, 0x23, 0x76, 0xf9, 0x49, 0xbf, 0x3a, 0x35, + 0xe8, 0x57, 0xf3, 0xf1, 0x2e, 0x47, 0x29, 0x1a, 0xdc, 0x05, 0xcb, 0x8e, 0x87, 0xdb, 0x74, 0x27, + 0x74, 0xdd, 0x1d, 0xe6, 0x3a, 0xa4, 0x67, 0x4e, 0xaf, 0x19, 0xeb, 0x79, 0xfb, 0x9a, 0x36, 0x5b, + 0xde, 0x1a, 0xde, 0x7e, 0xd5, 0xaf, 0x5e, 0x18, 0xbf, 0x10, 0x56, 0xaa, 0x80, 0x46, 0x01, 0x6b, + 0xbf, 0x4f, 0x83, 0xdc, 0xa6, 0xcc, 0x82, 0x1d, 0x72, 0xf8, 0x2d, 0xc8, 0xc9, 0x83, 0xdd, 0xc3, + 0x02, 0xeb, 0x50, 0xde, 0xcf, 0x84, 0x92, 0x9c, 0x4f, 0x9a, 0x3f, 0xa9, 0x2d, 0x83, 0xbb, 0xbb, + 0x7b, 0x48, 0x89, 0x68, 0x52, 0x81, 0x6d, 0xa8, 0x7d, 0x03, 0xa9, 0x0c, 0x25, 0xa8, 0xf0, 0x10, + 0xcc, 0xf2, 0x0e, 0x25, 0x2a, 0x8e, 0xc2, 0xd5, 0xcf, 0x4e, 0x73, 0x52, 0xb1, 0xd7, 0xad, 0x0e, + 0x25, 0x76, 0x51, 0xb3, 0xce, 0xca, 0x15, 0x52, 0x1c, 0x30, 0x00, 0xf3, 0x5c, 0x60, 0x11, 0x72, + 0x73, 0x46, 0xb1, 0xdd, 0x3e, 0x13, 0x36, 0x85, 0x68, 0x2f, 0x69, 0xbe, 0xf9, 0x68, 0x8d, 0x34, + 0x53, 0xed, 0x4f, 0x03, 0x14, 0x63, 0xd5, 0x3b, 0x0e, 0x17, 0xf0, 0xe1, 0x58, 0x4a, 0xad, 0x93, + 0xa5, 0x54, 0x5a, 0xab, 0x84, 0x96, 0x34, 0x55, 0x2e, 0x96, 0x64, 0xd2, 0xe9, 0x80, 0x39, 0x47, + 0x50, 0x8f, 0x9b, 0xd3, 0x6b, 0x33, 0xeb, 0x85, 0xab, 0x37, 0xcf, 0x22, 0x42, 0x7b, 0x51, 0x13, + 0xce, 0x6d, 0x49, 0x68, 0x14, 0x31, 0xd4, 0x1e, 0xa7, 0x81, 0xc9, 0x1c, 0x43, 0x3c, 0x54, 0x73, + 0x1b, 0xa7, 0xad, 0x39, 0x49, 0x3c, 0x5a, 0x70, 0xcf, 0x0d, 0xb0, 0x34, 0x9c, 0x77, 0xf8, 0x28, + 0x39, 0xd3, 0x88, 0xf7, 0xa3, 0x93, 0xf3, 0x46, 0x0d, 0xd7, 0x7a, 0xf3, 0x01, 0x42, 0x0f, 0xcc, + 0x13, 0x55, 0xfe, 0xfa, 0x8a, 0x6e, 0x9e, 0x26, 0xb0, 0xa4, 0x43, 0xa5, 0x74, 0xd1, 0x1a, 0x69, + 0x92, 0xda, 0x5f, 0x06, 0x58, 0xd0, 0xe1, 0x43, 0x1f, 0xcc, 0xfb, 0x58, 0x38, 0x5d, 0xaa, 0x63, + 0x3b, 0xd5, 0x7d, 0xdd, 0x56, 0x48, 0x2d, 0x21, 0x7b, 0x66, 0xbb, 0x67, 0x03, 0xc9, 0x1d, 0xc9, + 0x90, 0x66, 0x81, 0x87, 0x60, 0x9e, 0x1e, 0x33, 0xe1, 0xc4, 0xd5, 0x78, 0x56, 0x7d, 0x53, 0x71, + 0x6d, 0x2a, 0x64, 0xa4, 0x19, 0x6a, 0x2f, 0x0d, 0x00, 0x52, 0x15, 0x78, 0x01, 0xcc, 0x84, 0x81, + 0xab, 0xe2, 0xcc, 0xdb, 0x05, 0x9d, 0x9b, 0x99, 0xfb, 0xe8, 0x0e, 0x92, 0x72, 0xf8, 0x1e, 0xc8, + 0x13, 0x37, 0xe4, 0x82, 0x06, 0x5b, 0x37, 0x75, 0xcb, 0x5b, 0x94, 0x5d, 0x72, 0x23, 0x16, 0xa2, + 0x74, 0x1f, 0x5e, 0x02, 0xb3, 0x38, 0x14, 0x07, 0xaa, 0xc8, 0xf3, 0xb6, 0x29, 0xef, 0x50, 0x23, + 0x14, 0x07, 0xaf, 0xfa, 0xd5, 0xa2, 0xfc, 0x8d, 0x53, 0x80, 0x94, 0x16, 0xfc, 0x1a, 0x14, 0x31, + 0x21, 0x94, 0xf3, 0x16, 0x25, 0x01, 0x15, 0xe6, 0xac, 0x0a, 0xfd, 0xe2, 0xa4, 0x8e, 0x1d, 0x69, + 0x7c, 0x4e, 0x7b, 0x2d, 0xea, 0x52, 0x22, 0x58, 0x60, 0x97, 0x06, 0x12, 0x34, 0x63, 0x8e, 0x86, + 0xc0, 0x6a, 0x3f, 0x2e, 0x82, 0xa5, 0xe1, 0xc4, 0xc3, 0x4b, 0x20, 0x17, 0xd0, 0x8e, 0xeb, 0x10, + 0x1c, 0x5d, 0xd9, 0xb9, 0xb4, 0x9e, 0x91, 0x96, 0xa3, 0x44, 0x23, 0x89, 0x65, 0xfa, 0x44, 0xb1, + 0xd8, 0xa0, 0x88, 0x7d, 0xe1, 0x34, 0xf6, 0xf7, 0x1d, 0xdf, 0x11, 0x3d, 0x95, 0x81, 0x9c, 0x5d, + 0xd1, 0xf8, 0xff, 0xbf, 0x49, 0x3b, 0x01, 0x25, 0x72, 0x66, 0x36, 0x32, 0x5a, 0x68, 0xc8, 0x06, + 0xfe, 0x60, 0x80, 0x42, 0x87, 0x06, 0xdc, 0xe1, 0x82, 0xfa, 0x84, 0xea, 0x7c, 0xdc, 0x3d, 0xcd, + 0x55, 0xd8, 0x49, 0xe1, 0x92, 0xfb, 0xb7, 0x3c, 0xe8, 0x57, 0x0b, 0x99, 0x0d, 0x94, 0x25, 0x85, + 0x3f, 0x1b, 0xa0, 0x4c, 0x46, 0x27, 0xab, 0x39, 0xa7, 0x5c, 0x69, 0x9e, 0xc6, 0x95, 0xb1, 0x71, + 0x6d, 0xff, 0x6f, 0xd0, 0xaf, 0x8e, 0x4f, 0x71, 0x34, 0x4e, 0x0f, 0x7f, 0x33, 0x80, 0xe9, 0x51, + 0x11, 0x38, 0x84, 0x8f, 0xe9, 0x9b, 0xf3, 0xff, 0x85, 0x6f, 0xe7, 0x07, 0xfd, 0xaa, 0xd9, 0x7c, + 0x0d, 0x25, 0x7a, 0xad, 0x33, 0xf0, 0x17, 0x03, 0x14, 0x7d, 0xb6, 0x47, 0xe3, 0x7b, 0x6a, 0x2e, + 0xa8, 0x69, 0xf0, 0xf0, 0xec, 0xfa, 0x87, 0xb5, 0x9d, 0x81, 0xdf, 0xf4, 0x45, 0xd0, 0xb3, 0xcf, + 0xe9, 0x6b, 0x56, 0xcc, 0x6e, 0xa1, 0x21, 0x3f, 0xe0, 0x7d, 0x50, 0x10, 0xcc, 0x95, 0xef, 0x36, + 0x87, 0xf9, 0xdc, 0xcc, 0x29, 0xb7, 0x2a, 0x93, 0x6a, 0xed, 0x5e, 0xa2, 0x66, 0xaf, 0x68, 0xe0, + 0x42, 0x2a, 0xe3, 0x28, 0x8b, 0x03, 0x49, 0x66, 0xa6, 0xe6, 0xd5, 0x41, 0x7c, 0xfc, 0xd6, 0x63, + 0xa0, 0xa9, 0x01, 0xec, 0xa2, 0x2c, 0xc5, 0x78, 0x95, 0x19, 0xad, 0x14, 0x2c, 0x73, 0x4a, 0xc2, + 0xc0, 0x11, 0x3d, 0x99, 0x71, 0x7a, 0x2c, 0x4c, 0xa0, 0xb8, 0xde, 0x9d, 0xe4, 0xff, 0x0e, 0xdb, + 0x6b, 0x0d, 0x6b, 0xdb, 0x2b, 0xf2, 0x81, 0x36, 0x22, 0x44, 0xa3, 0x98, 0xb0, 0x06, 0xe6, 0x3d, + 0x7c, 0xdc, 0x68, 0x53, 0xb3, 0xa0, 0x6a, 0x5e, 0x35, 0xcf, 0xa6, 0x92, 0x20, 0xbd, 0x03, 0x7d, + 0x50, 0x4a, 0x9e, 0x6d, 0x51, 0xa7, 0xe1, 0x66, 0x51, 0xe5, 0x72, 0xe2, 0x4b, 0xf3, 0x0e, 0x23, + 0xd8, 0x8d, 0x5e, 0x5f, 0x88, 0xee, 0xd3, 0x40, 0x96, 0x98, 0x6d, 0xea, 0xac, 0x96, 0xb6, 0x46, + 0x90, 0xd0, 0x18, 0x36, 0xbc, 0x0d, 0x20, 0xa7, 0x41, 0xd7, 0x21, 0xb4, 0x41, 0x08, 0x0b, 0x7d, + 0xb1, 0x8d, 0x3d, 0x6a, 0x2e, 0x2a, 0xff, 0x56, 0x35, 0x0e, 0x6c, 0x8d, 0x69, 0xa0, 0x09, 0x56, + 0xf0, 0x53, 0x50, 0xee, 0x04, 0x0e, 0x53, 0x21, 0xbb, 0x98, 0x73, 0x05, 0xb5, 0xa4, 0xa0, 0xde, + 0xd1, 0x50, 0xe5, 0x9d, 0x51, 0x05, 0x34, 0x6e, 0x03, 0xd7, 0x41, 0x2e, 0x16, 0x9a, 0xcb, 0xaa, + 0x91, 0xaa, 0x93, 0x8b, 0x6d, 0x51, 0xb2, 0x0b, 0x6f, 0x81, 0x1c, 0x8e, 0x5b, 0x62, 0x49, 0x1d, + 0xd9, 0xf9, 0x49, 0x69, 0x8a, 0x5b, 0x60, 0x84, 0x93, 0xb4, 0xc7, 0xc4, 0x16, 0x5e, 0x04, 0x0b, + 0x1e, 0x3e, 0x6e, 0xf2, 0x36, 0x37, 0xcb, 0x6b, 0xc6, 0xfa, 0xac, 0x5d, 0x18, 0xf4, 0xab, 0x0b, + 0xcd, 0x48, 0x84, 0xe2, 0x3d, 0xe9, 0x98, 0x87, 0x8f, 0xed, 0x9e, 0xa0, 0xdc, 0x84, 0x2a, 0xb0, + 0xe8, 0x4a, 0x69, 0x19, 0x4a, 0x76, 0x35, 0x60, 0x2b, 0xdc, 0xe5, 0xe6, 0xca, 0x10, 0xa0, 0x14, + 0xa1, 0x78, 0x6f, 0xf5, 0x06, 0x28, 0x8f, 0x95, 0x1b, 0x2c, 0x81, 0x99, 0x23, 0xda, 0x8b, 0x26, + 0x26, 0x92, 0x9f, 0xf0, 0x1c, 0x98, 0xeb, 0x62, 0x37, 0xa4, 0xd1, 0xb0, 0x40, 0xd1, 0xe2, 0xfa, + 0xf4, 0x35, 0xa3, 0xf6, 0xeb, 0x34, 0x58, 0x99, 0xd0, 0x84, 0xe1, 0x27, 0xa0, 0xc4, 0x05, 0x0b, + 0x70, 0x9b, 0xa6, 0x47, 0x11, 0x8d, 0xe0, 0x73, 0xf2, 0x66, 0xb4, 0x46, 0xf6, 0xd0, 0x98, 0x36, + 0x7c, 0x04, 0x40, 0x34, 0xf0, 0x9a, 0x6c, 0x4f, 0x13, 0xdb, 0x37, 0xe4, 0x63, 0xbf, 0x91, 0x48, + 0x5f, 0xf5, 0xab, 0x97, 0x27, 0xfd, 0x07, 0x89, 0xfd, 0x11, 0x0f, 0x98, 0x1b, 0x7a, 0x34, 0x35, + 0x40, 0x19, 0x48, 0xf8, 0x0d, 0x00, 0x5d, 0xb5, 0xdf, 0x72, 0xbe, 0xa3, 0xfa, 0xdd, 0xfe, 0xc6, + 0x07, 0xb3, 0x15, 0xff, 0x5d, 0xb2, 0xbe, 0x08, 0xe5, 0x60, 0x13, 0x3d, 0x7b, 0x49, 0x3a, 0xf4, + 0x20, 0x41, 0x41, 0x19, 0x44, 0xdb, 0x7a, 0xf2, 0xa2, 0x32, 0xf5, 0xf4, 0x45, 0x65, 0xea, 0xd9, + 0x8b, 0xca, 0xd4, 0xf7, 0x83, 0x8a, 0xf1, 0x64, 0x50, 0x31, 0x9e, 0x0e, 0x2a, 0xc6, 0xb3, 0x41, + 0xc5, 0x78, 0x3e, 0xa8, 0x18, 0x3f, 0xbd, 0xac, 0x4c, 0x7d, 0x95, 0x8b, 0xdb, 0xe0, 0xdf, 0x01, + 0x00, 0x00, 0xff, 0xff, 0x69, 0xee, 0x3a, 0x41, 0x58, 0x10, 0x00, 0x00, } func (m *BusConfig) Marshal() (dAtA []byte, err error) { @@ -492,6 +495,11 @@ func (m *ContainerTemplate) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + i -= len(m.ImagePullPolicy) + copy(dAtA[i:], m.ImagePullPolicy) + i = encodeVarintGenerated(dAtA, i, uint64(len(m.ImagePullPolicy))) + i-- + dAtA[i] = 0x12 { size, err := m.Resources.MarshalToSizedBuffer(dAtA[:i]) if err != nil { @@ -804,6 +812,13 @@ func (m *NativeStrategy) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + if m.MaxSubs != nil { + i = encodeVarintGenerated(dAtA, i, uint64(*m.MaxSubs)) + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0x98 + } if m.MaxBytes != nil { i -= len(*m.MaxBytes) copy(dAtA[i:], *m.MaxBytes) @@ -1070,6 +1085,8 @@ func (m *ContainerTemplate) Size() (n int) { _ = l l = m.Resources.Size() n += 1 + l + sovGenerated(uint64(l)) + l = len(m.ImagePullPolicy) + n += 1 + l + sovGenerated(uint64(l)) return n } @@ -1245,6 +1262,9 @@ func (m *NativeStrategy) Size() (n int) { l = len(*m.MaxBytes) n += 2 + l + sovGenerated(uint64(l)) } + if m.MaxSubs != nil { + n += 2 + sovGenerated(uint64(*m.MaxSubs)) + } return n } @@ -1291,6 +1311,7 @@ func (this *ContainerTemplate) String() string { } s := strings.Join([]string{`&ContainerTemplate{`, `Resources:` + strings.Replace(strings.Replace(fmt.Sprintf("%v", this.Resources), "ResourceRequirements", "v1.ResourceRequirements", 1), `&`, ``, 1) + `,`, + `ImagePullPolicy:` + fmt.Sprintf("%v", this.ImagePullPolicy) + `,`, `}`, }, "") return s @@ -1411,6 +1432,7 @@ func (this *NativeStrategy) String() string { `Affinity:` + strings.Replace(fmt.Sprintf("%v", this.Affinity), "Affinity", "v1.Affinity", 1) + `,`, `MaxMsgs:` + valueToStringGenerated(this.MaxMsgs) + `,`, `MaxBytes:` + valueToStringGenerated(this.MaxBytes) + `,`, + `MaxSubs:` + valueToStringGenerated(this.MaxSubs) + `,`, `}`, }, "") return s @@ -1583,6 +1605,38 @@ func (m *ContainerTemplate) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field ImagePullPolicy", 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.ImagePullPolicy = k8s_io_api_core_v1.PullPolicy(dAtA[iNdEx:postIndex]) + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipGenerated(dAtA[iNdEx:]) @@ -3060,6 +3114,26 @@ func (m *NativeStrategy) Unmarshal(dAtA []byte) error { s := string(dAtA[iNdEx:postIndex]) m.MaxBytes = &s iNdEx = postIndex + case 19: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field MaxSubs", wireType) + } + var v uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowGenerated + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + v |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + m.MaxSubs = &v 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 6b817ec563..b618a00d23 100644 --- a/pkg/apis/eventbus/v1alpha1/generated.proto +++ b/pkg/apis/eventbus/v1alpha1/generated.proto @@ -38,6 +38,8 @@ message BusConfig { // ContainerTemplate defines customized spec for a container message ContainerTemplate { optional k8s.io.api.core.v1.ResourceRequirements resources = 1; + + optional string imagePullPolicy = 2; } // EventBus is the definition of a eventbus resource @@ -188,6 +190,9 @@ message NativeStrategy { // Total size of messages per channel, 0 means unlimited. Defaults to 1GB optional string maxBytes = 18; + + // Maximum number of subscriptions per channel, 0 means unlimited. Defaults to 1000 + optional uint64 maxSubs = 19; } // PersistenceStrategy defines the strategy of persistence diff --git a/pkg/apis/eventbus/v1alpha1/openapi_generated.go b/pkg/apis/eventbus/v1alpha1/openapi_generated.go index 28f73cc3d8..56bda68fa3 100644 --- a/pkg/apis/eventbus/v1alpha1/openapi_generated.go +++ b/pkg/apis/eventbus/v1alpha1/openapi_generated.go @@ -74,6 +74,12 @@ func schema_pkg_apis_eventbus_v1alpha1_ContainerTemplate(ref common.ReferenceCal Ref: ref("k8s.io/api/core/v1.ResourceRequirements"), }, }, + "imagePullPolicy": { + SchemaProps: spec.SchemaProps{ + Type: []string{"string"}, + Format: "", + }, + }, }, }, }, @@ -455,6 +461,13 @@ func schema_pkg_apis_eventbus_v1alpha1_NativeStrategy(ref common.ReferenceCallba Format: "", }, }, + "maxSubs": { + SchemaProps: spec.SchemaProps{ + Description: "Maximum number of subscriptions per channel, 0 means unlimited. Defaults to 1000", + Type: []string{"integer"}, + Format: "int64", + }, + }, }, }, }, diff --git a/pkg/apis/eventbus/v1alpha1/types.go b/pkg/apis/eventbus/v1alpha1/types.go index c8c9799a3e..f3ef7b6029 100644 --- a/pkg/apis/eventbus/v1alpha1/types.go +++ b/pkg/apis/eventbus/v1alpha1/types.go @@ -129,11 +129,14 @@ type NativeStrategy struct { MaxMsgs *uint64 `json:"maxMsgs,omitempty" protobuf:"bytes,17,opt,name=maxMsgs"` // Total size of messages per channel, 0 means unlimited. Defaults to 1GB MaxBytes *string `json:"maxBytes,omitempty" protobuf:"bytes,18,opt,name=maxBytes"` + // Maximum number of subscriptions per channel, 0 means unlimited. Defaults to 1000 + MaxSubs *uint64 `json:"maxSubs,omitempty" protobuf:"bytes,19,opt,name=maxSubs"` } // ContainerTemplate defines customized spec for a container type ContainerTemplate struct { - Resources corev1.ResourceRequirements `json:"resources,omitempty" protobuf:"bytes,1,opt,name=resources"` + Resources corev1.ResourceRequirements `json:"resources,omitempty" protobuf:"bytes,1,opt,name=resources"` + ImagePullPolicy corev1.PullPolicy `json:"imagePullPolicy,omitempty" protobuf:"bytes,2,opt,name=imagePullPolicy,casttype=PullPolicy"` } // GetReplicas return the replicas of statefulset diff --git a/pkg/apis/eventbus/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/eventbus/v1alpha1/zz_generated.deepcopy.go index 416329edc1..481c520da8 100644 --- a/pkg/apis/eventbus/v1alpha1/zz_generated.deepcopy.go +++ b/pkg/apis/eventbus/v1alpha1/zz_generated.deepcopy.go @@ -298,6 +298,11 @@ func (in *NativeStrategy) DeepCopyInto(out *NativeStrategy) { *out = new(string) **out = **in } + if in.MaxSubs != nil { + in, out := &in.MaxSubs, &out.MaxSubs + *out = new(uint64) + **out = **in + } return }