diff options
author | Andreas Geissler <andreas-geissler@telekom.de> | 2024-11-23 10:02:42 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2024-11-23 10:02:42 +0000 |
commit | 60c337f8a2778ba82c4d554c917436ec3479a09c (patch) | |
tree | af0595e749f6d10298670c68d7d423ac18bdec2c /kubernetes/aai/components/aai-graphadmin/resources/config | |
parent | 7b584c689c52be2238d22aad20b57745bf03367c (diff) | |
parent | 33588757b2fcfc9465066b5639a4ee316e162f56 (diff) |
Merge "[AAI] 15.0.0 chart release"
Diffstat (limited to 'kubernetes/aai/components/aai-graphadmin/resources/config')
-rw-r--r-- | kubernetes/aai/components/aai-graphadmin/resources/config/aaiconfig.properties | 6 | ||||
-rw-r--r-- | kubernetes/aai/components/aai-graphadmin/resources/config/application.properties | 8 |
2 files changed, 10 insertions, 4 deletions
diff --git a/kubernetes/aai/components/aai-graphadmin/resources/config/aaiconfig.properties b/kubernetes/aai/components/aai-graphadmin/resources/config/aaiconfig.properties index 8f63ac85ab..cf9164295a 100644 --- a/kubernetes/aai/components/aai-graphadmin/resources/config/aaiconfig.properties +++ b/kubernetes/aai/components/aai-graphadmin/resources/config/aaiconfig.properties @@ -5,7 +5,7 @@ # ================================================================================ # Copyright © 2018 AT&T Intellectual Property. All rights reserved. # Modifications Copyright © 2021 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. @@ -29,11 +29,11 @@ aai.server.url.base=http://aai.{{ include "common.namespace" . }}/aai/ aai.server.url=http://aai.{{ include "common.namespace" . }}/aai/{{ .Values.global.config.schema.version.api.default }}/ aai.global.callback.url=http://aai.{{ include "common.namespace" . }}/aai/ -{{ if or (.Values.global.config.basic.auth.enabled) ( include "common.onServiceMesh" .) }} +{{- 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 }} -{{ end }} +{{- end }} aai.notification.current.version={{ .Values.global.config.schema.version.api.default }} aai.notificationEvent.default.status=UNPROCESSED diff --git a/kubernetes/aai/components/aai-graphadmin/resources/config/application.properties b/kubernetes/aai/components/aai-graphadmin/resources/config/application.properties index d124f63141..cc6b5677c5 100644 --- a/kubernetes/aai/components/aai-graphadmin/resources/config/application.properties +++ b/kubernetes/aai/components/aai-graphadmin/resources/config/application.properties @@ -111,5 +111,11 @@ aperture.service.timeout-in-milliseconds=300000 #To Expose the Prometheus scraping endpoint management.server.port={{ .Values.service.actuatorPort }} management.endpoints.enabled-by-default=true -management.endpoints.web.exposure.include=info,health,prometheus +management.endpoints.web.exposure.include=* management.security.enabled=false + +# If true, the actuator health check will be overriden +# to use the AaiGraphChecker check instead. +# This does the same as the /echo endpoint, +# but doesn't show up in micrometer metrics +aai.actuator.echo.enabled={{ .Values.actuator.echo.enabled }} |