X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Faai%2Fcomponents%2Faai-traversal%2Ftemplates%2Fdeployment.yaml;h=bf9743be55578f1f32998542737e919ac6f32721;hb=ceac26096eeda210db046686494fdf11afbf0ab8;hp=f890d71b401711f3be2faf4adc4ad7020e2aa124;hpb=5b65132e0ad056bf96bc2a905576e309ef373e7b;p=oom.git

diff --git a/kubernetes/aai/components/aai-traversal/templates/deployment.yaml b/kubernetes/aai/components/aai-traversal/templates/deployment.yaml
index f890d71b40..bf9743be55 100644
--- a/kubernetes/aai/components/aai-traversal/templates/deployment.yaml
+++ b/kubernetes/aai/components/aai-traversal/templates/deployment.yaml
@@ -1,6 +1,9 @@
+{{/*
 # Copyright (c) 2017 Amdocs, Bell Canada
 # Modifications Copyright (c) 2018 AT&T
 # Modifications Copyright (c) 2020 Nokia, Orange
+# Modifications Copyright (c) 2021 Orange
+# 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.
@@ -13,6 +16,7 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+*/}}
 
 apiVersion: apps/v1
 kind: Deployment
@@ -21,11 +25,23 @@ metadata:
   namespace: {{ include "common.namespace" . }}
   labels:
     app: {{ include "common.name" . }}
+    app.kubernetes.io/name: {{ include "common.name" . }}
+    {{- if .Chart.AppVersion }}
+    version: {{ .Chart.AppVersion | replace "+" "_" }}
+    {{- else }}
+    version: {{ .Chart.Version | replace "+" "_" }}
+    {{- end }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
     release: {{ include "common.release" . }}
     heritage: {{ .Release.Service }}
 spec:
   replicas: {{ .Values.replicaCount }}
+  minReadySeconds: {{ .Values.minReadySeconds }}
+  strategy:
+    type: {{ .Values.updateStrategy.type }}
+    rollingUpdate:
+      maxUnavailable: {{ .Values.updateStrategy.maxUnavailable }}
+      maxSurge: {{ .Values.updateStrategy.maxSurge }}
   selector:
     matchLabels:
       app: {{ include "common.name" . }}
@@ -34,307 +50,43 @@ spec:
       labels:
         app: {{ include "common.name" . }}
         release: {{ include "common.release" . }}
+        app.kubernetes.io/name: {{ include "common.name" . }}
+        {{- if .Chart.AppVersion }}
+        version: {{ .Chart.AppVersion | replace "+" "_" }}
+        {{- else }}
+        version: {{ .Chart.Version | replace "+" "_" }}
+        {{- end }}
       name: {{ include "common.name" . }}
       annotations:
         checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
+      {{- if .Values.global.msbEnabled }}
+        {{ $values := .Values }}
         msb.onap.org/service-info: '[
+        {{- range $api_endpoint := $values.aai_enpoints -}}
+          {{- range $api_version := $values.api_list }}
           {
-              "serviceName": "_aai-generic-query",
-              "version": "v11",
-              "url": "/aai/v11/search/generic-query",
-              "protocol": "REST",
-              "port": "8446",
-              "enable_ssl": true,
-              "lb_policy":"ip_hash",
-              "visualRange": "1",
-              "path": "/aai/v11/search/generic-query"
-          },
-          {
-              "serviceName": "_aai-generic-query",
-              "version": "v12",
-              "url": "/aai/v12/search/generic-query",
-              "protocol": "REST",
-              "port": "8446",
-              "enable_ssl": true,
-              "lb_policy":"ip_hash",
-              "visualRange": "1",
-              "path": "/aai/v12/search/generic-query"
-          },
-          {
-              "serviceName": "_aai-generic-query",
-              "version": "v13",
-              "url": "/aai/v13/search/generic-query",
-              "protocol": "REST",
-              "port": "8446",
-              "enable_ssl": true,
-              "lb_policy":"ip_hash",
-              "visualRange": "1",
-              "path": "/aai/v13/search/generic-query"
-          },
-          {
-              "serviceName": "_aai-generic-query",
-              "version": "v14",
-              "url": "/aai/v14/search/generic-query",
-              "protocol": "REST",
-              "port": "8446",
-              "enable_ssl": true,
-              "lb_policy":"ip_hash",
-              "visualRange": "1",
-              "path": "/aai/v14/search/generic-query"
-          },
-          {
-              "serviceName": "_aai-generic-query",
-              "version": "v15",
-              "url": "/aai/v15/search/generic-query",
-              "protocol": "REST",
-              "port": "8446",
-              "enable_ssl": true,
-              "lb_policy":"ip_hash",
-              "visualRange": "1",
-              "path": "/aai/v15/search/generic-query"
-          },
-          {
-              "serviceName": "_aai-generic-query",
-              "version": "v16",
-              "url": "/aai/v16/search/generic-query",
-              "protocol": "REST",
-              "port": "8446",
-              "enable_ssl": true,
-              "lb_policy":"ip_hash",
-              "visualRange": "1",
-              "path": "/aai/v16/search/generic-query"
-          },
-          {
-              "serviceName": "_aai-generic-query",
-              "version": "v17",
-              "url": "/aai/v17/search/generic-query",
-              "protocol": "REST",
-              "port": "8446",
-              "enable_ssl": true,
-              "lb_policy":"ip_hash",
-              "visualRange": "1",
-              "path": "/aai/v17/search/generic-query"
-          },
-          {
-              "serviceName": "_aai-generic-query",
-              "version": "v18",
-              "url": "/aai/v18/search/generic-query",
-              "protocol": "REST",
-              "port": "8446",
-              "enable_ssl": true,
-              "lb_policy":"ip_hash",
-              "visualRange": "1",
-              "path": "/aai/v18/search/generic-query"
-          },
-          {
-              "serviceName": "_aai-generic-query",
-              "version": "v19",
-              "url": "/aai/v19/search/generic-query",
-              "protocol": "REST",
-              "port": "8446",
-              "enable_ssl": true,
-              "lb_policy":"ip_hash",
-              "visualRange": "1",
-              "path": "/aai/v19/search/generic-query"
-          },
-          {
-              "serviceName": "_aai-nodes-query",
-              "version": "v11",
-              "url": "/aai/v11/search/nodes-query",
-              "protocol": "REST",
-              "port": "8446",
-              "enable_ssl": true,
-              "lb_policy":"ip_hash",
-              "visualRange": "1",
-              "path": "/aai/v11/search/nodes-query"
-          },
-          {
-              "serviceName": "_aai-nodes-query",
-              "version": "v12",
-              "url": "/aai/v12/search/nodes-query",
-              "protocol": "REST",
-              "port": "8446",
-              "enable_ssl": true,
-              "lb_policy":"ip_hash",
-              "visualRange": "1",
-              "path": "/aai/v12/search/nodes-query"
-          },
-          {
-              "serviceName": "_aai-nodes-query",
-              "version": "v13",
-              "url": "/aai/v13/search/nodes-query",
-              "protocol": "REST",
-              "port": "8446",
-              "enable_ssl": true,
-              "lb_policy":"ip_hash",
-              "visualRange": "1",
-              "path": "/aai/v13/search/nodes-query"
-          },
-          {
-              "serviceName": "_aai-nodes-query",
-              "version": "v14",
-              "url": "/aai/v14/search/nodes-query",
-              "protocol": "REST",
-              "port": "8446",
-              "enable_ssl": true,
-              "lb_policy":"ip_hash",
-              "visualRange": "1",
-              "path": "/aai/v14/search/nodes-query"
-          },
-          {
-              "serviceName": "_aai-nodes-query",
-              "version": "v15",
-              "url": "/aai/v15/search/nodes-query",
-              "protocol": "REST",
-              "port": "8446",
-              "enable_ssl": true,
-              "lb_policy":"ip_hash",
-              "visualRange": "1",
-              "path": "/aai/v15/search/nodes-query"
-          },
-          {
-              "serviceName": "_aai-nodes-query",
-              "version": "v16",
-              "url": "/aai/v16/search/nodes-query",
+              "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/v16/search/nodes-query"
+              "path": "/aai/v{{ $api_version }}/{{ $api_endpoint.url }}"
           },
           {
-              "serviceName": "_aai-nodes-query",
-              "version": "v17",
-              "url": "/aai/v17/search/nodes-query",
+              "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/v17/search/nodes-query"
-          },
-          {
-              "serviceName": "_aai-nodes-query",
-              "version": "v18",
-              "url": "/aai/v18/search/nodes-query",
-              "protocol": "REST",
-              "port": "8446",
-              "enable_ssl": true,
-              "lb_policy":"ip_hash",
-              "visualRange": "1",
-              "path": "/aai/v18/search/nodes-query"
-          },
-          {
-              "serviceName": "_aai-nodes-query",
-              "version": "v19",
-              "url": "/aai/v19/search/nodes-query",
-              "protocol": "REST",
-              "port": "8446",
-              "enable_ssl": true,
-              "lb_policy":"ip_hash",
-              "visualRange": "1",
-              "path": "/aai/v19/search/nodes-query"
-          },
-          {
-              "serviceName": "_aai-query",
-              "version": "v11",
-              "url": "/aai/v11/query",
-              "protocol": "REST",
-              "port": "8446",
-              "enable_ssl": true,
-              "lb_policy":"ip_hash",
-              "visualRange": "1",
-              "path": "/aai/v11/query"
-          },
-          {
-              "serviceName": "_aai-query",
-              "version": "v12",
-              "url": "/aai/v12/query",
-              "protocol": "REST",
-              "port": "8446",
-              "enable_ssl": true,
-              "lb_policy":"ip_hash",
-              "visualRange": "1",
-              "path": "/aai/v12/query"
-          },
-          {
-              "serviceName": "_aai-query",
-              "version": "v13",
-              "url": "/aai/v13/query",
-              "protocol": "REST",
-              "port": "8446",
-              "enable_ssl": true,
-              "lb_policy":"ip_hash",
-              "visualRange": "1",
-              "path": "/aai/v13/query"
-          },
-          {
-              "serviceName": "_aai-query",
-              "version": "v14",
-              "url": "/aai/v14/query",
-              "protocol": "REST",
-              "port": "8446",
-              "enable_ssl": true,
-              "lb_policy":"ip_hash",
-              "visualRange": "1",
-              "path": "/aai/v14/query"
-          },
-          {
-              "serviceName": "_aai-query",
-              "version": "v15",
-              "url": "/aai/v15/query",
-              "protocol": "REST",
-              "port": "8446",
-              "enable_ssl": true,
-              "lb_policy":"ip_hash",
-              "visualRange": "1",
-              "path": "/aai/v15/query"
-          },
-          {
-              "serviceName": "_aai-query",
-              "version": "v16",
-              "url": "/aai/v16/query",
-              "protocol": "REST",
-              "port": "8446",
-              "enable_ssl": true,
-              "lb_policy":"ip_hash",
-              "visualRange": "1",
-              "path": "/aai/v16/query"
-          },
-          {
-              "serviceName": "_aai-query",
-              "version": "v17",
-              "url": "/aai/v17/query",
-              "protocol": "REST",
-              "port": "8446",
-              "enable_ssl": true,
-              "lb_policy":"ip_hash",
-              "visualRange": "1",
-              "path": "/aai/v17/query"
-          },
-          {
-              "serviceName": "_aai-query",
-              "version": "v18",
-              "url": "/aai/v18/query",
-              "protocol": "REST",
-              "port": "8446",
-              "enable_ssl": true,
-              "lb_policy":"ip_hash",
-              "visualRange": "1",
-              "path": "/aai/v18/query"
-          },
-          {
-              "serviceName": "_aai-query",
-              "version": "v19",
-              "url": "/aai/v19/query",
-              "protocol": "REST",
-              "port": "8446",
-              "enable_ssl": true,
-              "lb_policy":"ip_hash",
-              "visualRange": "1",
-              "path": "/aai/v19/query"
+              "visualRange": "1"
           },
+          {{- end }}
+        {{- end }}
           {
               "serviceName": "_aai-named-query",
               "url": "/aai/search",
@@ -345,276 +97,6 @@ spec:
               "visualRange": "1",
               "path": "/aai/search"
           },
-          {
-              "serviceName": "aai-generic-query",
-              "version": "v11",
-              "url": "/aai/v11/search/generic-query",
-              "protocol": "REST",
-              "port": "8446",
-              "enable_ssl": true,
-              "lb_policy":"ip_hash",
-              "visualRange": "1"
-          },
-          {
-              "serviceName": "aai-generic-query",
-              "version": "v12",
-              "url": "/aai/v12/search/generic-query",
-              "protocol": "REST",
-              "port": "8446",
-              "enable_ssl": true,
-              "lb_policy":"ip_hash",
-              "visualRange": "1"
-          },
-          {
-              "serviceName": "aai-generic-query",
-              "version": "v13",
-              "url": "/aai/v13/search/generic-query",
-              "protocol": "REST",
-              "port": "8446",
-              "enable_ssl": true,
-              "lb_policy":"ip_hash",
-              "visualRange": "1"
-          },
-          {
-              "serviceName": "aai-generic-query",
-              "version": "v14",
-              "url": "/aai/v14/search/generic-query",
-              "protocol": "REST",
-              "port": "8446",
-              "enable_ssl": true,
-              "lb_policy":"ip_hash",
-              "visualRange": "1"
-          },
-          {
-              "serviceName": "aai-generic-query",
-              "version": "v15",
-              "url": "/aai/v15/search/generic-query",
-              "protocol": "REST",
-              "port": "8446",
-              "enable_ssl": true,
-              "lb_policy":"ip_hash",
-              "visualRange": "1"
-          },
-          {
-              "serviceName": "aai-generic-query",
-              "version": "v16",
-              "url": "/aai/v16/search/generic-query",
-              "protocol": "REST",
-              "port": "8446",
-              "enable_ssl": true,
-              "lb_policy":"ip_hash",
-              "visualRange": "1"
-          },
-          {
-              "serviceName": "aai-generic-query",
-              "version": "v17",
-              "url": "/aai/v17/search/generic-query",
-              "protocol": "REST",
-              "port": "8446",
-              "enable_ssl": true,
-              "lb_policy":"ip_hash",
-              "visualRange": "1"
-          },
-          {
-              "serviceName": "aai-generic-query",
-              "version": "v18",
-              "url": "/aai/v18/search/generic-query",
-              "protocol": "REST",
-              "port": "8446",
-              "enable_ssl": true,
-              "lb_policy":"ip_hash",
-              "visualRange": "1"
-          },
-          {
-              "serviceName": "aai-generic-query",
-              "version": "v19",
-              "url": "/aai/v19/search/generic-query",
-              "protocol": "REST",
-              "port": "8446",
-              "enable_ssl": true,
-              "lb_policy":"ip_hash",
-              "visualRange": "1"
-          },
-          {
-              "serviceName": "aai-nodes-query",
-              "version": "v11",
-              "url": "/aai/v11/search/nodes-query",
-              "protocol": "REST",
-              "port": "8446",
-              "enable_ssl": true,
-              "lb_policy":"ip_hash",
-              "visualRange": "1"
-          },
-          {
-              "serviceName": "aai-nodes-query",
-              "version": "v12",
-              "url": "/aai/v12/search/nodes-query",
-              "protocol": "REST",
-              "port": "8446",
-              "enable_ssl": true,
-              "lb_policy":"ip_hash",
-              "visualRange": "1"
-          },
-          {
-              "serviceName": "aai-nodes-query",
-              "version": "v13",
-              "url": "/aai/v13/search/nodes-query",
-              "protocol": "REST",
-              "port": "8446",
-              "enable_ssl": true,
-              "lb_policy":"ip_hash",
-              "visualRange": "1"
-          },
-          {
-              "serviceName": "aai-nodes-query",
-              "version": "v14",
-              "url": "/aai/v14/search/nodes-query",
-              "protocol": "REST",
-              "port": "8446",
-              "enable_ssl": true,
-              "lb_policy":"ip_hash",
-              "visualRange": "1"
-          },
-          {
-              "serviceName": "aai-nodes-query",
-              "version": "v15",
-              "url": "/aai/v15/search/nodes-query",
-              "protocol": "REST",
-              "port": "8446",
-              "enable_ssl": true,
-              "lb_policy":"ip_hash",
-              "visualRange": "1"
-          },
-          {
-              "serviceName": "aai-nodes-query",
-              "version": "v16",
-              "url": "/aai/v16/search/nodes-query",
-              "protocol": "REST",
-              "port": "8446",
-              "enable_ssl": true,
-              "lb_policy":"ip_hash",
-              "visualRange": "1"
-          },
-          {
-              "serviceName": "aai-nodes-query",
-              "version": "v17",
-              "url": "/aai/v17/search/nodes-query",
-              "protocol": "REST",
-              "port": "8446",
-              "enable_ssl": true,
-              "lb_policy":"ip_hash",
-              "visualRange": "1"
-          },
-          {
-              "serviceName": "aai-nodes-query",
-              "version": "v18",
-              "url": "/aai/v18/search/nodes-query",
-              "protocol": "REST",
-              "port": "8446",
-              "enable_ssl": true,
-              "lb_policy":"ip_hash",
-              "visualRange": "1"
-          },
-          {
-              "serviceName": "aai-nodes-query",
-              "version": "v19",
-              "url": "/aai/v19/search/nodes-query",
-              "protocol": "REST",
-              "port": "8446",
-              "enable_ssl": true,
-              "lb_policy":"ip_hash",
-              "visualRange": "1"
-          },
-          {
-              "serviceName": "aai-query",
-              "version": "v11",
-              "url": "/aai/v11/query",
-              "protocol": "REST",
-              "port": "8446",
-              "enable_ssl": true,
-              "lb_policy":"ip_hash",
-              "visualRange": "1"
-          },
-          {
-              "serviceName": "aai-query",
-              "version": "v12",
-              "url": "/aai/v12/query",
-              "protocol": "REST",
-              "port": "8446",
-              "enable_ssl": true,
-              "lb_policy":"ip_hash",
-              "visualRange": "1"
-          },
-          {
-              "serviceName": "aai-query",
-              "version": "v13",
-              "url": "/aai/v13/query",
-              "protocol": "REST",
-              "port": "8446",
-              "enable_ssl": true,
-              "lb_policy":"ip_hash",
-              "visualRange": "1"
-          },
-          {
-              "serviceName": "aai-query",
-              "version": "v14",
-              "url": "/aai/v14/query",
-              "protocol": "REST",
-              "port": "8446",
-              "enable_ssl": true,
-              "lb_policy":"ip_hash",
-              "visualRange": "1"
-          },
-          {
-              "serviceName": "aai-query",
-              "version": "v15",
-              "url": "/aai/v15/query",
-              "protocol": "REST",
-              "port": "8446",
-              "enable_ssl": true,
-              "lb_policy":"ip_hash",
-              "visualRange": "1"
-          },
-          {
-              "serviceName": "aai-query",
-              "version": "v16",
-              "url": "/aai/v16/query",
-              "protocol": "REST",
-              "port": "8446",
-              "enable_ssl": true,
-              "lb_policy":"ip_hash",
-              "visualRange": "1"
-          },
-          {
-              "serviceName": "aai-query",
-              "version": "v17",
-              "url": "/aai/v17/query",
-              "protocol": "REST",
-              "port": "8446",
-              "enable_ssl": true,
-              "lb_policy":"ip_hash",
-              "visualRange": "1"
-          },
-          {
-              "serviceName": "aai-query",
-              "version": "v18",
-              "url": "/aai/v18/query",
-              "protocol": "REST",
-              "port": "8446",
-              "enable_ssl": true,
-              "lb_policy":"ip_hash",
-              "visualRange": "1"
-          },
-          {
-              "serviceName": "aai-query",
-              "version": "v19",
-              "url": "/aai/v19/query",
-              "protocol": "REST",
-              "port": "8446",
-              "enable_ssl": true,
-              "lb_policy":"ip_hash",
-              "visualRange": "1"
-          },
           {
               "serviceName": "aai-named-query",
               "url": "/aai/search",
@@ -625,33 +107,32 @@ spec:
               "visualRange": "1"
           }
           ]'
+      {{- end }}
     spec:
       hostname: aai-traversal
-    {{ if .Values.global.initContainers.enabled }}
+      terminationGracePeriodSeconds: {{ .Values.service.terminationGracePeriodSeconds }}
       initContainers:
       - command:
-      {{ if .Values.global.jobs.migration.enabled }}
         - /app/ready.py
         args:
+      {{- if .Values.global.jobs.migration.enabled }}
         - --job-name
         - {{ include "common.release" . }}-aai-graphadmin-migration
-      {{  else if .Values.global.jobs.createSchema.enabled  }}
-        - /app/ready.py
-        args:
+      {{- else  }}
+        {{- if .Values.global.jobs.createSchema.enabled  }}
         - --job-name
         - {{ include "common.release" . }}-aai-graphadmin-create-db-schema
-      {{  else }}
-        - /app/ready.py
-        args:
+        {{- else }}
         - --container-name
-        {{- if .Values.global.cassandra.localCluster }}
+          {{- if .Values.global.cassandra.localCluster }}
         - aai-cassandra
-        {{- else }}
+          {{- else }}
         - cassandra
-        {{- end }}
+          {{- end }}
         - --container-name
         - aai-schema-service
-      {{  end  }}
+        {{- end }}
+      {{- end }}
         env:
         - name: NAMESPACE
           valueFrom:
@@ -661,11 +142,17 @@ spec:
         image: {{ include "repositoryGenerator.image.readiness" . }}
         imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
         name: {{ include "common.name" . }}-readiness
-    {{ end }}
       containers:
       - name: {{ include "common.name" . }}
         image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
         imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+        command:
+        - sh
+        args:
+        - -c
+        - |
+          echo "*** actual launch of AAI Resources"
+          /bin/bash /opt/app/aai-traversal/docker-entrypoint.sh
         env:
         - name: DISABLE_UPDATE_QUERY
           value: {{ .Values.config.disableUpdateQuery | quote }}
@@ -673,6 +160,12 @@ spec:
           value: {{ .Values.global.config.userId | quote }}
         - name: LOCAL_GROUP_ID
           value: {{ .Values.global.config.groupId | quote }}
+        - name: INTERNAL_PORT_1
+          value: {{ .Values.service.internalPort | quote }}
+        - name: INTERNAL_PORT_2
+          value: {{ .Values.service.internalPort2 | quote }}
+        - name: INTERNAL_PORT_3
+          value: {{ .Values.service.internalPort3 | quote }}
         volumeMounts:
         - mountPath: /etc/localtime
           name: localtime
@@ -687,7 +180,7 @@ spec:
           name: {{ include "common.fullname" . }}-config
           subPath: aaiconfig.properties
         - mountPath: /opt/aai/logroot/AAI-GQ
-          name: {{ include "common.fullname" . }}-logs
+          name: logs
         - mountPath: /opt/aai/logroot/AAI-GQ/misc
           name: {{ include "common.fullname" . }}-logs-misc
         - mountPath: /opt/app/aai-traversal/resources/logback.xml
@@ -699,114 +192,88 @@ spec:
         - mountPath: /opt/app/aai-traversal/resources/etc/auth/realm.properties
           name: {{ include "common.fullname" . }}-config
           subPath: realm.properties
-        - mountPath: /opt/app/aai-traversal/resources/aaf/org.onap.aai.keyfile
-          name: {{ include "common.fullname" . }}-aaf-certs
-          subPath: org.onap.aai.keyfile
-        - mountPath: /opt/app/aai-traversal/resources/aaf/bath_config.csv
-          name: {{ include "common.fullname" . }}-aaf-certs
-          subPath: bath_config.csv
-        - mountPath: /opt/app/aai-traversal/resources/aaf/org.onap.aai.props
-          name: {{ include "common.fullname" . }}-aaf-properties
-          subPath: org.onap.aai.props
-        - mountPath: /opt/app/aai-traversal/resources/aaf/org.osaaf.location.props
-          name: {{ include "common.fullname" . }}-aaf-properties
-          subPath: org.osaaf.location.props
-        - mountPath: /opt/app/aai-traversal/resources/aaf/permissions.properties
-          name: {{ include "common.fullname" . }}-aaf-properties
-          subPath: permissions.properties
-        - mountPath: /opt/app/aai-traversal/resources/cadi.properties
-          name: {{ include "common.fullname" . }}-aaf-properties
-          subPath: cadi.properties
-        - mountPath: /opt/app/aai-traversal/resources/aaf/org.onap.aai.p12
-          name: {{ include "common.fullname" . }}-aaf-certs
-          subPath: org.onap.aai.p12
-        - mountPath: /opt/app/aai-traversal/resources/aaf/truststoreONAPall.jks
-          name: aai-common-aai-auth-mount
-          subPath: truststoreONAPall.jks
         - mountPath: /opt/app/aai-traversal/resources/application.properties
           name: {{ include "common.fullname" . }}-config
           subPath: application.properties
-          {{ $global := . }}
-          {{ range $job := .Values.global.config.auth.files }}
-        - mountPath: /opt/app/aai-traversal/resources/etc/auth/{{ . }}
-          name: {{ include "common.fullname" $global }}-auth-truststore-sec
-          subPath: {{ . }}
-          {{ end }}
+        - mountPath: /opt/app/aai-traversal/resources/application-keycloak.properties
+          name: {{ include "common.fullname" . }}-config
+          subPath: application-keycloak.properties
         ports:
         - containerPort: {{ .Values.service.internalPort }}
+          name: {{ .Values.service.portName }}
         - containerPort: {{ .Values.service.internalPort2 }}
+          name: {{ .Values.service.portName2 }}
+        - containerPort: {{ .Values.service.internalPort3 }}
+          name: {{ .Values.service.portName3 }}
+        lifecycle:
+          # wait for active requests (long-running tasks) to be finished
+          # Before the SIGTERM is invoked, Kubernetes exposes a preStop hook in the Pod.
+          preStop:
+            exec:
+              command:
+                - sh
+                - -c
+                - |
+                  while (netstat -an | grep ESTABLISHED | grep -e $INTERNAL_PORT_1 -e $INTERNAL_PORT_2)
+                  do sleep 10
+                  done
         # disable liveness probe when breakpoints set in debugger
         # so K8s doesn't restart unresponsive container
         {{ if .Values.liveness.enabled }}
         livenessProbe:
-          tcpSocket:
+          httpGet:
+            path: /aai/util/echo?action=checkDB
             port: {{ .Values.service.internalPort }}
+            scheme: HTTP
+            httpHeaders:
+            - name: X-FromAppId
+              value: LivenessCheck
+            - name: X-TransactionId
+              value: LiveCheck_TID
+            - name: Accept
+              value: application/json
           initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }}
           periodSeconds: {{ .Values.liveness.periodSeconds }}
         {{ end }}
         readinessProbe:
-          tcpSocket:
+          httpGet:
+            path: /aai/util/echo?action=checkDB
             port: {{ .Values.service.internalPort }}
+            scheme: HTTP
+            httpHeaders:
+            - name: X-FromAppId
+              value: ReadinessCheck
+            - name: X-TransactionId
+              value: ReadinessCheck_TID
+            - name: Accept
+              value: application/json
           initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
           periodSeconds: {{ .Values.readiness.periodSeconds }}
-        resources:
-{{ include "common.resources" . }}
+        resources: {{ include "common.resources" . | nindent 10 }}
       {{- if .Values.nodeSelector }}
       nodeSelector:
 {{ toYaml .Values.nodeSelector | indent 8 }}
-      {{- end -}}
+      {{- end }}
       {{- if .Values.affinity }}
       affinity:
 {{ toYaml .Values.affinity | indent 8 }}
       {{- end }}
 
       # side car containers
-      - name: filebeat-onap
-        image: {{ include "repositoryGenerator.image.logging" . }}
-        imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
-        volumeMounts:
-        - mountPath: /usr/share/filebeat/filebeat.yml
-          subPath: filebeat.yml
-          name: filebeat-conf
-        - mountPath: /var/log/onap
-          name: {{ include "common.fullname" . }}-logs
-        - mountPath: /usr/share/filebeat/data
-          name: {{ include "common.fullname" . }}-filebeat
-        resources:
-{{ include "common.resources" . }}
+      {{ include "common.log.sidecar" . | nindent 6 }}
+      serviceAccountName: {{ include "common.fullname" (dict "suffix" "read" "dot" . )}}
       volumes:
       - name: localtime
         hostPath:
           path: /etc/localtime
-      - name: filebeat-conf
-        configMap:
-          name: aai-filebeat
-      - name: {{ include "common.fullname" . }}-logs
+      - name: logs
         emptyDir: {}
       - name: {{ include "common.fullname" . }}-logs-misc
         emptyDir: {}
-      - name: {{ include "common.fullname" . }}-filebeat
-        emptyDir: {}
+      {{ include "common.log.volumes" (dict "dot" . "configMapNamePrefix" (tpl .Values.logConfigMapNamePrefix .)) | nindent 6 }}
       - name: {{ include "common.fullname" . }}-config
         configMap:
-          name: {{ include "common.fullname" . }}-configmap
-      - name: {{ include "common.fullname" . }}-aaf-properties
-        configMap:
-          name: {{ include "common.fullname" . }}-aaf-props
-      - name: {{ include "common.fullname" . }}-aaf-certs
-        secret:
-          secretName: {{ include "common.fullname" . }}-aaf-keys
-      - name: aai-common-aai-auth-mount
-        secret:
-          secretName: aai-common-aai-auth
-      - name: {{ include "common.fullname" . }}-auth-truststore-sec
-        secret:
-          secretName: aai-common-truststore
-          items:
-            {{ range $job := .Values.global.config.auth.files }}
-            - key: {{ . }}
-              path: {{ . }}
-            {{ end }}
+          name: {{ include "common.fullname" . }}
       restartPolicy: {{ .Values.global.restartPolicy | default .Values.restartPolicy }}
       imagePullSecrets:
       - name: "{{ include "common.namespace" . }}-docker-registry-key"