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

[bitnami/spring-cloud-dataflow] Fixes external database config (#3961)

Browse Source 
* [bitnami/spring-cloud-dataflow] Fixes external database config

* [bitnami/spring-cloud-dataflow] Bumping Chart version
This commit is contained in:
Tyler Van Gorder
2020-10-14 03:06:20 -07:00
committed by GitHub
parent aa2b3a1861
commit 182925783b
9 changed files with 71 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bitnami/spring-cloud-dataflow/Chart.yaml
View File

@@ -1,6 +1,6 @@
apiVersion: v1
name: spring-cloud-dataflow
version: 1.1.0
version: 1.2.0
appVersion: 2.6.3
description: Spring Cloud Data Flow is a microservices-based toolkit for building streaming and batch data processing pipelines in Cloud Foundry and Kubernetes.
keywords:

21
bitnami/spring-cloud-dataflow/README.md
View File

@@ -244,12 +244,16 @@ The following tables lists the configurable parameters of the Spring Cloud Data
| `mariadb.auth.password` | Password for the new user | `change-me` |
| `mariadb.auth.rootPassword` | Password for the MariaDB `root` user | _random 10 character alphanumeric string_ |
| `mariadb.initdbScripts` | Dictionary of initdb scripts | Check `values.yaml` file |
| `externalDatabase.driver` | The fully qualified name of the JDBC Driver class | `""` |
| `externalDatabase.scheme` | The scheme is a vendor-specific or shared protocol string that follows the "jdbc:" of the URL | `""` |
| `externalDatabase.host` | Host of the external database | `localhost` |
| `externalDatabase.port` | External database port number | `3306` |
| `externalDatabase.password` | Password for the above username | `""` |
| `externalDatabase.existingPasswordSecret` | Existing secret with database password | `""` |
| `externalDatabase.dataflow.url` | JDBC URL for dataflow server. Overrides external scheme, host, port, database, and jdbc parameters. | `""` |
| `externalDatabase.dataflow.username` | Existing username in the external db to be used by Dataflow server | `dataflow` |
| `externalDatabase.dataflow.database` | Name of the existing database to be used by Dataflow server | `dataflow` |
| `externalDatabase.skipper.url` | JDBC URL for skipper. Overrides external scheme, host, port, database, and jdbc parameters. | `""` |
| `externalDatabase.skipper.username` | Existing username in the external db to be used by Skipper server | `skipper` |
| `externalDatabase.skipper.database` | Name of the existing database to be used by Skipper server | `skipper` |
| `externalDatabase.hibernateDialect` | Hibernate Dialect used by Dataflow/Skipper servers | `""` |
@@ -376,6 +380,7 @@ Sometimes you may want to have Spring Cloud components connect to an external da
```console
mariadb.enabled=false
externalDatabase.scheme=mariadb
externalDatabase.host=myexternalhost
externalDatabase.port=3306
externalDatabase.password=mypassword
@@ -385,7 +390,21 @@ externalDatabase.dataflow.user=myskipperuser
externalDatabase.dataflow.database=myskipperdatabase
```
Note also if you disable MariaDB per above you MUST supply values for the `externalDatabase` connection.
NOTE: When using the indidual propertes (scheme, host, port, database, an optional jdbcParameters) this chart will format the JDBC URL as `jdbc:{scheme}://{host}:{port}/{database}{jdbcParameters}`. The URL format follows that of the MariaDB database drive but may not work for other database vendors.
To use an alternate database vendor (other than MariaDB) you can use the `externalDatabase.dataflow.url` and `externalDatabase.skipper.url` properties to provide the JDBC URLs for the dataflow server and skipper respectively. If these properties are defined, they will take precendence over the individual attributes. As an example of configuring an external MS SQL Server database:
```console
mariadb.enabled=false
externalDatabase.password=mypassword
externalDatabase.dataflow.url=jdbc:sqlserver://mssql-server:1433
externalDatabase.dataflow.user=mydataflowuser
externalDatabase.skipper.url=jdbc:sqlserver://mssql-server:1433
externalDatabase.skipper.user=myskipperuser
externalDatabase.hibernateDialect=org.hibernate.dialect.SQLServer2012Dialect
```
NOTE: If you disable MariaDB per above you MUST supply values for the `externalDatabase` connection.
### Adding extra flags

22
bitnami/spring-cloud-dataflow/templates/_helpers.tpl
View File

@@ -149,6 +149,28 @@ Return true if a configmap object should be created for Spring Cloud Skipper
{{- end -}}
{{- end -}}
{{/*
Return the database URL used by the dataflow server
*/}}
{{- define "scdf.database.dataflow.url" -}}
{{- if .Values.externalDatabase.dataflow.url }}
{{- printf "%s" .Values.externalDatabase.dataflow.url -}}
{{- else -}}
{{- printf "jdbc:%s://%s:%s/%s%s" (include "scdf.database.scheme" .) (include "scdf.database.host" .) (include "scdf.database.port" .) (include "scdf.database.server.name" .) (include "scdf.database.jdbc.parameters" .) -}}
{{- end -}}
{{- end -}}
{{/*
Return the database URL used by skipper
*/}}
{{- define "scdf.database.skipper.url" -}}
{{- if .Values.externalDatabase.skipper.url }}
{{- printf "%s" .Values.externalDatabase.skipper.url -}}
{{- else -}}
{{- printf "jdbc:%s://%s:%s/%s%s" (include "scdf.database.scheme" .) (include "scdf.database.host" .) (include "scdf.database.port" .) (include "scdf.database.skipper.name" .) (include "scdf.database.jdbc.parameters" .) -}}
{{- end -}}
{{- end -}}
{{/*
Return the database Hostname
*/}}

7
bitnami/spring-cloud-dataflow/templates/server/configmap.yaml
View File

@@ -92,12 +92,7 @@ data:
dialect: {{ $hibernateDialect }}
{{- end }}
datasource:
{{- $databaseScheme := include "scdf.database.scheme" . }}
{{- $databaseHost := include "scdf.database.host" . }}
{{- $databasePort := include "scdf.database.port" . }}
{{- $databaseName := include "scdf.database.server.name" . }}
{{- $jdbcParameters := include "scdf.database.jdbc.parameters" . }}
url: 'jdbc:{{ $databaseScheme }}://{{ $databaseHost }}:{{ $databasePort }}/{{ $databaseName }}{{ $jdbcParameters }}'
url: '{{ include "scdf.database.dataflow.url" . }}'
driverClassName: {{ include "scdf.database.driver" . }}
username: {{ include "scdf.database.server.user" . }}
{{ if .Values.externalDatabase.existingPasswordSecret }}

4
bitnami/spring-cloud-dataflow/templates/server/deployment.yaml
View File

@@ -129,8 +129,8 @@ spec:
- name: SPRING_CLOUD_DATAFLOW_TASK_COMPOSED_TASK_RUNNER_URI
value: 'docker://{{ include "common.images.image" (dict "imageRoot" .Values.server.composedTaskRunner.image) }}'
{{- range $key, $value := .Values.server.extraEnvVars }}
- name: {{ $key }}
value: "{{ $value }}"
- name: {{ $value.name }}
value: "{{ $value.value }}"
{{- end }}
{{- if or .Values.server.extraEnvVarsCM .Values.server.extraEnvVarsSecret }}
envFrom:

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

@@ -64,12 +64,7 @@ data:
dialect: {{ $hibernateDialect }}
{{- end }}
datasource:
{{- $databaseScheme := include "scdf.database.scheme" . }}
{{- $databaseHost := include "scdf.database.host" . }}
{{- $databasePort := include "scdf.database.port" . }}
{{- $databaseName := include "scdf.database.skipper.name" . }}
{{- $jdbcParameters := include "scdf.database.jdbc.parameters" . }}
url: 'jdbc:{{ $databaseScheme }}://{{ $databaseHost }}:{{ $databasePort }}/{{ $databaseName }}{{ $jdbcParameters }}'
url: '{{ include "scdf.database.skipper.url" . }}'
driverClassName: {{ include "scdf.database.driver" . }}
username: {{ include "scdf.database.skipper.user" . }}
{{ if .Values.externalDatabase.existingPasswordSecret }}

4
bitnami/spring-cloud-dataflow/templates/skipper/deployment.yaml
View File

@@ -97,8 +97,8 @@ spec:
value: "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address={{ .Values.skipper.jdwp.port }}"
{{- end }}
{{- range $key, $value := .Values.skipper.extraEnvVars }}
- name: {{ $key }}
value: "{{ $value }}"
- name: {{ $value.name }}
value: "{{ $value.value }}"
{{- end }}
{{- if or .Values.skipper.extraEnvVarsCM .Values.skipper.extraEnvVarsSecret }}
envFrom:

11
bitnami/spring-cloud-dataflow/values-production.yaml
View File

@@ -770,6 +770,7 @@ mariadb:
## All of these values are ignored when mariadb.enabled is set to true
##
externalDatabase:
## Database server host and port
##
host: localhost
@@ -783,11 +784,21 @@ externalDatabase:
## Data Flow user and database
##
dataflow:
## Database JDBC URL
## This provides a mechanism to define a fully customized JDBC URL for the data flow server rather than having it
## derived from the common, individual attributes. This property, when defined, has precedence over the
## individual attributes (scheme, host, port, database)
url: ""
database: dataflow
user: dataflow
## Skipper and database
##
skipper:
## Database JDBC URL
## This provides a mechanism to define a fully customized JDBC URL for skipper rather than having it
## derived from the common, individual attributes. This property, when defined, has precedence over the
## individual attributes (scheme, host, port, database)
url: ""
database: skipper
user: skipper
## Hibernate Dialect

11
bitnami/spring-cloud-dataflow/values.yaml
View File

@@ -771,6 +771,7 @@ mariadb:
## All of these values are ignored when mariadb.enabled is set to true
##
externalDatabase:
## Database server host and port
##
host: localhost
@@ -784,11 +785,21 @@ externalDatabase:
## Data Flow user and database
##
dataflow:
## Database JDBC URL
## This provides a mechanism to define a fully customized JDBC URL for the data flow server rather than having it
## derived from the common, individual attributes. This property, when defined, has precedence over the
## individual attributes (scheme, host, port, database)
url: ""
database: dataflow
username: dataflow
## Skipper and database
##
skipper:
## Database JDBC URL
## This provides a mechanism to define a fully customized JDBC URL for skipper rather than having it
## derived from the common, individual attributes. This property, when defined, has precedence over the
## individual attributes (scheme, host, port, database)
url: ""
database: skipper
username: skipper
## Hibernate Dialect