From dace8838b7ea5be9071c81b1a2e2933e0db3280a Mon Sep 17 00:00:00 2001 From: Thomas MENARD <thomas.menard@pasteur.fr> Date: Wed, 27 May 2020 15:47:00 +0200 Subject: [PATCH] switch mysql to configmap and remove mysql job --- tutor/templates/k8s/configmap.yml | 8 ++++++++ tutor/templates/k8s/deployments.yml | 6 +++++- tutor/templates/k8s/jobs.yml | 16 ---------------- tutor/templates/kustomization.yml | 3 ++- 4 files changed, 15 insertions(+), 18 deletions(-) create mode 100644 tutor/templates/k8s/configmap.yml diff --git a/tutor/templates/k8s/configmap.yml b/tutor/templates/k8s/configmap.yml new file mode 100644 index 0000000..53c180e --- /dev/null +++ b/tutor/templates/k8s/configmap.yml @@ -0,0 +1,8 @@ +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/k8s/deployments.yml b/tutor/templates/k8s/deployments.yml index a9f9600..2e14e35 100644 --- a/tutor/templates/k8s/deployments.yml +++ b/tutor/templates/k8s/deployments.yml @@ -325,7 +325,6 @@ spec: - name: mysql imagePullPolicy: Always image: {{ DOCKER_REGISTRY }}{{ DOCKER_IMAGE_MYSQL }} - args: ["mysqld", "--character-set-server=utf8", "--collation-server=utf8_general_ci"] env: - name: MYSQL_ROOT_PASSWORD valueFrom: @@ -343,10 +342,15 @@ spec: volumeMounts: - mountPath: /var/lib/mysql name: data + - mountPath: /etc/mysql + name: mysql-cnf volumes: - name: data persistentVolumeClaim: claimName: mysql + - name: mysql-cnf + configMap: + name: mysql-cnf {% endif %} {% if ACTIVATE_SMTP %} --- diff --git a/tutor/templates/k8s/jobs.yml b/tutor/templates/k8s/jobs.yml index 2cf4d31..b51c841 100644 --- a/tutor/templates/k8s/jobs.yml +++ b/tutor/templates/k8s/jobs.yml @@ -68,22 +68,6 @@ spec: --- apiVersion: batch/v1 kind: Job -metadata: - name: mysql-job - labels: - app.kubernetes.io/component: job -spec: - template: - spec: - restartPolicy: Never - containers: - - name: mysql - imagePullPolicy: Always - image: {{ DOCKER_REGISTRY }}{{ DOCKER_IMAGE_MYSQL }} - command: [] ---- -apiVersion: batch/v1 -kind: Job metadata: name: forum-job labels: diff --git a/tutor/templates/kustomization.yml b/tutor/templates/kustomization.yml index 5434e04..0743d84 100644 --- a/tutor/templates/kustomization.yml +++ b/tutor/templates/kustomization.yml @@ -3,6 +3,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization resources: - k8s/namespace.yml +- k8s/configmap.yml - k8s/deployments.yml - k8s/ingress.yml - k8s/jobs.yml @@ -39,4 +40,4 @@ configMapGenerator: env: apps/mysql/auth.env {{ patch("kustomization-configmapgenerator") }} -{{ patch("kustomization") }} \ No newline at end of file +{{ patch("kustomization") }} -- GitLab