Merge "[SDNC] Remove hook on db job"

[oom.git] / kubernetes / vid / values.yaml

diff --git a/kubernetes/vid/values.yaml b/kubernetes/vid/values.yaml
index 04d7938..8e8a17a 100644 (file)
--- a/kubernetes/vid/values.yaml
+++ b/kubernetes/vid/values.yaml
@@ -18,17 +18,19 @@
 # Declare variables to be passed into your templates.
 global:
   nodePortPrefix: 302
-  readinessRepository: oomk8s
-  readinessImage: readiness-check:2.0.2
-  loggingRepository: docker.elastic.co
-  loggingImage: beats/filebeat:5.5.0
+  mariadbGalera: &mariadbGalera
+    #This flag allows VID to instantiate its own mariadb-galera cluster
+    localCluster: false
+    service: mariadb-galera
+    internalPort: 3306
+    nameOverride: mariadb-galera
 
 #################################################################
 # Secrets metaconfig
 #################################################################
 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 }}'
@@ -38,13 +40,9 @@ subChartsOnly:
   enabled: true
 
 # application image
-repository: nexus3.onap.org:10001
-image: onap/vid:6.0.4
+image: onap/vid:7.0.0
 pullPolicy: Always
 
-# mariadb image for initializing
-mariadb_image: library/mariadb:10
-
 # application configuration
 config:
   db:
@@ -68,14 +66,12 @@ config:
   roleaccesscentralized: remote
 
 mariadb-galera:
-  config:
-    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,6 +79,17 @@ mariadb-galera:
   externalConfig: |-
     [mysqld]
     lower_case_table_names = 1
+  serviceAccount:
+    nameOverride: *vid-galera
+
+mariadb-init:
+  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.
+  dbScriptConfigMap: '{{ include "common.release" . }}-vid-db-init'
 
 # default number of instances
 replicaCount: 1
@@ -116,11 +123,11 @@ service:
 ingress:
   enabled: false
   service:
-       - baseaddr: "vid.api"
-         name: "vid-http"
-         port: 8080
+    - baseaddr: "vid.api"
+      name: "vid-http"
+      port: 8443
   config:
-       ssl: "none"
+    ssl: "redirect"
 
 # Resource Limit flavor -By Default using small
 flavor: small