X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fcommon%2Fmariadb-init%2Fvalues.yaml;h=5c181dded2b398e0d818e554590f30d077c8277a;hb=8cbb3d9b964b774b1400df5d909913b669c2a243;hp=42a1513449aa63df158a867d08e424d61a3741e4;hpb=e4ee7f1be369215e609930f5a885bd04cbe4534d;p=oom.git

diff --git a/kubernetes/common/mariadb-init/values.yaml b/kubernetes/common/mariadb-init/values.yaml
index 42a1513449..5c181dded2 100644
--- a/kubernetes/common/mariadb-init/values.yaml
+++ b/kubernetes/common/mariadb-init/values.yaml
@@ -16,8 +16,6 @@
 # Global configuration defaults.
 #################################################################
 global:
-  repository: nexus3.onap.org:10001
-  readinessImage: onap/oom/readiness:3.0.1
   mariadbGalera:
     nameOverride: mariadb-galera
     servicePort: 3306
@@ -45,7 +43,6 @@ secrets:
 # Application configuration defaults.
 #################################################################
 
-image: mariadb:10.1.38
 pullPolicy: IfNotPresent
 
 # These two values are used to supply commands that are run after the DB is created.
@@ -66,6 +63,27 @@ mariadbGalera: {}
 #  userRootSecret: some-secret-name
 #  userRootSecretKey: password
 
+# These are default settings, required for a chart compilation with "local" cluster
+# setting. These values need to be overwritten in the component's values.yaml, e.g.
+# global:
+#   mariadbGalera: &mariadbGalera
+#     #This flag allows SO to instantiate its own mariadb-galera cluster
+#     localCluster: true
+#     service: nbi-galera
+#     internalPort: 3306
+#     nameOverride: nbi-galera
+# mariadb-init:
+#   mariadb-galera:
+#     nameOverride: nbi-galera
+#     service:
+#       internalPort: 3306
+mariadb-galera:
+  service:
+    internalPort: 3306
+  nameOverride: mariadb-galera
+  mariadbOperator:
+    galera:
+      enabled: false
 
 config:
   userPassword: Ci@shsOd3pky1Vji
@@ -107,16 +125,40 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 100m
-      memory: 500Mi
+      cpu: "100m"
+      memory: "500Mi"
     requests:
-      cpu: 10m
-      memory: 10Mi
+      cpu: "10m"
+      memory: "10Mi"
   large:
     limits:
-      cpu: 200m
-      memory: 500Mi
+      cpu: "200m"
+      memory: "500Mi"
     requests:
-      cpu: 20m
-      memory: 20Mi
+      cpu: "20m"
+      memory: "20Mi"
   unlimited: {}
+
+#Pods Service Account
+serviceAccount:
+  nameOverride: mariadb-init
+  roles:
+    - read
+
+wait_for_job_container:
+  containers:
+    - '{{ include "common.name" . }}'
+
+readinessCheck:
+  wait_for_global_operator:
+    pods:
+      - '{{ .Values.global.mariadbGalera.nameOverride }}-0'
+  wait_for_local_operator:
+    pods:
+      - '{{ index .Values "mariadb-galera" "nameOverride" }}-0'
+  wait_for_global:
+    apps:
+      - '{{ include "common.mariadbAppName" . }}'
+  wait_for_local:
+    apps:
+      - '{{ include "common.mariadbAppName" . }}'