use unique stream per broker instance

Author: odacremolbap

config/300-redisbroker.yaml

@@ -46,6 +46,61 @@ spec:
           spec:
             description: RedisBrokerSpec defines the desired state of RedisBroker
             type: object
+            properties:
+              redis:
+                description: Redis options.
+                type: object
+                properties:
+                  connection:
+                    description: Redis connection.
+                    type: object
+                    properties:
+                      url:
+                        description: URL of the Redis instance.
+                        type: string
+                        format: url
+                        pattern: ^https?:\/\/.+$
+                      username:
+                        description: Redis username.
+                        type: object
+                        properties:
+                          secretKeyRef:
+                            description: A reference to a Kubernetes Secret object.
+                            type: object
+                            properties:
+                              name:
+                                type: string
+                              key:
+                                type: string
+                      password:
+                        description: Redis password.
+                        type: object
+                        properties:
+                          secretKeyRef:
+                            description: A reference to a Kubernetes Secret object.
+                            type: object
+                            properties:
+                              name:
+                                type: string
+                              key:
+                                type: string
+                    required:
+                    - url
+
+                  stream:
+                    description: Redis stream to be used by the broker.
+                    type: string
+                  streamMaxLen:
+                    description: Maximum number of items (approximate) the Redis stream can host.
+                    type: integer
+
+              broker:
+                description: Broker options.
+                type: object
+                properties:
+                  port:
+                    description: Broker HTTP port.
+                    type: integer
           status:
             description: Status represents the current state of the Broker. This data may be out of date.
             type: object

pkg/apis/eventing/v1alpha1/deepcopy_generated.go

@@ -4,9 +4,10 @@
 package v1alpha1
 
 import (
+	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
-
+	"knative.dev/pkg/apis"
 	duckv1 "knative.dev/pkg/apis/duck/v1"
 	"knative.dev/pkg/kmeta"
 )
@@ -43,7 +44,40 @@ var (
 	_ duckv1.KRShaped = (*RedisBroker)(nil)
 )
 
+type RedisConnection struct {
+	// Redis URL.
+	URL apis.URL `json:"url"`
+	// Redis username.
+	Username SecretValueFromSource `json:"username,omitempty"`
+	// Redis password.
+	Password SecretValueFromSource `json:"password,omitempty"`
+}
+
+type Redis struct {
+	// Redis connection data.
+	Connection RedisConnection `json:"connection,omitempty"`
+
+	// Stream name used by the broker.
+	Stream *string `json:"stream,omitempty"`
+
+	// Maximum number of items the stream can host.
+	StreamMaxLen *int `json:"streamMaxLen,omitempty"`
+}
+
+// SecretValueFromSource represents the source of a secret value
+type SecretValueFromSource struct {
+	// The Secret key to select from.
+	SecretKeyRef *corev1.SecretKeySelector `json:"secretKeyRef,omitempty"`
+}
+
+type Broker struct {
+	Port *int `json:"port,omitempty"`
+}
+
 type RedisBrokerSpec struct {
+	Redis *Redis `json:"redis,omitempty"`
+
+	Broker Broker `json:"broker,omitempty"`
 }
 
 // RedisBrokerStatus represents the current state of a Redis broker.

pkg/apis/eventing/v1alpha1/redisbroker_types.go

@@ -26,7 +26,7 @@ import (
 )
 
 const (
-	configSecretFile = "config"
+	configSecretFile = "broker.config"
 	configSecretPath = "/opt/broker"
 
 	brokerResourceSuffix = "redisbroker-broker"
@@ -84,7 +84,10 @@ func buildBrokerDeployment(rb *eventingv1alpha1.RedisBroker, redis *corev1.Servi
 			resources.PodSpecAddVolume(v),
 			resources.PodSpecAddContainer(
 				resources.NewContainer("broker", image,
-					resources.ContainerAddArgs("start --redis.address "+redisService+" --broker-config-path "+configMountedPath),
+					resources.ContainerAddArgs("start"+
+						" --redis.address "+redisService+
+						" --broker-config-path "+configMountedPath+
+						" --redis.stream "+rb.Namespace+"."+rb.Name),
 					resources.ContainerAddVolumeMount(vm),
 				),
 			),