summaryrefslogtreecommitdiffstats
path: root/kubernetes/vid
diff options
context:
space:
mode:
Diffstat (limited to 'kubernetes/vid')
-rwxr-xr-xkubernetes/vid/resources/config/db_cmd.sh4
-rw-r--r--kubernetes/vid/templates/deployment.yaml2
-rw-r--r--kubernetes/vid/values.yaml24
3 files changed, 15 insertions, 15 deletions
diff --git a/kubernetes/vid/resources/config/db_cmd.sh b/kubernetes/vid/resources/config/db_cmd.sh
index efd92b223f..daa1f8b6ea 100755
--- a/kubernetes/vid/resources/config/db_cmd.sh
+++ b/kubernetes/vid/resources/config/db_cmd.sh
@@ -16,13 +16,13 @@
# limitations under the License.
*/}}
-DB={{index .Values "mariadb-galera" "config" "mysqlDatabase" | upper }}
+DB={{index .Values "mariadb-galera" "db" "name" | upper }}
eval "MYSQL_USER=\$MYSQL_USER_${DB}"
eval "MYSQL_PASSWORD=\$MYSQL_PASSWORD_${DB}"
#echo "Going to run mysql ${DB} -u${MYSQL_USER} -p${MYSQL_PASSWORD} -h${DB_HOST} -P${DB_PORT} ..."
mysql -u${MYSQL_USER} -p${MYSQL_PASSWORD} -h${DB_HOST} -P${DB_PORT} <<'EOD'
-CREATE TABLE IF NOT EXISTS `{{index .Values "mariadb-galera" "config" "mysqlDatabase" }}`.`schema_info` (
+CREATE TABLE IF NOT EXISTS `{{index .Values "mariadb-galera" "db" "name" }}`.`schema_info` (
`SCHEMA_ID` VARCHAR(25) NOT NULL,
`SCHEMA_DESC` VARCHAR(75) NOT NULL,
`DATASOURCE_TYPE` VARCHAR(100) NULL DEFAULT NULL,
diff --git a/kubernetes/vid/templates/deployment.yaml b/kubernetes/vid/templates/deployment.yaml
index 856a853960..2e74daa730 100644
--- a/kubernetes/vid/templates/deployment.yaml
+++ b/kubernetes/vid/templates/deployment.yaml
@@ -109,7 +109,7 @@ spec:
- name: VID_MYSQL_PORT
value: "{{ include "common.mariadbPort" . }}"
- name: VID_MYSQL_DBNAME
- value: {{ index .Values "mariadb-galera" "config" "mysqlDatabase" }}
+ value: {{ index .Values "mariadb-galera" "db" "name" }}
- name: VID_MYSQL_USER
{{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "vid-db-user-secret" "key" "login") | indent 14 }}
- name: VID_MYSQL_PASS
diff --git a/kubernetes/vid/values.yaml b/kubernetes/vid/values.yaml
index 47cd73aff2..8e8a17ae84 100644
--- a/kubernetes/vid/values.yaml
+++ b/kubernetes/vid/values.yaml
@@ -30,7 +30,7 @@ global:
#################################################################
secrets:
- uid: vid-db-user-secret
- name: '{{ include "common.release" . }}-vid-db-user-secret'
+ name: &dbUserSecretName '{{ include "common.release" . }}-vid-db-user-secret'
type: basicAuth
externalSecret: '{{ tpl (default "" .Values.config.db.userCredentialsExternalSecret) . }}'
login: '{{ .Values.config.db.userName }}'
@@ -66,16 +66,12 @@ config:
roleaccesscentralized: remote
mariadb-galera:
- # '&mariadbConfig' means we "store" the values for later use in the file
- # with '*mariadbConfig' pointer.
- config: &mariadbConfig
- userCredentialsExternalSecret: '{{ include "common.release" . }}-vid-db-user-secret'
- mysqlDatabase: vid_openecomp_epsdk
- nameOverride: vid-galera
- service:
- name: vid-galera
- portName: mysql-vid
- internalPort: "3306"
+ db:
+ user: sdnctl
+ # password:
+ externalSecret: *dbUserSecretName
+ name: &mysqlDbName vid_openecomp_epsdk
+ nameOverride: &vid-galera vid-galera
replicaCount: 3
persistence:
enabled: true
@@ -83,9 +79,13 @@ mariadb-galera:
externalConfig: |-
[mysqld]
lower_case_table_names = 1
+ serviceAccount:
+ nameOverride: *vid-galera
mariadb-init:
- config: *mariadbConfig
+ config:
+ userCredentialsExternalSecret: *dbUserSecretName
+ mysqlDatabase: *mysqlDbName
nameOverride: vid-mariadb-init
# A configMap of same name is created. It points to file that will be run after
# The DB has been created.