[AAI] 15.0.2 release

- [resources,traversal,graphadmin] use 1.15.4 image version
- [resources,traversal,graphadmin] fix liveness probe
- [all] make annotations configurable
- [all] disable janusgraph warning log line on each liveness probe
- [all] disable tracing by default since jaeger is not included in the deployment by default
- [all] use 6.1.0 readiness image with shorter check intervals
- [graphadmin] wait for cassandra before running the schema-creation init container

Issue-ID: AAI-4124
Change-Id: Ib1d592c1fc1e3cfb3fe26b238ec2ad6c200ef2e1
Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>

27 files changed, 94 insertions, 158 deletions

diff --git a/kubernetes/aai/Chart.yaml b/kubernetes/aai/Chart.yaml
index 77078332c9..e9dac7a47f 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: 15.0.1
+version: 15.0.2
 
 dependencies:
   - name: common
diff --git a/kubernetes/aai/components/aai-babel/Chart.yaml b/kubernetes/aai/components/aai-babel/Chart.yaml
index 2d0a78bde4..376a7dd0f3 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: 15.0.1
+version: 15.0.2
 
 dependencies:
   - name: common
diff --git a/kubernetes/aai/components/aai-babel/resources/config/application.properties b/kubernetes/aai/components/aai-babel/resources/config/application.properties
index b28a4e7c6c..bc1a06d105 100644
--- a/kubernetes/aai/components/aai-babel/resources/config/application.properties
+++ b/kubernetes/aai/components/aai-babel/resources/config/application.properties
@@ -25,7 +25,7 @@ logging.config=${CONFIG_HOME}/logback.xml
 tosca.mappings.config=${CONFIG_HOME}/tosca-mappings.json
 
 spring.application.name=aai-babel
-spring.sleuth.enabled=true
+spring.sleuth.enabled={{ .Values.tracing.enabled }}
 spring.zipkin.baseUrl={{ .Values.tracing.collector.baseUrl }}
 spring.sleuth.messaging.jms.enabled = false
 spring.sleuth.trace-id128=true
diff --git a/kubernetes/aai/components/aai-babel/templates/deployment.yaml b/kubernetes/aai/components/aai-babel/templates/deployment.yaml
index 782ed1226c..57f770b845 100644
--- a/kubernetes/aai/components/aai-babel/templates/deployment.yaml
+++ b/kubernetes/aai/components/aai-babel/templates/deployment.yaml
@@ -19,7 +19,7 @@
 
 apiVersion: apps/v1
 kind: Deployment
-metadata: {{- include "common.resourceMetadata" . | nindent 2 }}
+metadata: {{- include "common.resourceMetadata" (dict "annotations" .Values.annotations "dot" .) | nindent 2 }}
 spec:
   selector: {{- include "common.selectors" . | nindent 4 }}
   {{- if .Values.debug.enabled }}
diff --git a/kubernetes/aai/components/aai-babel/values.yaml b/kubernetes/aai/components/aai-babel/values.yaml
index 2a57bb23cc..ad2c37ebf5 100644
--- a/kubernetes/aai/components/aai-babel/values.yaml
+++ b/kubernetes/aai/components/aai-babel/values.yaml
@@ -33,7 +33,7 @@ flavor: small
 replicaCount: 1
 
 # number of ReplicaSets that should be retained for the Deployment
-revisionHistoryLimit: 2
+revisionHistoryLimit: 1
 
 updateStrategy:
   type: RollingUpdate
@@ -84,20 +84,21 @@ resources:
   small:
     limits:
       cpu: "1"
-      memory: "3Gi"
+      memory: "2500Mi"
     requests:
-      cpu: "200m"
+      cpu: "100m"
       memory: "1Gi"
   large:
     limits:
       cpu: "4"
-      memory: "6Gi"
+      memory: "4Gi"
     requests:
       cpu: "1"
-      memory: "2Gi"
+      memory: "1Gi"
   unlimited: {}
 
 tracing:
+  enabled: false
   collector:
     baseUrl: http://jaeger-collector.istio-system:9411
   sampling:
diff --git a/kubernetes/aai/components/aai-graphadmin/Chart.yaml b/kubernetes/aai/components/aai-graphadmin/Chart.yaml
index 13315415f2..4a7df8e94b 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: 15.0.1
+version: 15.0.2
 
 dependencies:
   - name: common
diff --git a/kubernetes/aai/components/aai-graphadmin/resources/config/application.properties b/kubernetes/aai/components/aai-graphadmin/resources/config/application.properties
index cc6b5677c5..3d86cf4dc6 100644
--- a/kubernetes/aai/components/aai-graphadmin/resources/config/application.properties
+++ b/kubernetes/aai/components/aai-graphadmin/resources/config/application.properties
@@ -119,3 +119,5 @@ management.security.enabled=false
 # This does the same as the /echo endpoint,
 # but doesn't show up in micrometer metrics
 aai.actuator.echo.enabled={{ .Values.actuator.echo.enabled }}
+
+aai.graph.properties.path=${server.local.startpath}/etc/appprops/janusgraph-realtime.properties
diff --git a/kubernetes/aai/components/aai-graphadmin/resources/config/logback.xml b/kubernetes/aai/components/aai-graphadmin/resources/config/logback.xml
index 5825a722ae..55ed90daf5 100644
--- a/kubernetes/aai/components/aai-graphadmin/resources/config/logback.xml
+++ b/kubernetes/aai/components/aai-graphadmin/resources/config/logback.xml
@@ -1171,6 +1171,7 @@
   <logger name="org.zookeeper" level="WARN"/>
   <logger name="com.netflix" level="WARN"/>
   <logger name="org.janusgraph" level="WARN"/>
+  <logger name="org.janusgraph.graphdb.transaction" level="ERROR" />
   <logger name="com.att.aft.dme2" level="WARN"/>
   <!-- ============================================================================ -->
   <!-- General EELF logger -->
diff --git a/kubernetes/aai/components/aai-graphadmin/templates/deployment.yaml b/kubernetes/aai/components/aai-graphadmin/templates/deployment.yaml
index 991727d7c6..31566fc939 100644
--- a/kubernetes/aai/components/aai-graphadmin/templates/deployment.yaml
+++ b/kubernetes/aai/components/aai-graphadmin/templates/deployment.yaml
@@ -23,7 +23,7 @@
 */}}
 apiVersion: apps/v1
 kind: Deployment
-metadata: {{- include "common.resourceMetadata" . | nindent 2 }}
+metadata: {{- include "common.resourceMetadata" (dict "annotations" .Values.annotations "dot" .) | nindent 2 }}
 spec:
   {{- if .Values.config.debug.enabled }}
   replicas: 1
@@ -47,7 +47,7 @@ spec:
       terminationGracePeriodSeconds: {{ .Values.service.terminationGracePeriodSeconds }}
       {{- if .Values.global.initContainers.enabled }}
       initContainers:
-      {{ include "common.readinessCheck.waitFor" (dict "dot" . "wait_for" .Values.readinessCheck.waitForWithCreateSchemaDisabled ) | indent 6 | trim}}
+      {{ include "common.readinessCheck.waitFor" (dict "dot" . "wait_for" .Values.readinessCheck.waitForWithCreateSchemaDisabled ) | indent 6 | trim }}
       {{- end }}
       {{ include "common.podSecurityContext" . | indent 6 | trim }}
       containers:
@@ -62,13 +62,6 @@ spec:
           value: {{ $value | quote}}
         {{- end }}
         {{- end }}
-        {{- if eq .Values.flavor "small" }}
-        - name: MAX_HEAP_SIZE
-          value: {{ .Values.small.maxHeapSize | quote }}
-        {{- else if eq .Values.flavor "large" }}
-        - name: MAX_HEAP_SIZE
-          value: {{ .Values.large.maxHeapSize | quote }}
-        {{- end }}
         - name: INTERNAL_PORT_1
           value: {{ .Values.service.appPort | quote }}
         - name: INTERNAL_PORT_2
@@ -170,13 +163,12 @@ spec:
         resources: {{ include "common.resources" . | nindent 10 }}
       {{- if .Values.nodeSelector }}
       nodeSelector:
-{{ toYaml .Values.nodeSelector | indent 8 }}
+      {{ toYaml .Values.nodeSelector | indent 8 }}
       {{- end -}}
       {{- if .Values.affinity }}
       affinity:
-{{ toYaml .Values.affinity | indent 8 }}
+      {{ toYaml .Values.affinity | indent 8 }}
       {{- end }}
-
       # side car containers
       {{ include "common.log.sidecar" . | nindent 6 }}
       serviceAccountName: {{ include "common.fullname" (dict "suffix" "read" "dot" . )}}
diff --git a/kubernetes/aai/components/aai-graphadmin/templates/job-copy-db-backup.yaml b/kubernetes/aai/components/aai-graphadmin/templates/job-copy-db-backup.yaml
index 1cc431c94f..6366e0626b 100644
--- a/kubernetes/aai/components/aai-graphadmin/templates/job-copy-db-backup.yaml
+++ b/kubernetes/aai/components/aai-graphadmin/templates/job-copy-db-backup.yaml
@@ -42,10 +42,9 @@ metadata:
   name: {{ include "common.fullname" . }}-db-backup
   namespace: {{ include "common.namespace" . }}
   labels: {{- include "common.labels" (dict "labels" .Values.labels "ignoreHelmChart" .Values.ignoreHelmChart "dot" . "suffix" "job") | nindent 4 }}
-  annotations:
-    "helm.sh/hook": pre-upgrade,pre-install
-    "helm.sh/hook-weight": "2"
-    "helm.sh/hook-delete-policy": before-hook-creation
+  {{- if .Values.jobAnnotations.backup }}
+  annotations:  {{- include "common.tplValue" (dict "value" .Values.jobAnnotations.backup "context" $) | nindent 4 }}
+  {{- end }}
 spec:
   backoffLimit: 20
   template:
diff --git a/kubernetes/aai/components/aai-graphadmin/templates/job-create-db.yaml b/kubernetes/aai/components/aai-graphadmin/templates/job-create-db.yaml
index 19e62ae7c4..6c57680724 100644
--- a/kubernetes/aai/components/aai-graphadmin/templates/job-create-db.yaml
+++ b/kubernetes/aai/components/aai-graphadmin/templates/job-create-db.yaml
@@ -41,6 +41,9 @@ metadata:
   name: {{ include "common.fullname" . }}-create-db-schema
   namespace: {{ include "common.namespace" . }}
   labels: {{- include "common.labels" (dict "labels" .Values.labels "ignoreHelmChart" .Values.ignoreHelmChart "dot" . "suffix" "job") | nindent 4 }}
+  {{- if .Values.jobAnnotations.createDBSchema }}
+  annotations:  {{- include "common.tplValue" (dict "value" .Values.jobAnnotations.createDBSchema "context" $) | nindent 4 }}
+  {{- end }}
 spec:
   backoffLimit: 20
   template:
@@ -55,7 +58,7 @@ spec:
       - name: {{ include "common.name" . }}-job
         image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
         imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
-        {{ include "common.containerSecurityContext" . | indent 8 | trim }}
+        {{ include "common.containerSecurityContext" . | nindent 8 | trim }}
         command:
         - sh
         args:
@@ -81,8 +84,8 @@ spec:
             secretKeyRef:
               name: {{ include "common.release" . }}-{{ .Values.global.aaiGraphKafkaUser }}
               key: sasl.jaas.config
-        ports:
         {{- if .Values.config.debug.enabled }}
+        ports:
         - containerPort: {{ .Values.service.debugPort }}
           name: {{ .Values.service.debugPortName }}
         {{- end }}
@@ -125,4 +128,4 @@ spec:
           name: {{ include "common.fullname" . }}-properties
       restartPolicy: Never
       {{- include "common.imagePullSecrets" . | nindent 6 }}
-{{ end }}
+{{- end }}
diff --git a/kubernetes/aai/components/aai-graphadmin/templates/job-migration.yaml b/kubernetes/aai/components/aai-graphadmin/templates/job-migration.yaml
index f6f2f8b1a7..fcfb479965 100644
--- a/kubernetes/aai/components/aai-graphadmin/templates/job-migration.yaml
+++ b/kubernetes/aai/components/aai-graphadmin/templates/job-migration.yaml
@@ -42,10 +42,9 @@ metadata:
   name: {{ include "common.fullname" . }}-migration
   namespace: {{ include "common.namespace" . }}
   labels: {{- include "common.labels" (dict "labels" .Values.labels "ignoreHelmChart" .Values.ignoreHelmChart "dot" . "suffix" "job") | nindent 4 }}
-  annotations:
-    "helm.sh/hook": post-upgrade,post-rollback,post-install
-    "helm.sh/hook-weight": "1"
-    "helm.sh/hook-delete-policy": before-hook-creation
+  {{- if .Values.jobAnnotations.migration }}
+  annotations:  {{- include "common.tplValue" (dict "value" .Values.jobAnnotations.migration "context" $) | nindent 4 }}
+  {{- end }}
 spec:
   backoffLimit: 20
   template:
diff --git a/kubernetes/aai/components/aai-graphadmin/values.yaml b/kubernetes/aai/components/aai-graphadmin/values.yaml
index a2727757cf..8d261cf631 100644
--- a/kubernetes/aai/components/aai-graphadmin/values.yaml
+++ b/kubernetes/aai/components/aai-graphadmin/values.yaml
@@ -103,7 +103,7 @@ global: # global defaults
       clients: SDNC,-1|MSO,-1|SO,-1|robot-ete,-1
 
 # application image
-image: onap/aai-graphadmin:1.15.2
+image: onap/aai-graphadmin:1.15.4
 pullPolicy: Always
 restartPolicy: Always
 flavor: small
@@ -112,7 +112,7 @@ flavor: small
 replicaCount: 1
 
 # number of ReplicaSets that should be retained for the Deployment
-revisionHistoryLimit: 2
+revisionHistoryLimit: 1
 
 # the minimum number of seconds that a newly created Pod should be ready
 minReadySeconds: 30
@@ -196,7 +196,8 @@ config:
       - "-Djava.rmi.server.hostname=127.0.0.1"
   env:
     BOOTSTRAP_SERVERS: onap-strimzi-kafka-bootstrap:9092
-
+    DATA_SNAPSHOT_TASKS_ENABLED: false
+    DATA_SNAPSHOT_CLEANUP_ENABLED: false
 
 nodeSelector: {}
 
@@ -205,7 +206,7 @@ affinity: {}
 # probe configuration parameters
 liveness:
   enabled: true
-  path: /actuator/health/liveness
+  path: /actuator/health
   periodSeconds: 10
 
 readiness:
@@ -319,13 +320,6 @@ resources:
       memory: "4Gi"
   unlimited: {}
 
-# define the heap size for the JVM
-# according to the resource flavor
-small:
-  maxHeapSize: "1g"
-large:
-  maxHeapSize: "5g"
-
 metrics:
   serviceMonitor:
     enabled: true
@@ -394,3 +388,13 @@ volumes:
 
 podAnnotations:
   checksum/config: '{{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}'
+
+jobAnnotations:
+  backup:
+    "helm.sh/hook": pre-upgrade,pre-rollback,post-install
+    "helm.sh/hook-weight": "2"
+    "helm.sh/hook-delete-policy": before-hook-creation
+  migration:
+    "helm.sh/hook": pre-upgrade,pre-rollback,post-install
+    "helm.sh/hook-weight": "2"
+    "helm.sh/hook-delete-policy": before-hook-creation
diff --git a/kubernetes/aai/components/aai-modelloader/values.yaml b/kubernetes/aai/components/aai-modelloader/values.yaml
index 6c8cdb7d31..eae505458e 100644
--- a/kubernetes/aai/components/aai-modelloader/values.yaml
+++ b/kubernetes/aai/components/aai-modelloader/values.yaml
@@ -109,7 +109,7 @@ resources:
   unlimited: {}
 
 tracing:
-  enabled: true
+  enabled: false
   collector:
     baseUrl: http://jaeger-collector.istio-system:9411
   sampling:
diff --git a/kubernetes/aai/components/aai-resources/Chart.yaml b/kubernetes/aai/components/aai-resources/Chart.yaml
index c83a28671c..44b54bc3d3 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: 15.0.1
+version: 15.0.2
 
 dependencies:
   - name: common
@@ -32,4 +32,4 @@ dependencies:
     repository: '@local'
   - name: readinessCheck
     version: ~13.x-0
-    repository: '@local'
\ No newline at end of file
+    repository: '@local'
diff --git a/kubernetes/aai/components/aai-resources/resources/config/application.properties b/kubernetes/aai/components/aai-resources/resources/config/application.properties
index eae146b845..cde0261b6c 100644
--- a/kubernetes/aai/components/aai-resources/resources/config/application.properties
+++ b/kubernetes/aai/components/aai-resources/resources/config/application.properties
@@ -28,6 +28,7 @@ spring.jersey.type=filter
 spring.main.allow-bean-definition-overriding=true
 server.servlet.context-path=/
 
+spring.sleuth.enabled={{ .Values.tracing.enabled }}
 spring.zipkin.baseUrl={{ .Values.tracing.collector.baseUrl }}
 spring.sleuth.messaging.jms.enabled = false
 spring.sleuth.trace-id128=true
@@ -125,3 +126,4 @@ scrape.uri.metrics=false
 # This does the same as the /echo endpoint,
 # but doesn't show up in micrometer metrics
 aai.actuator.echo.enabled={{ .Values.actuator.echo.enabled }}
+aai.graph.properties.path=${server.local.startpath}/etc/appprops/janusgraph-realtime.properties
diff --git a/kubernetes/aai/components/aai-resources/resources/config/logback.xml b/kubernetes/aai/components/aai-resources/resources/config/logback.xml
index a90f354cbe..c458fb8eae 100644
--- a/kubernetes/aai/components/aai-resources/resources/config/logback.xml
+++ b/kubernetes/aai/components/aai-resources/resources/config/logback.xml
@@ -360,6 +360,7 @@
   <logger name="org.springframework.beans" level="WARN" />
   <logger name="org.springframework.web" level="WARN" />
   <logger name="org.janusgraph" level="WARN" />
+  <logger name="org.janusgraph.graphdb.transaction" level="ERROR" />
   <logger name="org.zookeeper" level="OFF" />
 
 
diff --git a/kubernetes/aai/components/aai-resources/templates/deployment.yaml b/kubernetes/aai/components/aai-resources/templates/deployment.yaml
index cb434ed2cd..01faacbb75 100644
--- a/kubernetes/aai/components/aai-resources/templates/deployment.yaml
+++ b/kubernetes/aai/components/aai-resources/templates/deployment.yaml
@@ -20,7 +20,7 @@
 
 apiVersion: apps/v1
 kind: Deployment
-metadata: {{- include "common.resourceMetadata" . | nindent 2 }}
+metadata: {{- include "common.resourceMetadata" (dict "annotations" .Values.annotations "dot" .) | nindent 2 }}
 spec:
   {{- if or .Values.config.debug.enabled .Values.config.profiling.enabled }}
   replicas: 1
@@ -41,36 +41,6 @@ spec:
       app: {{ include "common.name" . }}
   template:
     metadata: {{- include "common.templateMetadata" . | nindent 6 }}
-      {{- if .Values.global.msbEnabled }}
-        {{ $values := .Values }}
-        msb.onap.org/service-info: '[
-        {{- range $api_endpoint := $values.aai_enpoints -}}
-          {{- range $api_version := $values.api_list }}
-          {
-              "serviceName": "_{{ $api_endpoint.name }}",
-              "version": "v{{ $api_version }}",
-              "url": "/aai/v{{ $api_version }}/{{ $api_endpoint.url }}",
-              "protocol": "REST",
-              "port": "8447",
-              "enable_ssl": true,
-              "lb_policy":"ip_hash",
-              "visualRange": "1",
-              "path": "/aai/v{{ $api_version }}/{{ $api_endpoint.url }}"
-          },
-          {
-              "serviceName": "{{ $api_endpoint.name }}",
-              "version": "v{{ $api_version }}",
-              "url": "/aai/v{{ $api_version }}/{{ $api_endpoint.url }}",
-              "protocol": "REST",
-              "port": "8447",
-              "enable_ssl": true,
-              "lb_policy":"ip_hash",
-              "visualRange": "1"
-          },
-          {{- end }}
-        {{- end }}
-          ]'
-      {{- end }}
     spec:
       hostname: aai-resources
       terminationGracePeriodSeconds: {{ .Values.service.terminationGracePeriodSeconds }}
@@ -178,6 +148,7 @@ spec:
           initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }}
           {{- end }}
           periodSeconds: {{ .Values.liveness.periodSeconds }}
+          timeoutSeconds: {{ .Values.liveness.timeoutSeconds }}
         {{- end }}
         readinessProbe:
           httpGet:
@@ -187,12 +158,14 @@ spec:
           initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
           {{- end }}
           periodSeconds: {{ .Values.readiness.periodSeconds }}
+          timeoutSeconds: {{ .Values.readiness.timeoutSeconds }}
         startupProbe:
           httpGet:
             port: {{ .Values.service.metricsPort }}
             path: {{ .Values.startup.path }}
           failureThreshold: {{ .Values.startup.failureThreshold }}
           periodSeconds: {{ .Values.startup.periodSeconds }}
+          timeoutSeconds: {{ .Values.startup.timeoutSeconds }}
         resources: {{ include "common.resources" . | nindent 10 }}
       {{- if .Values.nodeSelector }}
       nodeSelector: {{ toYaml .Values.nodeSelector | nindent 8 }}
diff --git a/kubernetes/aai/components/aai-resources/templates/servicemonitor.yaml b/kubernetes/aai/components/aai-resources/templates/servicemonitor.yaml
index c0d9f212b4..dc706029bf 100644
--- a/kubernetes/aai/components/aai-resources/templates/servicemonitor.yaml
+++ b/kubernetes/aai/components/aai-resources/templates/servicemonitor.yaml
@@ -1,3 +1,3 @@
 {{- if .Values.metrics.serviceMonitor.enabled }}
 {{  include "common.serviceMonitor" . }}
-{{- end }}
\ No newline at end of file
+{{- end }}
diff --git a/kubernetes/aai/components/aai-resources/values.yaml b/kubernetes/aai/components/aai-resources/values.yaml
index 7cba7a425e..9c7dea82ab 100644
--- a/kubernetes/aai/components/aai-resources/values.yaml
+++ b/kubernetes/aai/components/aai-resources/values.yaml
@@ -134,7 +134,7 @@ aai_enpoints:
     url: external-system
 
 # application image
-image: onap/aai-resources:1.15.2
+image: onap/aai-resources:1.15.4
 pullPolicy: Always
 restartPolicy: Always
 flavor: small
@@ -142,7 +142,7 @@ flavor: small
 replicaCount: 1
 
 # number of ReplicaSets that should be retained for the Deployment
-revisionHistoryLimit: 2
+revisionHistoryLimit: 1
 
 # the minimum number of seconds that a newly created Pod should be ready
 minReadySeconds: 30
@@ -207,7 +207,6 @@ config:
 
   # environment variables added to the launch of the image in deployment
   env:
-    MIN_HEAP_SIZE: "512m"
     MAX_METASPACE_SIZE: "512m"
 
   # adds jvm args for remote debugging the application
@@ -238,17 +237,20 @@ affinity: {}
 # probe configuration parameters
 liveness:
   enabled: true
-  path: /actuator/health/liveness
+  path: /actuator/health
   periodSeconds: 10
+  timeoutSeconds: 3
 
 readiness:
   path: /actuator/health/readiness
   periodSeconds: 10
+  timeoutSeconds: 3
 
 startup:
   path: /actuator/health/liveness
   failureThreshold: 60
   periodSeconds: 5
+  timeoutSeconds: 3
 
 actuator:
   echo:
@@ -304,6 +306,7 @@ resources:
   unlimited: {}
 
 tracing:
+  enabled: false
   collector:
     baseUrl: http://jaeger-collector.istio-system:9411
   sampling:
diff --git a/kubernetes/aai/components/aai-traversal/Chart.yaml b/kubernetes/aai/components/aai-traversal/Chart.yaml
index f4e458f0fb..d23237577d 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: 15.0.1
+version: 15.0.2
 
 dependencies:
   - name: common
diff --git a/kubernetes/aai/components/aai-traversal/resources/config/application.properties b/kubernetes/aai/components/aai-traversal/resources/config/application.properties
index fff5d5d3d0..3ae548ba67 100644
--- a/kubernetes/aai/components/aai-traversal/resources/config/application.properties
+++ b/kubernetes/aai/components/aai-traversal/resources/config/application.properties
@@ -1,7 +1,7 @@
 {{/*
 # Copyright © 2018 Amdocs, Bell Canada, AT&T
 # Modifications Copyright © 2020 Orange
-# Modifications Copyright � 2023 Nordix Foundation
+# Modifications Copyright © 2023 Nordix Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -32,6 +32,7 @@ spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.jdbc.DataSou
 spring.profiles.active={{ .Values.global.config.profiles.active }}
 spring.jersey.application-path=/
 
+spring.sleuth.enabled={{ .Values.tracing.enabled }}
 spring.zipkin.baseUrl={{ .Values.tracing.collector.baseUrl }}
 spring.sleuth.messaging.jms.enabled = false
 spring.sleuth.trace-id128=true
@@ -57,8 +58,6 @@ server.port=8446
 security.require-ssl=false
 server.ssl.enabled=false
 
-# JMS bind address host port
-jms.bind.address=tcp://localhost:61647
 # dmaap is deprecated now kafka is used
 spring.kafka.producer.bootstrap-servers=${BOOTSTRAP_SERVERS}
 spring.kafka.producer.properties.security.protocol=SASL_PLAINTEXT
@@ -129,3 +128,4 @@ scrape.uri.metrics=false
 # This does the same as the /echo endpoint,
 # but doesn't show up in micrometer metrics
 aai.actuator.echo.enabled={{ .Values.actuator.echo.enabled }}
+aai.graph.properties.path=${server.local.startpath}/etc/appprops/janusgraph-realtime.properties
diff --git a/kubernetes/aai/components/aai-traversal/resources/config/logback.xml b/kubernetes/aai/components/aai-traversal/resources/config/logback.xml
index faae0ee518..ec8144b6b6 100644
--- a/kubernetes/aai/components/aai-traversal/resources/config/logback.xml
+++ b/kubernetes/aai/components/aai-traversal/resources/config/logback.xml
@@ -329,6 +329,7 @@
   <logger name="org.springframework.beans" level="WARN" />
   <logger name="org.springframework.web" level="WARN" />
   <logger name="org.janusgraph" level="WARN" />
+  <logger name="org.janusgraph.graphdb.transaction" level="ERROR" />
   <logger name="org.zookeeper" level="OFF" />
 
 
diff --git a/kubernetes/aai/components/aai-traversal/templates/deployment.yaml b/kubernetes/aai/components/aai-traversal/templates/deployment.yaml
index d12fc6b702..e2a2c10a39 100644
--- a/kubernetes/aai/components/aai-traversal/templates/deployment.yaml
+++ b/kubernetes/aai/components/aai-traversal/templates/deployment.yaml
@@ -20,7 +20,7 @@
 
 apiVersion: apps/v1
 kind: Deployment
-metadata: {{- include "common.resourceMetadata" . | nindent 2 }}
+metadata: {{- include "common.resourceMetadata" (dict "annotations" .Values.annotations "dot" .) | nindent 2 }}
 spec:
   {{- if or .Values.config.debug.enabled .Values.config.profiling.enabled }}
   replicas: 1
@@ -41,55 +41,6 @@ spec:
       app: {{ include "common.name" . }}
   template:
     metadata: {{- include "common.templateMetadata" . | nindent 6 }}
-      {{- if .Values.global.msbEnabled }}
-        {{ $values := .Values }}
-        msb.onap.org/service-info: '[
-        {{- range $api_endpoint := $values.aai_enpoints -}}
-          {{- range $api_version := $values.api_list }}
-          {
-              "serviceName": "_{{ $api_endpoint.name }}",
-              "version": "v{{ $api_version }}",
-              "url": "/aai/v{{ $api_version }}/{{ $api_endpoint.url }}",
-              "protocol": "REST",
-              "port": "8446",
-              "enable_ssl": true,
-              "lb_policy":"ip_hash",
-              "visualRange": "1",
-              "path": "/aai/v{{ $api_version }}/{{ $api_endpoint.url }}"
-          },
-          {
-              "serviceName": "{{ $api_endpoint.name }}",
-              "version": "v{{ $api_version }}",
-              "url": "/aai/v{{ $api_version }}/{{ $api_endpoint.url }}",
-              "protocol": "REST",
-              "port": "8446",
-              "enable_ssl": true,
-              "lb_policy":"ip_hash",
-              "visualRange": "1"
-          },
-          {{- end }}
-        {{- end }}
-          {
-              "serviceName": "_aai-named-query",
-              "url": "/aai/search",
-              "protocol": "REST",
-              "port": "8446",
-              "enable_ssl": true,
-              "lb_policy":"ip_hash",
-              "visualRange": "1",
-              "path": "/aai/search"
-          },
-          {
-              "serviceName": "aai-named-query",
-              "url": "/aai/search",
-              "protocol": "REST",
-              "port": "8446",
-              "enable_ssl": true,
-              "lb_policy":"ip_hash",
-              "visualRange": "1"
-          }
-          ]'
-      {{- end }}
     spec:
       hostname: aai-traversal
       terminationGracePeriodSeconds: {{ .Values.service.terminationGracePeriodSeconds }}
@@ -195,7 +146,7 @@ spec:
                 - -c
                 - |
                   while (netstat -an | grep ESTABLISHED | grep -e $INTERNAL_PORT_1)
-                  do sleep 10
+                  do sleep 3
                   done
         # disable liveness probe when
         # debugging.enable=true or profiling.enabled=true
diff --git a/kubernetes/aai/components/aai-traversal/templates/job.yaml b/kubernetes/aai/components/aai-traversal/templates/job.yaml
index 3ea973fb99..372ea2da07 100644
--- a/kubernetes/aai/components/aai-traversal/templates/job.yaml
+++ b/kubernetes/aai/components/aai-traversal/templates/job.yaml
@@ -26,10 +26,9 @@ metadata:
   namespace: {{ include "common.namespace" . }}
   labels: {{- include "common.labels" . | nindent 4 }}
 {{ if .Values.global.jobs.migration.enabled }}
-  annotations:
-    "helm.sh/hook": post-upgrade,post-rollback,post-install
-    "helm.sh/hook-weight": "2"
-    "helm.sh/hook-delete-policy": before-hook-creation
+  {{- if .Values.jobAnnotations }}
+  annotations:  {{- include "common.tplValue" (dict "value" .Values.jobAnnotations "context" $) | nindent 4 }}
+  {{- end }}
 {{ end }}
 spec:
   template:
@@ -43,6 +42,16 @@ spec:
       - name: {{ include "common.name" . }}-wait-for-aai-haproxy
         image: {{ include "repositoryGenerator.image.readiness" . }}
         imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+        securityContext:
+          runAsUser: 100
+          runAsGroup: 65533
+          readOnlyRootFilesystem: true
+          privileged: false
+          allowPrivilegeEscalation: false
+          capabilities:
+            drop:
+              - ALL
+              - CAP_NET_RAW
         command:
         - sh
         - "-c"
@@ -60,16 +69,6 @@ spec:
           requests:
             cpu: "3m"
             memory: "20Mi"
-        securityContext:
-          runAsUser: 100
-          runAsGroup: 65533
-          readOnlyRootFilesystem: true
-          privileged: false
-          allowPrivilegeEscalation: false
-          capabilities:
-            drop:
-              - ALL
-              - CAP_NET_RAW
       containers:
       - name: {{ include "common.name" . }}-job
         image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
diff --git a/kubernetes/aai/components/aai-traversal/values.yaml b/kubernetes/aai/components/aai-traversal/values.yaml
index fd8206865e..3bd5b8caa5 100644
--- a/kubernetes/aai/components/aai-traversal/values.yaml
+++ b/kubernetes/aai/components/aai-traversal/values.yaml
@@ -111,7 +111,7 @@ global: # global defaults
     someConfig: random
 
 # application image
-image: onap/aai-traversal:1.15.2
+image: onap/aai-traversal:1.15.4
 pullPolicy: Always
 restartPolicy: Always
 flavor: small
@@ -249,7 +249,7 @@ persistence:
 replicaCount: 1
 
 # number of ReplicaSets that should be retained for the Deployment
-revisionHistoryLimit: 2
+revisionHistoryLimit: 1
 
 nodeSelector: {}
 
@@ -257,7 +257,7 @@ affinity: {}
 
 # probe configuration parameters
 liveness:
-  path: /actuator/health/liveness
+  path: /actuator/health
   initialDelaySeconds: 60
   periodSeconds: 60
   enabled: true
@@ -339,6 +339,7 @@ autoscaling:
   targetCPUUtilizationPercentage: 80
 
 tracing:
+  enabled: false
   collector:
     baseUrl: http://jaeger-collector.istio-system:9411
   sampling:
@@ -445,6 +446,11 @@ readinessCheck:
   wait_for_service:
     services:
       - aai
+
+jobAnnotations:
+  "helm.sh/hook": pre-upgrade,pre-rollback,post-install
+  "helm.sh/hook-weight": "2"
+  "helm.sh/hook-delete-policy": before-hook-creation
 #################################################################
 # Secrets metaconfig
 #################################################################
diff --git a/kubernetes/aai/values.yaml b/kubernetes/aai/values.yaml
index a000d2f934..7935b722e5 100644
--- a/kubernetes/aai/values.yaml
+++ b/kubernetes/aai/values.yaml
@@ -25,14 +25,13 @@ global: # global defaults
   dockerhubRepository: docker.io
   busyboxImage: busybox
 
-  readinessImage: onap/oom/readiness:6.0.3
+  readinessImage: onap/oom/readiness:6.1.0
 
   loggingRepository: docker.elastic.co
   loggingImage: beats/filebeat:5.5.0
 
   restartPolicy: Always
 
-  msbEnabled: false
   centralizedLoggingEnabled: false
 
   cassandra:
@@ -329,7 +328,7 @@ config:
 replicaCount: 1
 
 # number of ReplicaSets that should be retained for the Deployment
-revisionHistoryLimit: 2
+revisionHistoryLimit: 1
 
 updateStrategy:
   type: RollingUpdate