From e20fab70486a56dc2ad6fa1098dff3a261606491 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Prud=27homme?= Date: Thu, 23 May 2019 19:32:31 +0200 Subject: [PATCH] [stable/spring-cloud-data-flow] different MySQL improvements (#13910) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [stable/spring-cloud-data-flow] different MySQL improvements Signed-off-by: Sébastien Prud'homme * [stable/spring-cloud-data-flow] missing version bump Signed-off-by: Sébastien Prud'homme * [stable/spring-cloud-data-flow] feature version bump Signed-off-by: Sébastien Prud'homme --- stable/spring-cloud-data-flow/Chart.yaml | 2 +- stable/spring-cloud-data-flow/requirements.lock | 6 +++--- stable/spring-cloud-data-flow/requirements.yaml | 2 +- stable/spring-cloud-data-flow/templates/server-config.yaml | 2 +- .../spring-cloud-data-flow/templates/server-deployment.yaml | 3 ++- .../templates/skipper-deployment.yaml | 6 ++++-- 6 files changed, 12 insertions(+), 9 deletions(-) diff --git a/stable/spring-cloud-data-flow/Chart.yaml b/stable/spring-cloud-data-flow/Chart.yaml index 45ea864a5a..2f8b0d9759 100644 --- a/stable/spring-cloud-data-flow/Chart.yaml +++ b/stable/spring-cloud-data-flow/Chart.yaml @@ -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: diff --git a/stable/spring-cloud-data-flow/requirements.lock b/stable/spring-cloud-data-flow/requirements.lock index 75f7013912..8e8b0b4e93 100644 --- a/stable/spring-cloud-data-flow/requirements.lock +++ b/stable/spring-cloud-data-flow/requirements.lock @@ -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 diff --git a/stable/spring-cloud-data-flow/requirements.yaml b/stable/spring-cloud-data-flow/requirements.yaml index 1af04efadb..3c540d52a8 100644 --- a/stable/spring-cloud-data-flow/requirements.yaml +++ b/stable/spring-cloud-data-flow/requirements.yaml @@ -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 diff --git a/stable/spring-cloud-data-flow/templates/server-config.yaml b/stable/spring-cloud-data-flow/templates/server-config.yaml index aa79a6dea2..014f40209d 100644 --- a/stable/spring-cloud-data-flow/templates/server-config.yaml +++ b/stable/spring-cloud-data-flow/templates/server-config.yaml @@ -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} diff --git a/stable/spring-cloud-data-flow/templates/server-deployment.yaml b/stable/spring-cloud-data-flow/templates/server-deployment.yaml index 5932f9e47c..c4fedfbf0e 100644 --- a/stable/spring-cloud-data-flow/templates/server-deployment.yaml +++ b/stable/spring-cloud-data-flow/templates/server-deployment.yaml @@ -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" . }} diff --git a/stable/spring-cloud-data-flow/templates/skipper-deployment.yaml b/stable/spring-cloud-data-flow/templates/skipper-deployment.yaml index b7e2b8ccc7..23437ebca6 100644 --- a/stable/spring-cloud-data-flow/templates/skipper-deployment.yaml +++ b/stable/spring-cloud-data-flow/templates/skipper-deployment.yaml @@ -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: