aboutsummaryrefslogtreecommitdiffstats
path: root/kubernetes/aai
diff options
context:
space:
mode:
authorFiete Ostkamp <Fiete.Ostkamp@telekom.de>2024-03-28 08:41:55 +0100
committerFiete Ostkamp <Fiete.Ostkamp@telekom.de>2024-04-17 14:56:52 +0200
commitca06856557a33f8203d1c5550d436471784dc374 (patch)
tree307d48230b421988a0f46dd10684f77cb26c5825 /kubernetes/aai
parent6d5a8690d675f65a8ec38b2c03f6fde2c2d2d9b8 (diff)
[AAI] Add model-loader tracing config
- mount application.properties file that is used by Spring [1] - add tracing config to that file - deploy model-loader version 1.13.5 [1] this is also a prerequisite for replacing the model-loader.properties file that is loaded by the service via some custom logic. Spring does this out of the box for application-*.properties files. Issue-ID: AAI-3812 Change-Id: I0a101fd246b8313f90cfc3ebca5a65dae769d3d6 Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
Diffstat (limited to 'kubernetes/aai')
-rw-r--r--kubernetes/aai/components/aai-modelloader/resources/application.properties31
-rw-r--r--kubernetes/aai/components/aai-modelloader/templates/configmap.yaml1
-rw-r--r--kubernetes/aai/components/aai-modelloader/templates/deployment.yaml3
-rw-r--r--kubernetes/aai/components/aai-modelloader/values.yaml11
4 files changed, 45 insertions, 1 deletions
diff --git a/kubernetes/aai/components/aai-modelloader/resources/application.properties b/kubernetes/aai/components/aai-modelloader/resources/application.properties
new file mode 100644
index 0000000000..f910af1cae
--- /dev/null
+++ b/kubernetes/aai/components/aai-modelloader/resources/application.properties
@@ -0,0 +1,31 @@
+# Note that the start.sh script sets the following System Properties
+# We provide default values here for testing purposes
+AJSC_HOME=.
+CONFIG_HOME=appconfig-local
+com.att.eelf.logging.path=src/main/resources
+com.att.eelf.logging.file=logback.xml
+logback.configurationFile=${com.att.eelf.logging.path}/${com.att.eelf.logging.file}
+
+server.port=9500
+#server.ssl.key-store=
+#server.ssl.key-store-password=
+#server.ssl.keyStoreType=
+#server.ssl.keyAlias=
+
+spring.application.name=aai-model-loader
+
+spring.sleuth.enabled={{ .Values.tracing.enabled }}
+spring.zipkin.baseUrl={{ .Values.tracing.collector.baseUrl }}
+spring.sleuth.messaging.jms.enabled=false
+spring.sleuth.trace-id128=true
+spring.sleuth.sampler.probability={{ .Values.tracing.sampling.probability }}
+spring.sleuth.propagation.type=w3c,b3
+spring.sleuth.supports-join=false
+spring.sleuth.web.skip-pattern={{ join "," .Values.tracing.ignorePatterns }}
+
+server.tomcat.threads.max=200
+# The minimum number of threads always kept alive
+server.tomcat.threads.min-spare=25
+
+# Spring Boot logging
+logging.config=${logback.configurationFile}
diff --git a/kubernetes/aai/components/aai-modelloader/templates/configmap.yaml b/kubernetes/aai/components/aai-modelloader/templates/configmap.yaml
index 534fd021da..d3fd509dcd 100644
--- a/kubernetes/aai/components/aai-modelloader/templates/configmap.yaml
+++ b/kubernetes/aai/components/aai-modelloader/templates/configmap.yaml
@@ -26,6 +26,7 @@ metadata:
heritage: {{ .Release.Service }}
data:
{{ tpl (.Files.Glob "resources/config/model-loader.properties").AsConfig . | indent 2 }}
+{{ tpl (.Files.Glob "resources/application.properties").AsConfig . | indent 2 }}
---
apiVersion: v1
kind: ConfigMap
diff --git a/kubernetes/aai/components/aai-modelloader/templates/deployment.yaml b/kubernetes/aai/components/aai-modelloader/templates/deployment.yaml
index 139c254736..8dee92f77e 100644
--- a/kubernetes/aai/components/aai-modelloader/templates/deployment.yaml
+++ b/kubernetes/aai/components/aai-modelloader/templates/deployment.yaml
@@ -80,6 +80,9 @@ spec:
- mountPath: /opt/app/model-loader/config/model-loader.properties
subPath: model-loader.properties
name: prop-config
+ - mountPath: /opt/app/model-loader/application.properties
+ subPath: application.properties
+ name: prop-config
- mountPath: {{ .Values.log.path }}
name: logs
- mountPath: /opt/app/model-loader/logback.xml
diff --git a/kubernetes/aai/components/aai-modelloader/values.yaml b/kubernetes/aai/components/aai-modelloader/values.yaml
index aa62f60f00..ab3d8646c2 100644
--- a/kubernetes/aai/components/aai-modelloader/values.yaml
+++ b/kubernetes/aai/components/aai-modelloader/values.yaml
@@ -21,7 +21,7 @@ global: # global defaults
nodePortPrefix: 302
# application image
-image: onap/model-loader:1.12.0
+image: onap/model-loader:1.13.6
pullPolicy: Always
restartPolicy: Always
flavor: small
@@ -79,6 +79,15 @@ resources:
memory: "2Gi"
unlimited: {}
+tracing:
+ enabled: true
+ collector:
+ baseUrl: http://jaeger-collector.istio-system:9411
+ sampling:
+ probability: 1.0 # percentage of requests that are sampled (between 0-1/0%-100%)
+ ignorePatterns:
+ - /aai/util.*
+
#Pods Service Account
serviceAccount:
nameOverride: aai-modelloader