Merge "[COMMON] Add limits to timescale db"

[oom.git] / kubernetes / common / network-name-gen / values.yaml

diff --git a/kubernetes/common/network-name-gen/values.yaml b/kubernetes/common/network-name-gen/values.yaml
index cfa7171..c1717c3 100644 (file)
--- a/kubernetes/common/network-name-gen/values.yaml
+++ b/kubernetes/common/network-name-gen/values.yaml
@@ -21,13 +21,6 @@ global:
   # with other instances running within the same k8s cluster
   nodePortPrefix: 302
 
-  # image repositories
-  repository: nexus3.onap.org:10001
-
-
-  # readiness check
-  readinessImage: onap/oom/readiness:3.0.1
-
   # image pull policy
   pullPolicy: IfNotPresent
 
@@ -43,9 +36,9 @@ global:
 #################################################################
 secrets:
   - uid: neng-db-secret
-    name: '{{ include "common.release" . }}-neng-db-secret'
+    name: &dbUserSecretName '{{ include "common.release" . }}-neng-db-secret'
     type: basicAuth
-    externalSecret: '{{ tpl (default "" .Values.config.db.userCredentialsExternalSecret) . }}'
+    externalSecret: '{{ tpl (default "" .Values.config.db.externalSecret) . }}'
     login: '{{ .Values.config.db.userName }}'
     password: '{{ .Values.config.db.userPassword }}'
   - uid: pol-basic-auth-secret
@@ -57,9 +50,11 @@ secrets:
 
 # sub-chart config
 mariadb-galera:
-  config: &mariadbConfig
-    userCredentialsExternalSecret: '{{ include "common.release" . }}-neng-db-secret'
-    mysqlDatabase: nengdb
+  db:
+    user: sdnctl
+    # password:
+    externalSecret: *dbUserSecretName
+    name: &mysqlDbName nengdb
   nameOverride: nengdb
   service:
     name: nengdb
@@ -70,15 +65,16 @@ mariadb-galera:
     mountSubPath: network-name-gen/data
 
 mariadb-init:
-  config: *mariadbConfig
+  config:
+    userCredentialsExternalSecret: *dbUserSecretName
+    mysqlDatabase: *mysqlDbName
   nameOverride: nengdb-init
 
 #################################################################
 # Application configuration defaults.
 #################################################################
 # application image
-repository: nexus3.onap.org:10001
-image: onap/ccsdk-apps-ms-neng:0.7.1
+image: onap/ccsdk-apps-ms-neng:1.2.0
 pullPolicy: IfNotPresent
 
 # application configuration