From 85c03800b988dd034e54f96016fa74db9648d613 Mon Sep 17 00:00:00 2001
From: Raza Jhaveri <razajhaveri@googlemail.com>
Date: Fri, 28 Sep 2018 15:19:32 +0100
Subject: [PATCH] [stable/sonarqube] added parameter for custom mysql
 parameters (#7925)

Signed-off-by: Raza Jhaveri <razajhaveri@googlemail.com>
---
 stable/sonarqube/Chart.yaml                | 2 +-
 stable/sonarqube/README.md                 | 1 +
 stable/sonarqube/templates/deployment.yaml | 2 +-
 stable/sonarqube/values.yaml               | 2 ++
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/stable/sonarqube/Chart.yaml b/stable/sonarqube/Chart.yaml
index 3cfa99eaa8..d7434ef4ec 100644
--- a/stable/sonarqube/Chart.yaml
+++ b/stable/sonarqube/Chart.yaml
@@ -1,6 +1,6 @@
 name: sonarqube
 description: Sonarqube is an open sourced code quality scanning tool
-version: 0.9.1
+version: 0.10.1
 appVersion: 6.7.3
 keywords:
   - coverage
diff --git a/stable/sonarqube/README.md b/stable/sonarqube/README.md
index 8b00a400d3..f3a1ced8f9 100644
--- a/stable/sonarqube/README.md
+++ b/stable/sonarqube/README.md
@@ -65,6 +65,7 @@ The following table lists the configurable parameters of the Sonarqube chart and
 | `mysql.mysqlUser`                           | Mysql database user                       | `sonarUser`                                |
 | `mysql.mysqlPassword`                       | Mysql database password                   | `sonarPass`                                |
 | `mysql.mysqlDatabase`                       | Mysql database name                       | `sonarDB`                                  |
+| `mysql.mysqlParams`                         | Mysql parameters for JDBC connection string     | `{}`                                 |
 | `mysql.service.port`                        | Mysql port                                | `3306`                                     |
 | `resources`                                 | Sonarqube Pod resource requests & limits  | `{}`                                       |
 | `affinity`                                  | Node / Pod affinities                     | `{}`                                       |
diff --git a/stable/sonarqube/templates/deployment.yaml b/stable/sonarqube/templates/deployment.yaml
index 93cfd62948..e0eb17debd 100644
--- a/stable/sonarqube/templates/deployment.yaml
+++ b/stable/sonarqube/templates/deployment.yaml
@@ -101,7 +101,7 @@ spec:
               {{- if eq .Values.database.type "postgresql" }}
               value: "jdbc:postgresql://{{ template "postgresql.hostname" . }}:{{- .Values.postgresql.service.port -}}/{{- .Values.postgresql.postgresDatabase -}}"
               {{- else if eq .Values.database.type "mysql" }}
-              value: "jdbc:mysql://{{ template "mysql.hostname" . }}:{{ .Values.mysql.service.port }}/{{ .Values.mysql.mysqlDatabase }}?useUnicode=true&characterEncoding=utf8&rewriteBatchedStatements=true"
+              value: "jdbc:mysql://{{ template "mysql.hostname" . }}:{{ .Values.mysql.service.port }}/{{ .Values.mysql.mysqlDatabase }}?useUnicode=true&characterEncoding=utf8&rewriteBatchedStatements=true{{- range $key, $value := .Values.mysql.mysqlParams }}&{{ $key }}={{ $value }}{{- end }}"
               {{- end }}
           livenessProbe:
             httpGet:
diff --git a/stable/sonarqube/values.yaml b/stable/sonarqube/values.yaml
index f27975e3a3..5415fe6235 100644
--- a/stable/sonarqube/values.yaml
+++ b/stable/sonarqube/values.yaml
@@ -139,6 +139,8 @@ mysql:
   mysqlUser: "sonarUser"
   mysqlPassword: "sonarPass"
   mysqlDatabase: "sonarDB"
+  # mysqlParams:
+  #   useSSL: "true"
   # Specify the TCP port that mySQL should use
   service:
     port: 3306