Merge "[AAI] Release 14.0.1 chart with Janusgraph update to 0.6.0"

24 files changed, 140 insertions, 134 deletions

diff --git a/kubernetes/aai/Chart.yaml b/kubernetes/aai/Chart.yaml
index e8d09ce45a..05287b99d6 100644
--- a/kubernetes/aai/Chart.yaml
+++ b/kubernetes/aai/Chart.yaml
@@ -18,7 +18,7 @@
 apiVersion: v2
 description: ONAP Active and Available Inventory
 name: aai
-version: 14.0.1
+version: 14.0.2
 
 dependencies:
   - name: common
diff --git a/kubernetes/aai/components/aai-babel/Chart.yaml b/kubernetes/aai/components/aai-babel/Chart.yaml
index edf450c325..f305a2287e 100644
--- a/kubernetes/aai/components/aai-babel/Chart.yaml
+++ b/kubernetes/aai/components/aai-babel/Chart.yaml
@@ -18,7 +18,7 @@
 apiVersion: v2
 description: Babel microservice
 name: aai-babel
-version: 14.0.0
+version: 14.0.1
 
 dependencies:
   - name: common
diff --git a/kubernetes/aai/components/aai-babel/templates/deployment.yaml b/kubernetes/aai/components/aai-babel/templates/deployment.yaml
index 24d34e861c..cb40883365 100644
--- a/kubernetes/aai/components/aai-babel/templates/deployment.yaml
+++ b/kubernetes/aai/components/aai-babel/templates/deployment.yaml
@@ -23,6 +23,7 @@ metadata: {{- include "common.resourceMetadata" . | nindent 2 }}
 spec:
   selector: {{- include "common.selectors" . | nindent 4 }}
   replicas: {{ .Values.replicaCount }}
+  revisionHistoryLimit: {{ .Values.revisionHistoryLimit }}
   strategy:
     type: {{ .Values.updateStrategy.type }}
     {{- if (eq "RollingUpdate" .Values.updateStrategy.type) }}
diff --git a/kubernetes/aai/components/aai-babel/values.yaml b/kubernetes/aai/components/aai-babel/values.yaml
index 1ef70b2912..21cc72291d 100644
--- a/kubernetes/aai/components/aai-babel/values.yaml
+++ b/kubernetes/aai/components/aai-babel/values.yaml
@@ -25,7 +25,7 @@ global: {}
 #################################################################
 
 # application image
-image: onap/babel:1.13.1
+image: onap/babel:1.13.2
 
 flavor: small
 flavorOverride: small
@@ -33,6 +33,9 @@ flavorOverride: small
 # default number of instances
 replicaCount: 1
 
+# number of ReplicaSets that should be retained for the Deployment
+revisionHistoryLimit: 2
+
 updateStrategy:
   type: RollingUpdate
   maxUnavailable: 0
diff --git a/kubernetes/aai/components/aai-graphadmin/Chart.yaml b/kubernetes/aai/components/aai-graphadmin/Chart.yaml
index a17d4d2f5a..c0bcbfd074 100644
--- a/kubernetes/aai/components/aai-graphadmin/Chart.yaml
+++ b/kubernetes/aai/components/aai-graphadmin/Chart.yaml
@@ -22,7 +22,7 @@
 apiVersion: v2
 description: ONAP AAI GraphAdmin
 name: aai-graphadmin
-version: 14.0.1
+version: 14.0.2
 
 dependencies:
   - name: common
diff --git a/kubernetes/aai/components/aai-graphadmin/resources/config/janusgraph-realtime.properties b/kubernetes/aai/components/aai-graphadmin/resources/config/janusgraph-realtime.properties
index a3b902a151..72c35e6603 100644
--- a/kubernetes/aai/components/aai-graphadmin/resources/config/janusgraph-realtime.properties
+++ b/kubernetes/aai/components/aai-graphadmin/resources/config/janusgraph-realtime.properties
@@ -24,40 +24,35 @@ query.smart-limit=false
 
 storage.backend=cql
 storage.hostname={{.Values.global.cassandra.serviceName}}
-storage.cql.keyspace=aaigraph
 storage.username={{.Values.global.cassandra.username}}
 storage.password={{.Values.global.cassandra.password}}
 
+storage.cql.keyspace=aaigraph
+storage.cql.local-datacenter={{ .Values.global.cassandra.localDataCenter }}
 storage.cql.read-consistency-level=LOCAL_QUORUM
 storage.cql.write-consistency-level=LOCAL_QUORUM
 storage.cql.replication-factor={{.Values.global.cassandra.replicas}}
 storage.cql.only-use-local-consistency-for-system-operations=true
 
+{{ if .Values.global.cassandra.partitionerName }}
+storage.cql.partitioner-name={{ .Values.global.cassandra.partitionerName }}
+{{ end }}
+
+{{- if .Values.config.janusgraph.cassandraDriver }}
+storage.cql.internal.string-configuration = datastax-java-driver { {{ .Values.config.janusgraph.cassandraDriver.configuration }} }
+{{- end }}
+
 {{ else }}
 
 {{ if .Values.global.config.storage }}
 
 storage.backend={{ .Values.global.config.storage.backend }}
 
-{{ if eq .Values.global.config.storage.backend "cassandra" }}
-
-storage.hostname={{ .Values.global.config.storage.hostname }}
-storage.cassandra.keyspace={{ .Values.global.config.storage.name }}
-
-storage.cassandra.read-consistency-level={{ .Values.global.config.storage.cassandra.readConsistency }}
-storage.cassandra.write-consistency-level={{ .Values.global.config.storage.cassandra.writeConsistency }}
-storage.cassandra.replication-factor={{ .Values.global.config.storage.cassandra.replicationFactor | int }}
-storage.cassandra.astyanax.cluster-name= {{ .Values.global.config.storage.clusterName }}
-storage.cassandra.astyanax.local-datacenter= {{ .Values.global.config.storage.localDataCenter }}
-
-storage.connection-timeout={{ .Values.global.config.storage.connectionTimeout | int }}
-cache.tx-cache-size={{ .Values.global.config.storage.cacheSize | int }}
-log.tx.key-consistent={{ .Values.global.config.storage.keyConsistent }}
-
-{{ else if eq .Values.global.config.storage.backend "cql" }}
+{{ if eq .Values.global.config.storage.backend "cql" }}
 
 storage.hostname={{ .Values.global.config.storage.hostname }}
 storage.cql.keyspace={{ .Values.global.config.storage.name }}
+storage.cql.local-datacenter={{ .Values.global.config.storage.localDataCenter }}
 
 storage.cql.read-consistency-level={{ .Values.global.config.storage.cql.readConsistency }}
 storage.cql.write-consistency-level={{ .Values.global.config.storage.cql.readConsistency }}
@@ -88,7 +83,7 @@ log.tx.key-consistent={{ .Values.global.config.storage.keyConsistent }}
 
 storage.lock.wait-time=300
 # Setting db-cache to false ensure the fastest propagation of changes across servers
-cache.db-cache = false
+cache.db-cache=false
 #load graphson file on startup
 load.snapshot.file=false
 
diff --git a/kubernetes/aai/components/aai-graphadmin/templates/aai-graph-kafka-user.yml b/kubernetes/aai/components/aai-graphadmin/templates/aai-graph-kafka-user.yml
index b028df7807..4e9bf7f7ff 100644
--- a/kubernetes/aai/components/aai-graphadmin/templates/aai-graph-kafka-user.yml
+++ b/kubernetes/aai/components/aai-graphadmin/templates/aai-graph-kafka-user.yml
@@ -28,4 +28,5 @@ spec:
     - resource:
         type: topic
         name: AAI-EVENT
-      operation: All
\ No newline at end of file
+      operations:
+        - All
diff --git a/kubernetes/aai/components/aai-graphadmin/values.yaml b/kubernetes/aai/components/aai-graphadmin/values.yaml
index 1c2ef8888a..acc1ba22f7 100644
--- a/kubernetes/aai/components/aai-graphadmin/values.yaml
+++ b/kubernetes/aai/components/aai-graphadmin/values.yaml
@@ -32,6 +32,8 @@ global: # global defaults
     localCluster: false
     # flag to enable the DB creation via k8ssandra-operator
     useOperator: true
+    #Cassandra datacenter name
+    localDataCenter: dc1
   initContainers:
     enabled: true
   jobs:
@@ -44,25 +46,21 @@ global: # global defaults
     duplicates:
       enabled: false
   config:
-
     # Specifies that the cluster connected to a dynamic
     # cluster being spinned up by kubernetes deployment
     cluster:
       cassandra:
         dynamic: true
-
     # Specifies if the basic authorization is enabled
     basic:
       auth:
         enabled: true
         username: AAI
         passwd: AAI
-
     # Notification event specific properties
     notification:
       eventType: AAI-EVENT
       domain: dev
-
     # Schema specific properties that include supported versions of api
     schema:
       # Specifies if the connection should be one way ssl, two way ssl or no auth
@@ -100,13 +98,12 @@ global: # global defaults
         # Specifies from which version the edge label appeared in API
         edge:
           label: v12
-
     # Specifies which clients should always default to realtime graph connection
     realtime:
       clients: SDNC,-1|MSO,-1|SO,-1|robot-ete,-1
 
 # application image
-image: onap/aai-graphadmin:1.14.4
+image: onap/aai-graphadmin:1.14.6
 pullPolicy: Always
 restartPolicy: Always
 flavor: small
@@ -128,14 +125,11 @@ updateStrategy:
 
 # Configuration for the graphadmin deployment
 config:
-  projectHome: /opt/app/aai-graphadmin
   # Specify the profiles for the graphadmin microservice
   profiles:
     active: kafka
-    kafkaBootstrap: strimzi-kafka-bootstrap
     jaasConfExternalSecret: '{{ include "common.release" . }}-{{ .Values.global.aaiGraphKafkaUser }}'
     someConfig: graphrandom
-    aaiTopic: AAI-EVENT
   # Specifies the timeout limit for the REST API requests
   timeout:
     enabled: true
@@ -144,17 +138,17 @@ config:
     # temporarily enable this to update the graph storage version
     # see: https://docs.janusgraph.org/changelog/#upgrade-instructions_9
     allowUpgrade: true
-
-  # Default maximum records to fix for the data grooming and dupeTool
+    # config override for the cassandra driver
+    # see: https://docs.janusgraph.org/master/configs/configuration-reference/#storagecqlinternal
+    cassandraDriver:
+      configuration: advanced.metadata.schema.debouncer.window = 1 second  # Default maximum records to fix for the data grooming and dupeTool
   maxFix:
     dataGrooming: 150
     dupeTool: 25
-
   # Default number of sleep minutes for dataGrooming and dupeTool
   sleepMinutes:
     dataGrooming: 7
     dupeTool: 7
-
   # Cron specific attributes to be triggered for the graphadmin spring cron tasks
   cron:
     # Specifies that the data grooming tool which runs duplicates should be enabled
@@ -164,10 +158,8 @@ config:
     dataSnapshot:
       enabled: true
       params: JUST_TAKE_SNAPSHOT
-
     # Data cleanup which zips snapshots older than x days and deletes older than y days
     dataCleanup:
-
       dataGrooming:
         enabled: true
         # Zips up the dataGrooming files older than 5 days
@@ -190,7 +182,6 @@ config:
   debug:
     enabled: false
     args: "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005"
-
   # adds jvm args for remote profiling the application
   profiling:
     enabled: false
@@ -230,7 +221,7 @@ service:
   profilingPort: 9999
   portName3: http-graphadmin
   internalPort3: 8448
-  terminationGracePeriodSeconds: 120
+  terminationGracePeriodSeconds: 45
 
 ingress:
   enabled: false
diff --git a/kubernetes/aai/components/aai-modelloader/Chart.yaml b/kubernetes/aai/components/aai-modelloader/Chart.yaml
index b1cb8576df..5ce5902869 100644
--- a/kubernetes/aai/components/aai-modelloader/Chart.yaml
+++ b/kubernetes/aai/components/aai-modelloader/Chart.yaml
@@ -17,7 +17,7 @@
 apiVersion: v2
 description: ONAP AAI modelloader
 name: aai-modelloader
-version: 14.0.0
+version: 14.0.1
 
 dependencies:
   - name: common
diff --git a/kubernetes/aai/components/aai-modelloader/templates/deployment.yaml b/kubernetes/aai/components/aai-modelloader/templates/deployment.yaml
index 8dee92f77e..c7d7cbe2fa 100644
--- a/kubernetes/aai/components/aai-modelloader/templates/deployment.yaml
+++ b/kubernetes/aai/components/aai-modelloader/templates/deployment.yaml
@@ -35,6 +35,7 @@ metadata:
     heritage: {{ .Release.Service }}
 spec:
   replicas: {{ .Values.replicaCount }}
+  revisionHistoryLimit: {{ .Values.revisionHistoryLimit }}
   strategy:
     type: {{ .Values.updateStrategy.type }}
     {{- if (eq "RollingUpdate" .Values.updateStrategy.type) }}
diff --git a/kubernetes/aai/components/aai-modelloader/values.yaml b/kubernetes/aai/components/aai-modelloader/values.yaml
index 2d995ed6a2..14b7ccaf13 100644
--- a/kubernetes/aai/components/aai-modelloader/values.yaml
+++ b/kubernetes/aai/components/aai-modelloader/values.yaml
@@ -41,6 +41,9 @@ kafkaUser:
 # default number of instances
 replicaCount: 1
 
+# number of ReplicaSets that should be retained for the Deployment
+revisionHistoryLimit: 2
+
 updateStrategy:
   type: RollingUpdate
   maxUnavailable: 0
diff --git a/kubernetes/aai/components/aai-resources/Chart.yaml b/kubernetes/aai/components/aai-resources/Chart.yaml
index 92d5bc241f..c67329d234 100644
--- a/kubernetes/aai/components/aai-resources/Chart.yaml
+++ b/kubernetes/aai/components/aai-resources/Chart.yaml
@@ -18,7 +18,7 @@
 apiVersion: v2
 description: ONAP AAI resources
 name: aai-resources
-version: 14.0.1
+version: 14.0.2
 
 dependencies:
   - name: common
diff --git a/kubernetes/aai/components/aai-resources/resources/config/janusgraph-realtime.properties b/kubernetes/aai/components/aai-resources/resources/config/janusgraph-realtime.properties
index adc7f6a4af..36940a8921 100644
--- a/kubernetes/aai/components/aai-resources/resources/config/janusgraph-realtime.properties
+++ b/kubernetes/aai/components/aai-resources/resources/config/janusgraph-realtime.properties
@@ -15,9 +15,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ============LICENSE_END=========================================================
-#
-# ECOMP is a trademark and service mark of AT&T Intellectual Property.
-#
 */}}
 
 query.fast-property=true
@@ -27,40 +24,31 @@ query.smart-limit=false
 
 storage.backend=cql
 storage.hostname={{.Values.global.cassandra.serviceName}}
-storage.cql.keyspace=aaigraph
 storage.username={{.Values.global.cassandra.username}}
 storage.password={{.Values.global.cassandra.password}}
 
+storage.cql.keyspace=aaigraph
+storage.cql.local-datacenter={{ .Values.global.cassandra.localDataCenter }}
 storage.cql.read-consistency-level=LOCAL_QUORUM
 storage.cql.write-consistency-level=LOCAL_QUORUM
 storage.cql.replication-factor={{.Values.global.cassandra.replicas}}
 storage.cql.only-use-local-consistency-for-system-operations=true
 
+{{ if .Values.global.cassandra.partitionerName }}
+storage.cql.partitioner-name={{ .Values.global.cassandra.partitionerName }}
+{{ end }}
+
 {{ else }}
 
 {{ if .Values.global.config.storage }}
 
 storage.backend={{ .Values.global.config.storage.backend }}
 
-{{ if eq .Values.global.config.storage.backend "cassandra" }}
-
-storage.hostname={{ .Values.global.config.storage.hostname }}
-storage.cassandra.keyspace={{ .Values.global.config.storage.name }}
-
-storage.cassandra.read-consistency-level={{ .Values.global.config.storage.cassandra.readConsistency }}
-storage.cassandra.write-consistency-level={{ .Values.global.config.storage.cassandra.writeConsistency }}
-storage.cassandra.replication-factor={{ .Values.global.config.storage.cassandra.replicationFactor | int }}
-storage.cassandra.astyanax.cluster-name= {{ .Values.global.config.storage.clusterName }}
-storage.cassandra.astyanax.local-datacenter= {{ .Values.global.config.storage.localDataCenter }}
-
-storage.connection-timeout={{ .Values.global.config.storage.connectionTimeout | int }}
-cache.tx-cache-size={{ .Values.global.config.storage.cacheSize | int }}
-log.tx.key-consistent={{ .Values.global.config.storage.keyConsistent }}
-
-{{ else if eq .Values.global.config.storage.backend "cql" }}
+{{ if eq .Values.global.config.storage.backend "cql" }}
 
 storage.hostname={{ .Values.global.config.storage.hostname }}
 storage.cql.keyspace={{ .Values.global.config.storage.name }}
+storage.cql.local-datacenter={{ .Values.global.config.storage.localDataCenter }}
 
 storage.cql.read-consistency-level={{ .Values.global.config.storage.cql.readConsistency }}
 storage.cql.write-consistency-level={{ .Values.global.config.storage.cql.readConsistency }}
diff --git a/kubernetes/aai/components/aai-resources/templates/aai-kafka-user.yml b/kubernetes/aai/components/aai-resources/templates/aai-kafka-user.yml
index e4fa84a041..6b703e7cdd 100644
--- a/kubernetes/aai/components/aai-resources/templates/aai-kafka-user.yml
+++ b/kubernetes/aai/components/aai-resources/templates/aai-kafka-user.yml
@@ -28,4 +28,5 @@ spec:
     - resource:
         type: topic
         name: AAI-EVENT
-      operation: All
\ No newline at end of file
+      operations:
+        - All
diff --git a/kubernetes/aai/components/aai-resources/values.yaml b/kubernetes/aai/components/aai-resources/values.yaml
index b028829027..14ae2debbc 100644
--- a/kubernetes/aai/components/aai-resources/values.yaml
+++ b/kubernetes/aai/components/aai-resources/values.yaml
@@ -98,10 +98,6 @@ global: # global defaults
     # Specifies which clients should always default to realtime graph connection
     realtime:
       clients: SDNC,MSO,SO,robot-ete
-      kafkaBootstrap: strimzi-kafka-bootstrap
-      jaasConfExternalSecret: '{{ include "common.release" . }}-{{ .Values.global.aaiKafkaUser }}'
-      someConfig: random
-      aaiTopic: AAI-EVENT
 api_list:
   - 11
   - 12
@@ -138,7 +134,7 @@ aai_enpoints:
     url: external-system
 
 # application image
-image: onap/aai-resources:1.14.4
+image: onap/aai-resources:1.14.6
 pullPolicy: Always
 restartPolicy: Always
 flavor: small
@@ -261,7 +257,7 @@ service:
   metricsPort: 8448
   profilingPortName: jmx-9999
   profilingPort: 9999
-  terminationGracePeriodSeconds: 60
+  terminationGracePeriodSeconds: 30
   sessionAffinity: None
 
 ingress:
@@ -283,13 +279,6 @@ serviceMesh:
   # ref: http://kubernetes.io/docs/user-guide/compute-resources/
   # Minimum memory for development is 2 CPU cores and 4GB memory
   # Minimum memory for production is 4 CPU cores and 8GB memory
-#resources:
-#  limits:
-#    cpu: "2"
-#    memory: "4Gi"
-#  requests:
-#    cpu: "2"
-#    memory: "4Gi"
 resources:
   small:
     limits:
@@ -300,10 +289,10 @@ resources:
       memory: "3Gi"
   large:
     limits:
-      cpu: "4"
-      memory: "8Gi"
+      cpu: "8"
+      memory: "12Gi"
     requests:
-      cpu: "2"
+      cpu: "4"
       memory: "6Gi"
   unlimited: {}
 
diff --git a/kubernetes/aai/components/aai-schema-service/Chart.yaml b/kubernetes/aai/components/aai-schema-service/Chart.yaml
index 4d8fea753b..47064859d5 100644
--- a/kubernetes/aai/components/aai-schema-service/Chart.yaml
+++ b/kubernetes/aai/components/aai-schema-service/Chart.yaml
@@ -18,7 +18,7 @@
 apiVersion: v2
 description: ONAP AAI Schema Service
 name: aai-schema-service
-version: 14.0.0
+version: 14.0.2
 
 dependencies:
   - name: common
diff --git a/kubernetes/aai/components/aai-schema-service/templates/deployment.yaml b/kubernetes/aai/components/aai-schema-service/templates/deployment.yaml
index 0ecc2b2d80..d4041bed57 100644
--- a/kubernetes/aai/components/aai-schema-service/templates/deployment.yaml
+++ b/kubernetes/aai/components/aai-schema-service/templates/deployment.yaml
@@ -35,6 +35,7 @@ metadata:
     heritage: {{ .Release.Service }}
 spec:
   replicas: {{ .Values.replicaCount }}
+  revisionHistoryLimit: {{ .Values.revisionHistoryLimit }}
   strategy:
     type: {{ .Values.updateStrategy.type }}
     {{- if (eq "RollingUpdate" .Values.updateStrategy.type) }}
@@ -69,6 +70,14 @@ spec:
           value: {{ .Values.securityContext.user_id | quote }}
         - name: LOCAL_GROUP_ID
           value: {{ .Values.securityContext.group_id | quote }}
+        {{- if .Values.profiling.enabled }}
+        - name: PRE_JVM_ARGS
+          value: '{{ join " " .Values.profiling.args }}'
+        {{- end }}
+        {{- if .Values.debug.enabled }}
+        - name: POST_JAVA_OPTS
+          value: {{ .Values.debug.args | quote }}
+        {{- end }}
         volumeMounts:
         - mountPath: /opt/app/aai-schema-service/resources/etc/appprops/aaiconfig.properties
           name: aaiconfig-conf
@@ -88,22 +97,28 @@ spec:
           name: springapp-conf
           subPath: application.properties
         ports:
-        - containerPort: {{ .Values.service.internalPort }}
-          name: {{ .Values.service.portName }}
-        - containerPort: {{ .Values.service.internalPort2 }}
-          name: {{ .Values.service.portName2 }}
-        # disable liveness probe when breakpoints set in debugger
-        # so K8s doesn't restart unresponsive container
-        {{ if .Values.liveness.enabled }}
+        - containerPort: {{ .Values.service.appPort }}
+          name: {{ .Values.service.appPortName }}
+        {{- if .Values.debug.enabled }}
+        - containerPort: {{ .Values.service.debugPort }}
+          name: {{ .Values.service.debugPortName }}
+        {{- end }}
+        {{- if .Values.profiling.enabled }}
+        - containerPort: {{ .Values.service.profilingPort }}
+          name: {{ .Values.service.profilingPortName }}
+        {{- end }}
+        # disable liveness probe when
+        # debugging.enabled=true or profiling.enabled=true
+        {{- if and .Values.liveness.enabled (not (or .Values.debug.enabled .Values.profiling.enabled)) }}
         livenessProbe:
           tcpSocket:
-            port: {{ .Values.service.internalPort }}
+            port: {{ .Values.service.appPort }}
           initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }}
           periodSeconds: {{ .Values.liveness.periodSeconds }}
         {{ end }}
         readinessProbe:
           tcpSocket:
-            port: {{ .Values.service.internalPort }}
+            port: {{ .Values.service.appPort }}
           initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
           periodSeconds: {{ .Values.readiness.periodSeconds }}
         resources: {{ include "common.resources" . | nindent 10 }}
diff --git a/kubernetes/aai/components/aai-schema-service/templates/service.yaml b/kubernetes/aai/components/aai-schema-service/templates/service.yaml
index 79f01d6638..412b62c6fe 100644
--- a/kubernetes/aai/components/aai-schema-service/templates/service.yaml
+++ b/kubernetes/aai/components/aai-schema-service/templates/service.yaml
@@ -29,21 +29,21 @@ spec:
   type: {{ .Values.service.type }}
   ports:
   {{if eq .Values.service.type "NodePort" -}}
-  - port: {{ .Values.service.internalPort }}
+  - port: {{ .Values.service.appPort }}
     nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }}
-    name: {{ .Values.service.portName }}
-    targetPort: {{ .Values.service.portName }}
-  - port: {{ .Values.service.internalPort2 }}
+    name: {{ .Values.service.appPortName }}
+    targetPort: {{ .Values.service.appPortName }}
+  - port: {{ .Values.service.debugPort }}
     nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort2 }}
-    name: {{ .Values.service.portName2 }}
-    targetPort: {{ .Values.service.portName2 }}
+    name: {{ .Values.service.debugPortName }}
+    targetPort: {{ .Values.service.debugPortName }}
   {{- else -}}
-  - port: {{ .Values.service.internalPort }}
-    name: {{ .Values.service.portName }}
-    targetPort: {{ .Values.service.portName }}
-  - port: {{ .Values.service.internalPort2 }}
-    name: {{ .Values.service.portName2 }}
-    targetPort: {{ .Values.service.portName2 }}
+  - port: {{ .Values.service.appPort }}
+    name: {{ .Values.service.appPortName }}
+    targetPort: {{ .Values.service.appPortName }}
+  - port: {{ .Values.service.debugPort }}
+    name: {{ .Values.service.debugPortName }}
+    targetPort: {{ .Values.service.debugPortName }}
   {{- end }}
   selector:
     app: {{ include "common.name" . }}
diff --git a/kubernetes/aai/components/aai-schema-service/values.yaml b/kubernetes/aai/components/aai-schema-service/values.yaml
index d55be5369c..12dfaea091 100644
--- a/kubernetes/aai/components/aai-schema-service/values.yaml
+++ b/kubernetes/aai/components/aai-schema-service/values.yaml
@@ -60,13 +60,33 @@ global: # global defaults
           label: v12
 
 # application image
-image: onap/aai-schema-service:1.12.4
+image: onap/aai-schema-service:1.12.5
 pullPolicy: Always
 restartPolicy: Always
 flavorOverride: small
 # default number of instances
 replicaCount: 1
 
+# adds jvm args for remote debugging the application
+debug:
+  enabled: false
+  args: "-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005"
+
+# adds jvm args for remote profiling the application
+profiling:
+  enabled: false
+  args:
+    - "-Dcom.sun.management.jmxremote"
+    - "-Dcom.sun.management.jmxremote.ssl=false"
+    - "-Dcom.sun.management.jmxremote.authenticate=false"
+    - "-Dcom.sun.management.jmxremote.local.only=false"
+    - "-Dcom.sun.management.jmxremote.port=9999"
+    - "-Dcom.sun.management.jmxremote.rmi.port=9999"
+    - "-Djava.rmi.server.hostname=127.0.0.1"
+
+# number of ReplicaSets that should be retained for the Deployment
+revisionHistoryLimit: 2
+
 updateStrategy:
   type: RollingUpdate
   maxUnavailable: 0
@@ -90,10 +110,12 @@ readiness:
 
 service:
   type: ClusterIP
-  portName: http
-  internalPort: 8452
-  portName2: tcp-5005
-  internalPort2: 5005
+  appPortName: http
+  appPort: 8452
+  debugPortName: tcp-5005
+  debugPort: 5005
+  profilingPortName: jmx-9999
+  profilingPort: 9999
 
 ingress:
   enabled: false
diff --git a/kubernetes/aai/components/aai-traversal/Chart.yaml b/kubernetes/aai/components/aai-traversal/Chart.yaml
index 6cf42288f3..3b2d8b819e 100644
--- a/kubernetes/aai/components/aai-traversal/Chart.yaml
+++ b/kubernetes/aai/components/aai-traversal/Chart.yaml
@@ -17,7 +17,7 @@
 apiVersion: v2
 description: ONAP AAI traversal
 name: aai-traversal
-version: 14.0.1
+version: 14.0.2
 
 dependencies:
   - name: common
diff --git a/kubernetes/aai/components/aai-traversal/resources/config/janusgraph-realtime.properties b/kubernetes/aai/components/aai-traversal/resources/config/janusgraph-realtime.properties
index adc7f6a4af..36940a8921 100644
--- a/kubernetes/aai/components/aai-traversal/resources/config/janusgraph-realtime.properties
+++ b/kubernetes/aai/components/aai-traversal/resources/config/janusgraph-realtime.properties
@@ -15,9 +15,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 # ============LICENSE_END=========================================================
-#
-# ECOMP is a trademark and service mark of AT&T Intellectual Property.
-#
 */}}
 
 query.fast-property=true
@@ -27,40 +24,31 @@ query.smart-limit=false
 
 storage.backend=cql
 storage.hostname={{.Values.global.cassandra.serviceName}}
-storage.cql.keyspace=aaigraph
 storage.username={{.Values.global.cassandra.username}}
 storage.password={{.Values.global.cassandra.password}}
 
+storage.cql.keyspace=aaigraph
+storage.cql.local-datacenter={{ .Values.global.cassandra.localDataCenter }}
 storage.cql.read-consistency-level=LOCAL_QUORUM
 storage.cql.write-consistency-level=LOCAL_QUORUM
 storage.cql.replication-factor={{.Values.global.cassandra.replicas}}
 storage.cql.only-use-local-consistency-for-system-operations=true
 
+{{ if .Values.global.cassandra.partitionerName }}
+storage.cql.partitioner-name={{ .Values.global.cassandra.partitionerName }}
+{{ end }}
+
 {{ else }}
 
 {{ if .Values.global.config.storage }}
 
 storage.backend={{ .Values.global.config.storage.backend }}
 
-{{ if eq .Values.global.config.storage.backend "cassandra" }}
-
-storage.hostname={{ .Values.global.config.storage.hostname }}
-storage.cassandra.keyspace={{ .Values.global.config.storage.name }}
-
-storage.cassandra.read-consistency-level={{ .Values.global.config.storage.cassandra.readConsistency }}
-storage.cassandra.write-consistency-level={{ .Values.global.config.storage.cassandra.writeConsistency }}
-storage.cassandra.replication-factor={{ .Values.global.config.storage.cassandra.replicationFactor | int }}
-storage.cassandra.astyanax.cluster-name= {{ .Values.global.config.storage.clusterName }}
-storage.cassandra.astyanax.local-datacenter= {{ .Values.global.config.storage.localDataCenter }}
-
-storage.connection-timeout={{ .Values.global.config.storage.connectionTimeout | int }}
-cache.tx-cache-size={{ .Values.global.config.storage.cacheSize | int }}
-log.tx.key-consistent={{ .Values.global.config.storage.keyConsistent }}
-
-{{ else if eq .Values.global.config.storage.backend "cql" }}
+{{ if eq .Values.global.config.storage.backend "cql" }}
 
 storage.hostname={{ .Values.global.config.storage.hostname }}
 storage.cql.keyspace={{ .Values.global.config.storage.name }}
+storage.cql.local-datacenter={{ .Values.global.config.storage.localDataCenter }}
 
 storage.cql.read-consistency-level={{ .Values.global.config.storage.cql.readConsistency }}
 storage.cql.write-consistency-level={{ .Values.global.config.storage.cql.readConsistency }}
diff --git a/kubernetes/aai/components/aai-traversal/templates/aai-trav-kafka-user.yml b/kubernetes/aai/components/aai-traversal/templates/aai-trav-kafka-user.yml
index 1754227d7f..7c6a252315 100644
--- a/kubernetes/aai/components/aai-traversal/templates/aai-trav-kafka-user.yml
+++ b/kubernetes/aai/components/aai-traversal/templates/aai-trav-kafka-user.yml
@@ -28,4 +28,5 @@ spec:
     - resource:
         type: topic
         name: AAI-EVENT
-      operation: All
\ No newline at end of file
+      operations:
+        - All
diff --git a/kubernetes/aai/components/aai-traversal/values.yaml b/kubernetes/aai/components/aai-traversal/values.yaml
index c75bb8f569..036a3c96f2 100644
--- a/kubernetes/aai/components/aai-traversal/values.yaml
+++ b/kubernetes/aai/components/aai-traversal/values.yaml
@@ -22,12 +22,12 @@ global: # global defaults
   nodePortPrefix: 302
   kafkaBootstrap: strimzi-kafka-bootstrap
   aaiTravKafkaUser: aai-trav-kafka-user
-
   cassandra:
     #Service Name of the cassandra cluster to connect to.
     #Override it to aai-cassandra if localCluster is enabled.
     serviceName: cassandra
-
+    # Cassandra datacenter name
+    localDataCenter: dc1
   # Specifies a list of jobs to be run
   jobs:
     # When enabled, it will create the schema based on oxm and edge rules
@@ -107,13 +107,11 @@ global: # global defaults
     # Specifies which clients should always default to realtime graph connection
     realtime:
       clients: SDNC,MSO,SO,robot-ete
-    kafkaBootstrap: strimzi-kafka-bootstrap
     jaasConfExternalSecret: '{{ include "common.release" . }}-{{ .Values.global.aaiTravKafkaUser }}'
     someConfig: random
-    aaiTopic: AAI-EVENT
 
 # application image
-image: onap/aai-traversal:1.14.4
+image: onap/aai-traversal:1.14.6
 pullPolicy: Always
 restartPolicy: Always
 flavor: small
@@ -279,7 +277,7 @@ service:
   metricsPort: 8448
   profilingPortName: jmx-9999
   profilingPort: 9999
-  terminationGracePeriodSeconds: 60
+  terminationGracePeriodSeconds: 30
   sessionAffinity: None
 
 ingress:
diff --git a/kubernetes/aai/values.yaml b/kubernetes/aai/values.yaml
index d2f81a9717..8607e58f60 100644
--- a/kubernetes/aai/values.yaml
+++ b/kubernetes/aai/values.yaml
@@ -64,6 +64,15 @@ global: # global defaults
     username: cassandra
     password: cassandra
 
+    #Cassandra datacenter name
+    localDataCenter: dc1
+
+    # The name of Cassandra cluster's partitioner.
+    # It will be retrieved by client if not provided.
+    # See storage.cql.partitioner-name in https://docs.janusgraph.org/v0.6/configs/configuration-reference/#storagecql
+    partitionerName: org.apache.cassandra.dht.Murmur3Partitioner
+
+
   aai:
     serviceName: aai
   babel: