From a23ea388bba93c7415130f19094c38903c57f640 Mon Sep 17 00:00:00 2001
From: Thomas MENARD <thomas.menard@pasteur.fr>
Date: Wed, 27 May 2020 15:57:23 +0200
Subject: [PATCH] Move configmap to kustomize
---
tutor/templates/apps/mysql/auth.env | 3 +++
tutor/templates/apps/mysql/my.cnf | 11 +++++++++++
tutor/templates/k8s/configmap.yml | 8 --------
tutor/templates/kustomization.yml | 3 ++-
4 files changed, 16 insertions(+), 9 deletions(-)
create mode 100644 tutor/templates/apps/mysql/my.cnf
delete mode 100644 tutor/templates/k8s/configmap.yml
diff --git a/tutor/templates/apps/mysql/auth.env b/tutor/templates/apps/mysql/auth.env
index 8d4ea4a..db5d346 100644
--- a/tutor/templates/apps/mysql/auth.env
+++ b/tutor/templates/apps/mysql/auth.env
@@ -1 +1,4 @@
MYSQL_ROOT_PASSWORD={{ MYSQL_ROOT_PASSWORD }}
+OPENEDX_MYSQL_DATABASE={{ OPENEDX_MYSQL_DATABASE }}
+OPENEDX_MYSQL_USERNAME={{ OPENEDX_MYSQL_USERNAME }}
+OPENEDX_MYSQL_PASSWORD={{ OPENEDX_MYSQL_PASSWORD }}
diff --git a/tutor/templates/apps/mysql/my.cnf b/tutor/templates/apps/mysql/my.cnf
new file mode 100644
index 0000000..1243019
--- /dev/null
+++ b/tutor/templates/apps/mysql/my.cnf
@@ -0,0 +1,11 @@
+[mysqld]
+pid-file = /var/run/mysqld/mysqld.pid
+socket = /var/run/mysqld/mysqld.sock
+datadir = /var/lib/mysql
+log-error = /var/log/mysql/error.log
+
+symbolic-links=0
+skip-host-cache
+skip-name-resolve
+character-set-server=utf8
+collation-server=utf8_general_ci
diff --git a/tutor/templates/k8s/configmap.yml b/tutor/templates/k8s/configmap.yml
deleted file mode 100644
index 53c180e..0000000
--- a/tutor/templates/k8s/configmap.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-apiVersion: v1
-data:
- my.cnf: "[mysqld]\npid-file\t= /var/run/mysqld/mysqld.pid\nsocket\t\t= /var/run/mysqld/mysqld.sock\ndatadir\t\t=
- /var/lib/mysql\nlog-error\t= /var/log/mysql/error.log\n# Disabling symbolic-links
- is recommended to prevent assorted security risks\nsymbolic-links=0\nskip-host-cache\nskip-name-resolve\ncharacter-set-server=utf8\ncollation-server=utf8_general_ci\n"
-kind: ConfigMap
-metadata:
- name: mysql-cnf
diff --git a/tutor/templates/kustomization.yml b/tutor/templates/kustomization.yml
index 0743d84..2dd8b76 100644
--- a/tutor/templates/kustomization.yml
+++ b/tutor/templates/kustomization.yml
@@ -3,7 +3,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
- k8s/namespace.yml
-- k8s/configmap.yml
- k8s/deployments.yml
- k8s/ingress.yml
- k8s/jobs.yml
@@ -38,6 +37,8 @@ configMapGenerator:
- {{ file }}{% endfor %}
- name: mysql-config
env: apps/mysql/auth.env
+- name: mysql-cnf
+ env: apps/mysql/my.cnf
{{ patch("kustomization-configmapgenerator") }}
{{ patch("kustomization") }}
--
GitLab