Bitnami/charts
2
0
Fork 0
mirror of https://github.com/bitnami/charts.git synced 2026-03-16 06:47:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

[bitnami/spring-cloud-dataflow] Add parameters to configure dataflow deployer properties and possibility to use existing password secrets (#3162)

Browse Source 
* [bitnami/spring-cloud-dataflow]
Added nodeSelector and tolerations properties to deployer.
Provided possibility to use existing password secrets for datasource and RabbitMQ.
Added RabbitMQ virtual host parameter.
Renamed mariadb-password to datasource-password

* [bitnami/spring-cloud-dataflow] Updated readme

* [bitnami/spring-cloud-dataflow] bump version

* [bitnami/spring-cloud-dataflow] Use datasource-password parameter name only if used external database with existing secret, sync values.yaml with values-production.yaml

* [bitnami/spring-cloud-dataflow] bump minor version, sync values-production.yaml with values.yaml
This commit is contained in:
Vladimir Ivanov
2020-07-21 19:23:36 +03:00
committed by GitHub
parent 7efaf3fdf9
commit 9e97f55c43
9 changed files with 69 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
bitnami/spring-cloud-dataflow/templates/skipper/configmap.yaml
View File

@@ -19,7 +19,8 @@ data:
{{- $rabbitmqHost := include "scdf.rabbitmq.host" . }}
{{- $rabbitmqPort := include "scdf.rabbitmq.port" . }}
{{- $rabbitmqUser := include "scdf.rabbitmq.user" . }}
environmentVariables: 'SPRING_RABBITMQ_HOST={{ $rabbitmqHost }},SPRING_RABBITMQ_PORT={{ $rabbitmqPort }},SPRING_RABBITMQ_USERNAME={{ $rabbitmqUser }},SPRING_RABBITMQ_PASSWORD=${rabbitmq-password}'
{{- $rabbitmqVhost := include "scdf.rabbitmq.vhost" . }}
environmentVariables: 'SPRING_RABBITMQ_HOST={{ $rabbitmqHost }},SPRING_RABBITMQ_PORT={{ $rabbitmqPort }},SPRING_RABBITMQ_USERNAME={{ $rabbitmqUser }},SPRING_RABBITMQ_PASSWORD=${rabbitmq-password},SPRING_RABBITMQ_VIRTUAL_HOST={{ $rabbitmqVhost }}'
{{- 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}'
{{- end }}
@@ -31,6 +32,8 @@ data:
{{- end }}
readinessProbeDelay: {{ .Values.deployer.readinessProbe.initialDelaySeconds }}
livenessProbeDelay: {{ .Values.deployer.livenessProbe.initialDelaySeconds }}
nodeSelector: {{ .Values.deployer.nodeSelector }}
tolerations: {{- toYaml .Values.deployer.tolerations | nindent 22 }}
{{- $hibernateDialect := include "scdf.database.hibernate.dialect" . }}
{{- if $hibernateDialect }}
jpa:
@@ -47,7 +50,11 @@ data:
url: 'jdbc:{{ $databaseScheme }}://{{ $databaseHost }}:{{ $databasePort }}/{{ $databaseName }}{{ $jdbcParameters }}'
driverClassName: {{ include "scdf.database.driver" . }}
username: {{ include "scdf.database.skipper.user" . }}
{{ if .Values.externalDatabase.existingPasswordSecret }}
password: ${datasource-password}
{{- else -}}
password: ${mariadb-password}
{{- end }}
testOnBorrow: true
validationQuery: "SELECT 1"
{{ end }}