From 5383080f1352c9d0a740a5bb0682ea70994d4042 Mon Sep 17 00:00:00 2001
From: Dominik Hebeler <dominik@suma-ev.de>
Date: Thu, 28 Jan 2021 16:22:43 +0100
Subject: [PATCH] mounting secrets from k8s secret
---
chart/templates/deployment.yaml | 54 +++++++++++++--------------------
1 file changed, 21 insertions(+), 33 deletions(-)
diff --git a/chart/templates/deployment.yaml b/chart/templates/deployment.yaml
index 4085300b9..2ada99a0e 100644
--- a/chart/templates/deployment.yaml
+++ b/chart/templates/deployment.yaml
@@ -45,24 +45,12 @@ spec:
imagePullSecrets:
{{ toYaml .Values.image.secrets | indent 10 }}
volumes:
+ - name: secrets
+ secret:
+ secretName: {{ .Values.application.secretName }}
- name: mglogs-persistent-storage
persistentVolumeClaim:
claimName: mg-logs
- - name: env-files
- secret:
- secretName: metager-env
- - name: sumas
- secret:
- secretName: metager-sumas
- - name: sumas-en
- secret:
- secretName: metager-sumas-en
- - name: blacklist
- secret:
- secretName: metager-blacklist
- - name: blacklist-ad
- secret:
- secretName: metager-ad-blacklist
- name: metager-config
configMap:
name: metager
@@ -105,37 +93,37 @@ spec:
- name: mglogs-persistent-storage
mountPath: /html/storage/logs/metager
readOnly: false
- - name: env-files
+ - name: secrets
mountPath: /root/.env
- subPath: .env
+ subPath: env
readOnly: true
- - name: env-files
+ - name: secrets
mountPath: /html/database/seeds/UsersSeeder.php
- subPath: UsersSeeder.php
+ subPath: userseeder
readOnly: true
- - name: sumas
+ - name: secrets
mountPath: /html/config/sumas.json
- subPath: sumas.json
+ subPath: sumas
readOnly: true
- - name: sumas-en
+ - name: secrets
mountPath: /html/config/sumasEn.json
- subPath: sumasEn.json
+ subPath: sumasen
readOnly: true
- - name: blacklist
+ - name: secrets
mountPath: /html/config/blacklistUrl.txt
- subPath: blacklistUrl.txt
+ subPath: blacklisturl
readOnly: true
- - name: blacklist
+ - name: secrets
mountPath: /html/config/blacklistDomains.txt
- subPath: blacklistDomains.txt
+ subPath: blacklistdomains
readOnly: true
- - name: blacklist-ad
+ - name: secrets
mountPath: /html/config/adBlacklistUrl.txt
- subPath: adBlacklistUrl.txt
+ subPath: adblacklisturl
readOnly: true
- - name: blacklist-ad
+ - name: secrets
mountPath: /html/config/adBlacklistDomains.txt
- subPath: adBlacklistDomains.txt
+ subPath: adblacklistdomains
readOnly: true
resources:
{{ toYaml .Values.resourcesPhpfpm | indent 12 }}
@@ -216,9 +204,9 @@ spec:
command: ["su"]
args: ["-s", "/bin/sh", "-c", "php artisan requests:fetcher", "nginx"]
volumeMounts:
- - name: env-files
+ - name: secrets
mountPath: /html/.env
- subPath: .env
+ subPath: env
readOnly: true
imagePullPolicy: {{ .Values.image.pullPolicy }}
livenessProbe:
--
GitLab