8 files changed, 27 insertions, 20 deletions
diff --git a/kubernetes/nbi/Chart.yaml b/kubernetes/nbi/Chart.yaml
index 754939c717..0fffb98e36 100644
--- a/kubernetes/nbi/Chart.yaml
+++ b/kubernetes/nbi/Chart.yaml
@@ -16,4 +16,4 @@
 apiVersion: v1
 description: ONAP Northbound Interface
 name: nbi
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/nbi/charts/mariadb/Chart.yaml b/kubernetes/nbi/charts/mariadb/Chart.yaml
index 69933cd4c2..10bbe080c2 100644
--- a/kubernetes/nbi/charts/mariadb/Chart.yaml
+++ b/kubernetes/nbi/charts/mariadb/Chart.yaml
@@ -15,4 +15,4 @@
 apiVersion: v1
 description: ONAP NBI MariaDB Service
 name: mariadb
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/nbi/charts/mariadb/requirements.yaml b/kubernetes/nbi/charts/mariadb/requirements.yaml
index 7a4e4ebda6..f8074990af 100644
--- a/kubernetes/nbi/charts/mariadb/requirements.yaml
+++ b/kubernetes/nbi/charts/mariadb/requirements.yaml
@@ -15,7 +15,7 @@
 
 dependencies:
   - name: common
-    version: ~2.0.0
+    version: ~3.0.0
     # local reference to common chart, as it is
     # a part of this chart's package and will not
     # be published independently to a repo (at this point)
diff --git a/kubernetes/nbi/charts/mariadb/templates/deployment.yaml b/kubernetes/nbi/charts/mariadb/templates/deployment.yaml
index fee00bafba..b432d0e431 100644
--- a/kubernetes/nbi/charts/mariadb/templates/deployment.yaml
+++ b/kubernetes/nbi/charts/mariadb/templates/deployment.yaml
@@ -75,7 +75,7 @@ spec:
           - mountPath: /var/lib/mysql
             name: mariadb-data
           resources:
-{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
         {{- if .Values.nodeSelector }}
         nodeSelector:
 {{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/nbi/charts/mariadb/values.yaml b/kubernetes/nbi/charts/mariadb/values.yaml
index 525c6a1a46..dc5aa89e7d 100644
--- a/kubernetes/nbi/charts/mariadb/values.yaml
+++ b/kubernetes/nbi/charts/mariadb/values.yaml
@@ -80,16 +80,16 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 2
-      memory: 4Gi
-    requests:
       cpu: 1
-      memory: 2Gi
+      memory: 500Mi
+    requests:
+      cpu: 10m
+      memory: 200Mi
   large:
     limits:
-      cpu: 4
-      memory: 8Gi
+      cpu: 1
+      memory: 1Gi
     requests:
-      cpu: 2
-      memory: 4Gi
-
+      cpu: 20m
+      memory: 400Mi
+  unlimited: {}
diff --git a/kubernetes/nbi/requirements.yaml b/kubernetes/nbi/requirements.yaml
index e74329725d..1ec9012c65 100644
--- a/kubernetes/nbi/requirements.yaml
+++ b/kubernetes/nbi/requirements.yaml
@@ -15,12 +15,12 @@
 
 dependencies:
   - name: common
-    version: ~2.0.0
+    version: ~3.0.0
     # local reference to common chart, as it is
     # a part of this chart's package and will not
     # be published independently to a repo (at this point)
     repository: '@local'
   - name: mongo
-    version: ~2.0.0
+    version: ~3.0.0
     repository: '@local'
 
diff --git a/kubernetes/nbi/templates/deployment.yaml b/kubernetes/nbi/templates/deployment.yaml
index a7be329238..de260e3df8 100644
--- a/kubernetes/nbi/templates/deployment.yaml
+++ b/kubernetes/nbi/templates/deployment.yaml
@@ -105,7 +105,7 @@ spec:
               name: localtime
               readOnly: true
           resources:
-{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
         {{- if .Values.nodeSelector }}
         nodeSelector:
 {{ toYaml .Values.nodeSelector | indent 10 }}
diff --git a/kubernetes/nbi/values.yaml b/kubernetes/nbi/values.yaml
index 9f9c0fa476..f904b4cece 100644
--- a/kubernetes/nbi/values.yaml
+++ b/kubernetes/nbi/values.yaml
@@ -84,15 +84,21 @@ affinity: {}
 
 # probe configuration parameters
 liveness:
+  httpGet:
+    path: /nbi/api/v3/status
+    port: 8080
   initialDelaySeconds: 120
-  periodSeconds: 10
+  periodSeconds: 20
   # necessary to disable liveness probe when setting breakpoints
   # in debugger so K8s doesn't restart unresponsive container
   enabled: true
 
 readiness:
-  initialDelaySeconds: 10
-  periodSeconds: 10
+  httpGet:
+    path: /nbi/api/v3/status
+    port: 8080
+  initialDelaySeconds: 125
+  periodSeconds: 20
 
 service:
   type: NodePort
@@ -120,4 +126,5 @@ resources:
       memory: 4Gi
     requests:
       cpu: 200m
-      memory: 2Gi
-\ No newline at end of file
+      memory: 2Gi
+  unlimited: {}