summaryrefslogtreecommitdiffstats
path: root/kubernetes/so/charts/so-db-secrets
diff options
context:
space:
mode:
authorAlexis de Talhouët <alexis.de_talhouet@bell.ca>2018-09-20 13:41:10 +0000
committerGerrit Code Review <gerrit@onap.org>2018-09-20 13:41:10 +0000
commit6e3286203f254ff0feb0aa765f0d4f77dbc8beaf (patch)
tree08113aff2c305f9c5caf48f4da8c28cdfcc3fc6b /kubernetes/so/charts/so-db-secrets
parent9a744914077c062ee8a90291a0c64000cbfcac50 (diff)
parent2898b6eade2f51bf6eef90f01887db14c57738e0 (diff)
Merge "SO helm chart cleanup"
Diffstat (limited to 'kubernetes/so/charts/so-db-secrets')
-rwxr-xr-xkubernetes/so/charts/so-db-secrets/templates/secrets.yaml14
-rw-r--r--kubernetes/so/charts/so-db-secrets/values.yaml19
2 files changed, 26 insertions, 7 deletions
diff --git a/kubernetes/so/charts/so-db-secrets/templates/secrets.yaml b/kubernetes/so/charts/so-db-secrets/templates/secrets.yaml
index f1910d2738..e787b57a88 100755
--- a/kubernetes/so/charts/so-db-secrets/templates/secrets.yaml
+++ b/kubernetes/so/charts/so-db-secrets/templates/secrets.yaml
@@ -22,10 +22,10 @@ metadata:
release: {{ .Release.Name }}
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.db_host | b64enc | quote}}
+ mariadb.readwrite.port : {{ .Values.db_port | b64enc | quote}}
+ mariadb.readwrite.rolename: {{ .Values.db_admin_username | b64enc | quote}}
+ mariadb.readwrite.password: {{ .Values.db_admin_password | b64enc | quote}}
+ mariadb.admin.rolename: {{ .Values.db_username | b64enc | quote}}
+ mariadb.admin.password: {{ .Values.db_password | b64enc | quote}}
+type: Opaque
diff --git a/kubernetes/so/charts/so-db-secrets/values.yaml b/kubernetes/so/charts/so-db-secrets/values.yaml
new file mode 100644
index 0000000000..f3387efad3
--- /dev/null
+++ b/kubernetes/so/charts/so-db-secrets/values.yaml
@@ -0,0 +1,19 @@
+# Copyright © 2018 AT&T USA
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+db_host: so-mariadb
+db_port: "3306"
+db_admin_username: root
+db_admin_password: password
+db_username: root
+db_password: password