From dfb0e2dd7a7799bfae7f7cd48f1a935309efccc1 Mon Sep 17 00:00:00 2001 From: Nicolas Camus Date: Wed, 15 Jan 2020 11:27:31 +0100 Subject: [PATCH] [stable/phpmyadmin] Fix an SSL certificates directory conflict (#20086) Mount the SSL certificates used to connect to the database in /db_certs instead of /certs, as /certs is already used by the bitnami/phpmyadmin Docker image to configure Apache internally. Signed-off-by: Nicolas Camus --- stable/phpmyadmin/Chart.yaml | 2 +- stable/phpmyadmin/templates/deployment.yaml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/stable/phpmyadmin/Chart.yaml b/stable/phpmyadmin/Chart.yaml index 2c19f7f9e3..3a004e573b 100644 --- a/stable/phpmyadmin/Chart.yaml +++ b/stable/phpmyadmin/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: phpmyadmin -version: 4.2.8 +version: 4.2.9 appVersion: 5.0.1 description: phpMyAdmin is an mysql administration frontend keywords: diff --git a/stable/phpmyadmin/templates/deployment.yaml b/stable/phpmyadmin/templates/deployment.yaml index d5fa0cc1f7..c034da6d89 100644 --- a/stable/phpmyadmin/templates/deployment.yaml +++ b/stable/phpmyadmin/templates/deployment.yaml @@ -76,11 +76,11 @@ spec: value: {{ ternary "yes" "no" .Values.db.enableSsl | quote }} {{- if .Values.db.enableSsl }} - name: DATABASE_SSL_KEY - value: "/certs/server_key.pem" + value: "/db_certs/server_key.pem" - name: DATABASE_SSL_CERT - value: "/certs/server_certificate.pem" + value: "/db_certs/server_certificate.pem" - name: DATABASE_SSL_CA - value: "/certs/ca_certificate.pem" + value: "/db_certs/ca_certificate.pem" {{- if .Values.db.ssl.ciphers }} - name: DATABASE_SSL_CIPHERS values: {{ .Values.db.ssl.ciphers | quote }} @@ -111,7 +111,7 @@ spec: {{- if .Values.db.enableSsl }} volumeMounts: - name: ssl-certs - mountPath: /certs + mountPath: /db_certs {{- end }} {{- if .Values.metrics.enabled }} - name: metrics