[bitnami/spring-cloud-dataflow] External Kafka support (#5293)

This commit is contained in:
Omri Harary
2021-02-01 03:43:15 -05:00
committed by GitHub
parent d3e5822112
commit b789ef04ad
5 changed files with 37 additions and 9 deletions

View File

@@ -39,4 +39,4 @@ sources:
- https://github.com/bitnami/bitnami-docker-spring-cloud-dataflow
- https://github.com/bitnami/bitnami-docker-spring-cloud-skipper
- https://dataflow.spring.io/
version: 2.6.1
version: 2.7.0

View File

@@ -301,13 +301,16 @@ The following tables lists the configurable parameters of the Spring Cloud Data
### Kafka chart parameters
| Parameter | Description | Default |
|---------------------------------------|---------------------------------------------|---------|
| `kafka.enabled` | Enable/disable Kafka chart installation | `false` |
| `kafka.replicaCount` | Number of Kafka brokers | `1` |
| `kafka.offsetsTopicReplicationFactor` | Kafka Secret Key | `1` |
| `kafka.zookeeper.enabled` | Enable/disable Zookeeper chart installation | `nil` |
| `kafka.zookeeper.replicaCount` | Number of Zookeeper replicas | `1` |
| Parameter | Description | Default |
| ------------------------------------- | ------------------------------------------- | ---------------- |
| `kafka.enabled` | Enable/disable Kafka chart installation | `false` |
| `kafka.replicaCount` | Number of Kafka brokers | `1` |
| `kafka.offsetsTopicReplicationFactor` | Kafka Secret Key | `1` |
| `kafka.zookeeper.enabled` | Enable/disable Zookeeper chart installation | `nil` |
| `kafka.zookeeper.replicaCount` | Number of Zookeeper replicas | `1` |
| `externalKafka.enabled` | Enable/disable external Kafka | `false` |
| `externalKafka.brokers` | External Kafka brokers | `localhost:9092` |
| `externalKafka.zkNodes` | External Zookeeper nodes | `localhost:2181` |
Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example,

View File

@@ -366,10 +366,16 @@ scdf: features
{{/* Validate values of Spring Cloud Dataflow - Messaging System */}}
{{- define "scdf.validateValues.messagingSystem" -}}
{{- if and .Values.kafka.enabled .Values.rabbitmq.enabled -}}
{{- if and (or .Values.kafka.enabled .Values.externalKafka.enabled) .Values.rabbitmq.enabled -}}
scdf: Messaging System
You can only use one messaging system.
Please enable only RabbitMQ or Kafka as messaging system.
{{- else if and .Values.kafka.enabled .Values.externalKafka.enabled -}}
scdf: Messaging System
You can only have one Kafka configuration enabled.
Please ensure only one of the following parameters is set to 'true'
- kafka.enabled
- externalKafka.enabled
{{- end -}}
{{- end -}}

View File

@@ -43,6 +43,8 @@ data:
environmentVariables: 'SPRING_RABBITMQ_HOST={{ $rabbitmqHost }},SPRING_RABBITMQ_PORT={{ $rabbitmqPort }},SPRING_RABBITMQ_USERNAME={{ $rabbitmqUser }},SPRING_RABBITMQ_PASSWORD=${rabbitmq-password},SPRING_RABBITMQ_VIRTUAL_HOST={{ $rabbitmqVhost }}{{ $environmentVariables }}'
{{- else if .Values.kafka.enabled }}
environmentVariables: 'SPRING_CLOUD_STREAM_KAFKA_BINDER_BROKERS=${{ printf "{" }}{{ .Release.Name }}_KAFKA_SERVICE_HOST}:${{ printf "{" }}{{ .Release.Name }}_KAFKA_SERVICE_PORT},SPRING_CLOUD_STREAM_KAFKA_BINDER_ZK_NODES=${{ printf "{" }}{{ .Release.Name }}_ZOOKEEPER_SERVICE_HOST}:${{ printf "{" }}{{ .Release.Name }}_ZOOKEEPER_SERVICE_PORT}{{ $environmentVariables }}'
{{- else if .Values.externalKafka.enabled }}
environmentVariables: 'SPRING_CLOUD_STREAM_KAFKA_BINDER_BROKERS={{ .Values.externalKafka.brokers }},SPRING_CLOUD_STREAM_KAFKA_BINDER_ZK_NODES={{ .Values.externalKafka.zkNodes }}{{ $environmentVariables }}'
{{- else }}
{{- if .Values.deployer.environmentVariables }}
environmentVariables: '{{ .Values.deployer.environmentVariables | trim }}'

View File

@@ -986,6 +986,23 @@ kafka:
zookeeper:
replicaCount: 1
##
## External Kafka Configuration
##
## All of these values are ignored when kafka.enabled is set to true
##
externalKafka:
enabled: false
## External Kafka brokers
## Multiple brokers can be provided in a comma separated list, e.g. host1:port1,host2:port2
##
brokers: localhost:9092
## External Zookeeper nodes
##
zkNodes: localhost:2181
## Extra objects to deploy (value evaluated as a template)
##
extraDeploy: []