mirror of
https://github.com/bitnami/charts.git
synced 2026-03-04 06:47:57 +08:00
[bitnami/spring-cloud-dataflow] externalDatabase.existingPasswordKey value (#4807)
* [bitnami/spring-cloud-dataflow] Adding externalDatabase.existingPasswordKey optional value * [bitnami/spring-cloud-dataflow] Adding externalDatabase.existingPasswordKey optional value
This commit is contained in:
committed by
GitHub
parent
fa692bfbc4
commit
2f4b0942e1
@@ -38,4 +38,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.4.0
|
||||
version: 2.4.1
|
||||
|
||||
@@ -265,6 +265,7 @@ The following tables lists the configurable parameters of the Spring Cloud Data
|
||||
| `externalDatabase.port` | External database port number | `3306` |
|
||||
| `externalDatabase.password` | Password for the above username | `""` |
|
||||
| `externalDatabase.existingPasswordSecret` | Existing secret with database password | `""` |
|
||||
| `externalDatabase.existingPasswordKey` | Key of the existing secret with database password | `datasource-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` |
|
||||
|
||||
@@ -83,7 +83,7 @@ data:
|
||||
driverClassName: {{ include "scdf.database.driver" . }}
|
||||
username: {{ include "scdf.database.server.user" . }}
|
||||
{{ if .Values.externalDatabase.existingPasswordSecret }}
|
||||
password: ${datasource-password}
|
||||
password: {{ .Values.externalDatabase.existingPasswordKey | default "datasource-password" | printf "${%s}" }}
|
||||
{{- else -}}
|
||||
password: ${mariadb-password}
|
||||
{{- end }}
|
||||
|
||||
@@ -81,7 +81,7 @@ data:
|
||||
driverClassName: {{ include "scdf.database.driver" . }}
|
||||
username: {{ include "scdf.database.skipper.user" . }}
|
||||
{{ if .Values.externalDatabase.existingPasswordSecret }}
|
||||
password: ${datasource-password}
|
||||
password: {{ .Values.externalDatabase.existingPasswordKey | default "datasource-password" | printf "${%s}" }}
|
||||
{{- else -}}
|
||||
password: ${mariadb-password}
|
||||
{{- end }}
|
||||
|
||||
@@ -82,7 +82,7 @@ server:
|
||||
## Endpoint to the metricsDashboard instance
|
||||
##
|
||||
metricsDashboard:
|
||||
|
||||
|
||||
## ConfigMap with Spring Cloud Dataflow Server Configuration
|
||||
## NOTE: When it's set the server.configuration.* and deployer.*
|
||||
## parameters are ignored,
|
||||
@@ -871,6 +871,7 @@ externalDatabase:
|
||||
# scheme:
|
||||
password: ''
|
||||
# existingPasswordSecret: name-of-existing-secret
|
||||
# existingPasswordKey: key in existingPasswordSecret, defaults to "datasource-password"
|
||||
## Data Flow user and database
|
||||
##
|
||||
dataflow:
|
||||
|
||||
@@ -872,6 +872,7 @@ externalDatabase:
|
||||
# scheme:
|
||||
password: ''
|
||||
# existingPasswordSecret: name-of-existing-secret
|
||||
# existingPasswordKey: key in existingPasswordSecret, defaults to "datasource-password"
|
||||
## Data Flow user and database
|
||||
##
|
||||
dataflow:
|
||||
|
||||
Reference in New Issue
Block a user