[CONSUL] Add limits to consul chart.

[oom.git] / kubernetes / so / charts / so-db-secrets / templates / secrets.yaml

diff --git a/kubernetes/so/charts/so-db-secrets/templates/secrets.yaml b/kubernetes/so/charts/so-db-secrets/templates/secrets.yaml
index f1910d2..d636fad 100755 (executable)
--- a/kubernetes/so/charts/so-db-secrets/templates/secrets.yaml
+++ b/kubernetes/so/charts/so-db-secrets/templates/secrets.yaml
@@ -14,18 +14,18 @@
 apiVersion: v1
 kind: Secret
 metadata:
-  name: {{ .Release.Name }}-so-db-secrets
+  name: {{ include "common.release" . }}-so-db-secrets
   namespace: {{ include "common.namespace" . }}
   labels:
     app: {{ include "common.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ .Release.Name }}
+    release: {{ include "common.release" . }}
     heritage: {{ .Release.Service }}
 data:
-  mariadb.readwrite.host : {{"so-mariadb"| b64enc | quote}}
-  mariadb.readwrite.port : {{"3306"| b64enc }}
-  mariadb.readwrite.rolename: {{"root"| b64enc | quote}}
-  mariadb.readwrite.password: {{"password"| b64enc | quote}}
-  mariadb.admin.rolename: {{"root"| b64enc | quote}}
-  mariadb.admin.password:  {{"password"| b64enc | quote}}
-type: Opaque
\ No newline at end of file
+  mariadb.readwrite.host : {{ .Values.global.mariadbGalera.serviceName | b64enc | quote }}
+  mariadb.readwrite.port : {{ .Values.global.mariadbGalera.servicePort | b64enc | quote }}
+  mariadb.readwrite.rolename: {{ .Values.db_username | b64enc | quote }}
+  mariadb.readwrite.password: {{ .Values.db_password | b64enc | quote }}
+  mariadb.admin.rolename: {{ .Values.db_admin_username| b64enc | quote }}
+  mariadb.admin.password:  {{ .Values.db_admin_password | b64enc | quote }}
+type: Opaque