[stable/spring-cloud-data-flow] different MySQL improvements (#13910)

* [stable/spring-cloud-data-flow] different MySQL improvements

Signed-off-by: Sébastien Prud'homme <sebastien.prudhomme@gmail.com>

* [stable/spring-cloud-data-flow] missing version bump

Signed-off-by: Sébastien Prud'homme <sebastien.prudhomme@gmail.com>

* [stable/spring-cloud-data-flow] feature version bump

Signed-off-by: Sébastien Prud'homme <sebastien.prudhomme@gmail.com>
This commit is contained in:
Sébastien Prud'homme
2019-05-23 10:32:31 -07:00
committed by Kubernetes Prow Robot
parent 7dd5867b66
commit e20fab7048
6 changed files with 12 additions and 9 deletions
+1 -1
View File
@@ -1,7 +1,7 @@
apiVersion: v1
description: Toolkit for building data processing pipelines.
name: spring-cloud-data-flow
version: 2.0.3
version: 2.1.0
appVersion: 2.0.2.RELEASE
home: http://cloud.spring.io/spring-cloud-dataflow/
sources:
@@ -1,12 +1,12 @@
dependencies:
- name: mysql
repository: https://kubernetes-charts.storage.googleapis.com/
version: 0.3.4
version: 1.1.0
- name: rabbitmq
repository: https://kubernetes-charts.storage.googleapis.com/
version: 0.6.16
- name: kafka
repository: https://kubernetes-charts-incubator.storage.googleapis.com/
version: 0.13.11
digest: sha256:f637f0a710a29e8c4d052faf43224cf5818cdcfcd6130ea0c931d8a6311ca42e
generated: 2019-03-08T14:41:35.841588-05:00
digest: sha256:647626620388f5f7fb3f652d53bc215f777e9ddb63fc5ebaeeb12344172f7c46
generated: 2019-05-16T14:16:46.84520572+02:00
@@ -1,6 +1,6 @@
dependencies:
- name: mysql
version: 0.3.4
version: 1.1.0
repository: https://kubernetes-charts.storage.googleapis.com/
- name: rabbitmq
version: 0.6.16
@@ -22,7 +22,7 @@ data:
memory: {{ .Values.deployer.resourceLimits.memory }}
cpu: {{ .Values.deployer.resourceLimits.cpu }}
datasource:
url: 'jdbc:mysql://${{ printf "{" }}{{ template "scdf.envrelease" . }}_MYSQL_SERVICE_HOST}:${{ printf "{" }}{{ template "scdf.envrelease" . }}_MYSQL_SERVICE_PORT}/dataflow'
url: 'jdbc:mysql://${{ printf "{" }}{{ template "scdf.envrelease" . }}_MYSQL_SERVICE_HOST}:${{ printf "{" }}{{ template "scdf.envrelease" . }}_MYSQL_SERVICE_PORT}/{{ .Values.mysql.mysqlDatabase }}'
driverClassName: org.mariadb.jdbc.Driver
username: root
password: ${mysql-root-password}
@@ -78,6 +78,7 @@ spec:
secretName: {{ printf "%s-%s" .Release.Name "mysql" | trunc 63 | trimSuffix "-" }}
initContainers:
- name: init-mysql-wait
image: busybox
image: {{ .Values.mysql.busybox.image }}:{{ .Values.mysql.busybox.tag }}
imagePullPolicy: {{ .Values.mysql.imagePullPolicy }}
command: ['sh', '-c', 'until nc -w3 -z {{ printf "%s-%s" .Release.Name "mysql" | trunc 63 | trimSuffix "-" }} 3306; do echo waiting for mysql; sleep 3; done;']
serviceAccountName: {{ template "scdf.serviceAccountName" . }}
@@ -85,10 +85,12 @@ spec:
secretName: {{ printf "%s-%s" .Release.Name "mysql" | trunc 63 | trimSuffix "-" }}
initContainers:
- name: init-mysql-wait
image: busybox
image: {{ .Values.mysql.busybox.image }}:{{ .Values.mysql.busybox.tag }}
imagePullPolicy: {{ .Values.mysql.imagePullPolicy }}
command: ['sh', '-c', 'until nc -w3 -z {{ printf "%s-%s" .Release.Name "mysql" | trunc 63 | trimSuffix "-" }} 3306; do echo waiting for mysql; sleep 3; done;']
- name: init-mysql-database
image: mysql:5.7.14
image: {{ .Values.mysql.image }}:{{ .Values.mysql.imageTag }}
imagePullPolicy: {{ .Values.mysql.imagePullPolicy }}
env:
- name: MYSQL_PWD
valueFrom: