[MARIADB][COMMON] Add support for mariadb-operator

[oom.git] / kubernetes / so / components / so-mariadb / values.yaml

diff --git a/kubernetes/so/components/so-mariadb/values.yaml b/kubernetes/so/components/so-mariadb/values.yaml
index 58e34b7..8533681 100755 (executable)
--- a/kubernetes/so/components/so-mariadb/values.yaml
+++ b/kubernetes/so/components/so-mariadb/values.yaml
@@ -1,4 +1,5 @@
 # Copyright © 2017 Amdocs, Bell Canada
+# Modifications Copyright (C) 2022-23 Nordix Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -21,11 +22,11 @@ global:
   nodePortPrefix: 302
   nodePortPrefixExt: 304
   repository: nexus3.onap.org:10001
-  readinessImage: onap/oom/readiness:3.0.1
+  readinessImage: onap/oom/readiness:5.0.1
   ubuntuInitRepository: docker.io
   mariadbGalera:
     nameOverride: &mariadbName mariadb-galera
-    serviceName: mariadb-galera
+    service: mariadb-galera-primary
     servicePort: "3306"
   migration:
     enabled: false
@@ -36,7 +37,8 @@ global:
 
 readinessCheck:
   wait_for:
-    - *mariadbName
+    apps:
+      - *mariadbName
 
 #################################################################
 # Secrets metaconfig
@@ -89,6 +91,11 @@ secrets:
     externalSecret: '{{ tpl (default "" .Values.db.nfvo.dbCredsExternalSecret) . }}'
     login: '{{ .Values.db.nfvo.userName }}'
     password: '{{ .Values.db.nfvo.password }}'
+  - uid: cnfm-db-creds
+    type: basicAuth
+    externalSecret: '{{ tpl (default "" .Values.db.cnfm.dbCredsExternalSecret) . }}'
+    login: '{{ .Values.db.cnfm.userName }}'
+    password: '{{ .Values.db.cnfm.password }}'
 
 #################################################################
 # Application configuration defaults.
@@ -127,6 +134,9 @@ db:
   nfvo:
     userName: nfvouser
     # dbCredsExternalSecret: some secret
+  cnfm:
+    userName: cnfmuser
+    # dbCredsExternalSecret: some secret
 
 # application configuration
 config:
@@ -187,3 +197,7 @@ serviceAccount:
   nameOverride: so-mariadb
   roles:
     - read
+
+wait_for_job_container:
+  containers:
+    - '{{ include "common.name" . }}-config'