From 92b606b267cf7e48336f3383bfb459253052c88c Mon Sep 17 00:00:00 2001 From: krishnaa96 Date: Fri, 30 Oct 2020 11:29:21 +0530 Subject: [SO] Remove so-db-secrets so-db-secrets was used to create secrets for db creds. But now, they are being created from secrets metaconfig. It is not needed Issue-ID: OOM-2534 Signed-off-by: Krishna Moorthy Change-Id: I0f0514b0b704e4643253b793ea4bd9ad92329759 --- .../so/components/so-monitoring/templates/deployment.yaml | 10 ++-------- kubernetes/so/components/so-monitoring/values.yaml | 3 +++ 2 files changed, 5 insertions(+), 8 deletions(-) (limited to 'kubernetes/so/components/so-monitoring') diff --git a/kubernetes/so/components/so-monitoring/templates/deployment.yaml b/kubernetes/so/components/so-monitoring/templates/deployment.yaml index 7875893dc8..03eccc2d02 100644 --- a/kubernetes/so/components/so-monitoring/templates/deployment.yaml +++ b/kubernetes/so/components/so-monitoring/templates/deployment.yaml @@ -75,15 +75,9 @@ spec: /app/start-app.sh env: - name: DB_HOST - valueFrom: - secretKeyRef: - name: {{ include "common.release" . }}-so-db-secrets - key: mariadb.readwrite.host + value: {{ include "common.mariadbService" . }} - name: DB_PORT - valueFrom: - secretKeyRef: - name: {{ include "common.release" . }}-so-db-secrets - key: mariadb.readwrite.port + value: {{ include "common.mariadbPort" . | quote }} - name: DB_USERNAME {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "db-user-creds" "key" "login") | indent 10 }} - name: DB_PASSWORD diff --git a/kubernetes/so/components/so-monitoring/values.yaml b/kubernetes/so/components/so-monitoring/values.yaml index 9ba1d7b7d8..31ad9d072c 100644 --- a/kubernetes/so/components/so-monitoring/values.yaml +++ b/kubernetes/so/components/so-monitoring/values.yaml @@ -37,6 +37,9 @@ global: aaf: auth: header: Basic c29Ac28ub25hcC5vcmc6ZGVtbzEyMzQ1Ngo= + mariadbGalera: + serviceName: mariadb-galera + servicePort: '3306' ################################################################# # Secrets metaconfig -- cgit 1.2.3-korg