From 2d747c5c941542e8dc9f27a05e5db63efd11fc19 Mon Sep 17 00:00:00 2001
From: Ales Verbic <averbic@applause.com>
Date: Mon, 4 Apr 2022 18:00:45 -0400
Subject: [PATCH] Add support for mycnf in mysql-innodbcluster

---
 helm/mysql-innodbcluster/Chart.yaml                       | 2 +-
 .../mysql-innodbcluster/templates/deployment_cluster.yaml | 5 +++++
 helm/mysql-innodbcluster/values.yaml                      | 8 +++++++-
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/helm/mysql-innodbcluster/Chart.yaml b/helm/mysql-innodbcluster/Chart.yaml
index 72b22a9..b5b0a1f 100644
--- a/helm/mysql-innodbcluster/Chart.yaml
+++ b/helm/mysql-innodbcluster/Chart.yaml
@@ -3,5 +3,5 @@ appVersion: "8.0.28"
 name: mysql-innodbcluster
 description: MySQL InnoDB Cluster Helm Chart for deploying MySQL InnoDB Cluster in Kubernetes
 type: application
-version: "8.0.28-2.0.3"
+version: "8.0.28-2.0.4"
 icon: https://labs.mysql.com/common/themes/sakila/favicon.ico
diff --git a/helm/mysql-innodbcluster/templates/deployment_cluster.yaml b/helm/mysql-innodbcluster/templates/deployment_cluster.yaml
index 5c655e8..bf84163 100644
--- a/helm/mysql-innodbcluster/templates/deployment_cluster.yaml
+++ b/helm/mysql-innodbcluster/templates/deployment_cluster.yaml
@@ -27,6 +27,11 @@ spec:
   {{- end }}
 {{- end }}
 
+{{- if .Values.mycnf }}
+  mycnf: |
+{{ .Values.mycnf | indent 4}}
+{{- end }}
+
 {{- if .Values.initDB}}
   {{- if and (and .Values.initDB.dump .Values.initDB.dump.name) (and .Values.initDB.clone .Values.initDB.donorUrl) }}
     {{- fail "Dump and Clone are mutually exclusive" }}
diff --git a/helm/mysql-innodbcluster/values.yaml b/helm/mysql-innodbcluster/values.yaml
index b612ab2..ff8b9c9 100644
--- a/helm/mysql-innodbcluster/values.yaml
+++ b/helm/mysql-innodbcluster/values.yaml
@@ -30,6 +30,12 @@ baseServerId: 1000
 #    requests:
 #      storage:
 
+# mycnf: |
+#   [mysqld]
+#   max_allowed_packet=16M
+#   character-set-server=utf8mb4
+#   collation-server=utf8mb4_general_ci
+
 #initDB:
 #  dump:
 #    name:
@@ -40,7 +46,7 @@ baseServerId: 1000
 #      prefix:
 #      bucketName:
 #      credentials:
-#    persistentVolumeClaim:     
+#    persistentVolumeClaim:
 #  clone:
 #    donorUrl:
 #    rootUser: