[AAI] 15.0.3 release

- [graphadmin] make auth configurable
- [resources, traversal] cleanup logback config by removing logToFile option [0]
- [resources, traversal] reduce log noise from liveness probe
- [babel] make tracing configurable via globals

[0] this is not a viable option anymore in a readonly filesystem. EmptyDir volumes can
    still allow logging to file, but sooner or later these volumes fill up

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

2 files changed, 10 insertions, 9 deletions

diff --git a/kubernetes/aai/components/aai-graphadmin/resources/config/aaiconfig.properties b/kubernetes/aai/components/aai-graphadmin/resources/config/aaiconfig.properties
index cf9164295a..ae49aa03a9 100644
--- a/kubernetes/aai/components/aai-graphadmin/resources/config/aaiconfig.properties
+++ b/kubernetes/aai/components/aai-graphadmin/resources/config/aaiconfig.properties
@@ -31,8 +31,8 @@ aai.global.callback.url=http://aai.{{ include "common.namespace" . }}/aai/
 
 {{- if or (.Values.global.config.basic.auth.enabled) ( include "common.onServiceMesh" .) }}
 aai.tools.enableBasicAuth=true
-aai.tools.username={{ .Values.global.config.basic.auth.username }}
-aai.tools.password={{ .Values.global.config.basic.auth.passwd }}
+aai.tools.username={{ (index .Values.global.config.basic.auth.users 0).username }}
+aai.tools.password={{ (index .Values.global.config.basic.auth.users 0).password }}
 {{- end }}
 
 aai.notification.current.version={{ .Values.global.config.schema.version.api.default }}
@@ -94,6 +94,7 @@ aai.datagrooming.enabledupecheckoff=false
 aai.datagrooming.enableghost2checkoff=false
 aai.datagrooming.enableghost2fixon=false
 aai.datagrooming.enablef=false
+aai.datagrooming.enableskipindexupdatefix=true
 
 # used by the dataGrooming to set values
 aai.datagrooming.timewindowminutesvalue=10500
diff --git a/kubernetes/aai/components/aai-graphadmin/resources/config/application.properties b/kubernetes/aai/components/aai-graphadmin/resources/config/application.properties
index 3d86cf4dc6..7254d6d64f 100644
--- a/kubernetes/aai/components/aai-graphadmin/resources/config/application.properties
+++ b/kubernetes/aai/components/aai-graphadmin/resources/config/application.properties
@@ -38,9 +38,9 @@ spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.jdbc.DataSou
 spring.profiles.active={{ .Values.config.profiles.active }}
 spring.jersey.application-path=${schema.uri.base.path}
 #The max number of active threads in this pool
-server.tomcat.max-threads=200
+server.tomcat.max-threads=50
 #The minimum number of threads always kept alive
-server.tomcat.min-Spare-Threads=25
+server.tomcat.min-Spare-Threads=5
 #The number of milliseconds before an idle thread shutsdown, unless the number of active threads are less or equal to minSpareThreads
 server.tomcat.max-idle-time=60000
 
@@ -50,12 +50,7 @@ server.local.startpath=/opt/app/aai-graphadmin/resources/
 server.basic.auth.location=${server.local.startpath}etc/auth/realm.properties
 
 server.port=8449
-security.require-ssl=false
-server.ssl.enabled=false
 
-# JMS bind address host port
-jms.bind.address=tcp://localhost:61649
-# dmaap is deprecated now kafka is used
 spring.kafka.producer.bootstrap-servers=${BOOTSTRAP_SERVERS}
 spring.kafka.producer.properties.security.protocol=SASL_PLAINTEXT
 spring.kafka.producer.properties.sasl.mechanism=SCRAM-SHA-512
@@ -121,3 +116,8 @@ management.security.enabled=false
 aai.actuator.echo.enabled={{ .Values.actuator.echo.enabled }}
 
 aai.graph.properties.path=${server.local.startpath}/etc/appprops/janusgraph-realtime.properties
+aai.basic-auth.enabled={{ .Values.global.config.basic.auth.enabled }}
+{{- range $index, $user := .Values.global.config.basic.auth.users }}
+aai.basic-auth.users[{{ $index }}].username={{ $user.username }}
+aai.basic-auth.users[{{ $index }}].password={{ $user.password }}
+{{- end }}