github/deprecated-helm-charts
1
0
Fork 0
mirror of https://github.com/helm/charts.git synced 2026-08-23 22:37:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add field to specify db type (#14610)

Browse Source 
Signed-off-by: Lee Ween Jiann <lwj5@hotmail.com>
This commit is contained in:
Ween Jiann
2019-06-12 08:26:20 -07:00
committed by Kubernetes Prow Robot
parent 98b5d751a5
commit bfb71f3be0
6 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stable/spring-cloud-data-flow/Chart.yaml
+1 -1
View File
@@ -1,7 +1,7 @@
apiVersion: v1
description: Toolkit for building data processing pipelines.
name: spring-cloud-data-flow
version: 2.2.0
version: 2.2.1
appVersion: 2.0.2.RELEASE
home: http://cloud.spring.io/spring-cloud-dataflow/
sources:
stable/spring-cloud-data-flow/README.md
+1
View File
@@ -137,6 +137,7 @@ The following tables list the configurable parameters and their default values.
| Parameter | Description | Default |
| ------------------- | ------------------------------ | ------------------------- |
| database.driver | Database driver | nil
| database.scheme | Database scheme | nil
| database.host | Database host | nil
| database.port | Database port | nil
| database.user | Database user | scdf
stable/spring-cloud-data-flow/templates/_helpers.tpl
+8
View File
@@ -49,6 +49,14 @@ Create the name of the service account to use
{{- end -}}
{{- end -}}
{{- define "scdf.database.scheme" -}}
{{- if .Values.mysql.enabled -}}
{{- printf "mysql" -}}
{{- else -}}
{{- .Values.database.scheme -}}
{{- end -}}
{{- end -}}
{{- define "scdf.database.host" -}}
{{- if .Values.mysql.enabled -}}
{{- printf "${%s_MYSQL_SERVICE_HOST}" (include "scdf.envrelease" . ) -}}
stable/spring-cloud-data-flow/templates/server-config.yaml
+1 -1
View File
@@ -22,7 +22,7 @@ data:
memory: {{ .Values.deployer.resourceLimits.memory }}
cpu: {{ .Values.deployer.resourceLimits.cpu }}
datasource:
url: 'jdbc:mysql://{{ template "scdf.database.host" . }}:{{ template "scdf.database.port" . }}/{{ template "scdf.database.dataflow" . }}'
url: 'jdbc:{{ template "scdf.database.scheme" . }}://{{ template "scdf.database.host" . }}:{{ template "scdf.database.port" . }}/{{ template "scdf.database.dataflow" . }}'
driverClassName: {{ template "scdf.database.driver" . }}
username: {{ template "scdf.database.user" . }}
password: {{ template "scdf.database.password" . }}
stable/spring-cloud-data-flow/templates/skipper-config.yaml
+1 -1
View File
@@ -29,7 +29,7 @@ data:
readinessProbeDelay: {{ .Values.deployer.readinessProbe.initialDelaySeconds }}
livenessProbeDelay: {{ .Values.deployer.livenessProbe.initialDelaySeconds }}
datasource:
url: 'jdbc:mysql://{{ template "scdf.database.host" . }}:{{ template "scdf.database.port" . }}/{{ template "scdf.database.skipper" . }}'
url: 'jdbc:{{ template "scdf.database.scheme" . }}://{{ template "scdf.database.host" . }}:{{ template "scdf.database.port" . }}/{{ template "scdf.database.skipper" . }}'
driverClassName: {{ template "scdf.database.driver" . }}
username: {{ template "scdf.database.user" . }}
password: {{ template "scdf.database.password" . }}
stable/spring-cloud-data-flow/values.yaml
+1
View File
@@ -81,6 +81,7 @@ mysql:
## you must specify the following database details
database:
driver:
scheme:
host:
port:
user: scdf