3 files changed, 5 insertions, 4 deletions
diff --git a/kubernetes/aai/charts/aai-resources/Chart.yaml b/kubernetes/aai/charts/aai-resources/Chart.yaml
index bbb845da97..2954c7f077 100644
--- a/kubernetes/aai/charts/aai-resources/Chart.yaml
+++ b/kubernetes/aai/charts/aai-resources/Chart.yaml
@@ -16,4 +16,4 @@
 apiVersion: v1
 description: ONAP AAI resources
 name: aai-resources
-version: 2.0.0
+version: 3.0.0
diff --git a/kubernetes/aai/charts/aai-resources/templates/deployment.yaml b/kubernetes/aai/charts/aai-resources/templates/deployment.yaml
index 065e1307dd..04549dfb94 100644
--- a/kubernetes/aai/charts/aai-resources/templates/deployment.yaml
+++ b/kubernetes/aai/charts/aai-resources/templates/deployment.yaml
@@ -520,7 +520,7 @@ spec:
           initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
           periodSeconds: {{ .Values.readiness.periodSeconds }}
         resources:
-{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }}
+{{ include "common.resources" . | indent 12 }}
       {{- if .Values.nodeSelector }}
       nodeSelector:
 {{ toYaml .Values.nodeSelector | indent 8 }}
diff --git a/kubernetes/aai/charts/aai-resources/values.yaml b/kubernetes/aai/charts/aai-resources/values.yaml
index e9a0063f6a..8e50ba0421 100644
--- a/kubernetes/aai/charts/aai-resources/values.yaml
+++ b/kubernetes/aai/charts/aai-resources/values.yaml
@@ -35,10 +35,10 @@ config:
   # Specifies crud related operation timeouts and overrides
   crud:
     timeout:
-      # Specifies if the timeout for REST GET calls should be enabled 
+      # Specifies if the timeout for REST GET calls should be enabled
       enabled: true
       # Specifies the timeout values for application specific
-      # Its a pipe seperated list where each element before comma represents 
+      # Its a pipe seperated list where each element before comma represents
       # the X-FromAppId and the comma after specifies the timeout limit in ms
       # If the timeout limit is -1 then it means for these apps no timeout
       appspecific: JUNITTESTAPP1,1|JUNITTESTAPP2,-1|DCAE-CCS,-1|DCAES,-1|AAIRctFeed,-1|NewvceCreator,-1|IANewvceCreator,-1|AAI-CSIOVALS,-1
@@ -111,3 +111,4 @@ resources:
     requests:
       cpu: 4
       memory: 8Gi
+  unlimited: {}