[AAI] 16.0.0 release

- [traversal] use 1.16.0 image
- [traversal] rename .global.config.basicAuth.* to .global.auth.*

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

diff --git a/kubernetes/aai/Chart.yaml b/kubernetes/aai/Chart.yaml
index e9dac7a..fb6f677 100644 (file)
--- 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.2
+version: 16.0.0
 
 dependencies:
   - name: common
@@ -62,7 +62,7 @@ dependencies:
     repository: 'file://components/aai-sparky-be'
     condition: aai-sparky-be.enabled
   - name: aai-traversal
-    version: ~15.x-0
+    version: ~16.x-0
     repository: 'file://components/aai-traversal'
     condition: aai-traversal.enabled
   - name: serviceAccount

diff --git a/kubernetes/aai/components/aai-traversal/Chart.yaml b/kubernetes/aai/components/aai-traversal/Chart.yaml
index 03c27cb..e1602b9 100644 (file)
--- 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.3
+version: 16.0.0
 
 dependencies:
   - name: common

diff --git a/kubernetes/aai/components/aai-traversal/resources/config/aaiconfig.properties b/kubernetes/aai/components/aai-traversal/resources/config/aaiconfig.properties
index 0c10b94..92eb347 100644 (file)
--- a/kubernetes/aai/components/aai-traversal/resources/config/aaiconfig.properties
+++ b/kubernetes/aai/components/aai-traversal/resources/config/aaiconfig.properties
@@ -32,10 +32,10 @@ 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.auth.enabled) ( include "common.onServiceMesh" .) }}
 aai.tools.enableBasicAuth=true
-aai.tools.username={{ (index .Values.global.config.basic.auth.users 0).username }}
-aai.tools.password={{ (index .Values.global.config.basic.auth.users 0).password }}
+aai.tools.username={{ (index .Values.global.auth.users 0).username }}
+aai.tools.password={{ (index .Values.global.auth.users 0).password }}
 {{ end }}
 
 aai.notification.current.version={{ .Values.global.config.schema.version.api.default }}

diff --git a/kubernetes/aai/components/aai-traversal/resources/config/application.properties b/kubernetes/aai/components/aai-traversal/resources/config/application.properties
index 027c9cd..b3e869d 100644 (file)
--- a/kubernetes/aai/components/aai-traversal/resources/config/application.properties
+++ b/kubernetes/aai/components/aai-traversal/resources/config/application.properties
@@ -32,14 +32,10 @@ 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.global.tracing.enabled }}
-spring.zipkin.baseUrl={{ .Values.global.tracing.collector.baseUrl }}
-spring.sleuth.trace-id128=true
-spring.sleuth.sampler.probability={{ .Values.global.tracing.sampling.probability }}
-spring.sleuth.propagation.type=w3c, b3
-spring.sleuth.supports-join=false
-spring.sleuth.web.skip-pattern={{ join "," .Values.tracing.ignorePatterns }}
-
+management.tracing.enabled={{ .Values.global.tracing.enabled }}
+management.tracing.sampling.probability={{ .Values.global.tracing.sampling.probability }}
+management.tracing.propagation.type=w3c, b3
+management.zipkin.tracing.endpoint={{ .Values.global.tracing.collector.baseUrl }}
 
 #The max number of active threads in this pool
 server.tomcat.max-threads=200
@@ -125,8 +121,8 @@ scrape.uri.metrics=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.enabled={{ .Values.global.auth.enabled }}
+{{- range $index, $user := .Values.global.auth.users }}
 aai.basic-auth.users[{{ $index }}].username={{ $user.username }}
 aai.basic-auth.users[{{ $index }}].password={{ $user.password }}
 {{- end }}

diff --git a/kubernetes/aai/components/aai-traversal/templates/_helpers.tpl b/kubernetes/aai/components/aai-traversal/templates/_helpers.tpl
index 003be58..fa95534 100644 (file)
--- a/kubernetes/aai/components/aai-traversal/templates/_helpers.tpl
+++ b/kubernetes/aai/components/aai-traversal/templates/_helpers.tpl
@@ -6,7 +6,7 @@
   args:
     - |
       URL="{{ required "URL is required" (.Values.schemaInitCheckURL | default "http://aai-graphadmin:8449/isSchemaInitialized") }}"
-      AUTH="{{ printf "%s:%s" (index .Values.global.config.basic.auth.users 0).username (index .Values.global.config.basic.auth.users 0).password }}"
+      AUTH="{{ printf "%s:%s" (index .Values.global.auth.users 0).username (index .Values.global.auth.users 0).password }}"
       while true; do
         RESPONSE=$(curl -u $AUTH -s $URL)
         if [ "$RESPONSE" = "true" ]; then

diff --git a/kubernetes/aai/components/aai-traversal/values.yaml b/kubernetes/aai/components/aai-traversal/values.yaml
index 302d08e..9f7771f 100644 (file)
--- a/kubernetes/aai/components/aai-traversal/values.yaml
+++ b/kubernetes/aai/components/aai-traversal/values.yaml
@@ -46,7 +46,26 @@ global: # global defaults
     #migration using helm hooks
     migration:
       enabled: false
-
+  # Specifies if basic authorization is enabled
+  auth:
+    enabled: true
+    users:
+      - username: aai@aai.onap.org
+        password: demo123456!
+      - username: AAI
+        password: AAI
+      - username: DCAE
+        password: DCAE
+      - username: MSO
+        password: MSO
+      - username: POLICY
+        password: POLICY
+      - username: ASDC
+        password: ASDC
+      - username: ModelLoader
+        password: ModelLoader
+      - username: AaiUI
+        password: AaiUI
   # Common configuration for resources traversal and graphadmin
   config:
     # User information for the admin user in container
@@ -59,28 +78,6 @@ global: # global defaults
       cassandra:
         dynamic: true
 
-    # Specifies if the basic authorization is enabled
-    basic:
-      auth:
-        enabled: true
-        users:
-          - username: aai@aai.onap.org
-            password: demo123456!
-          - username: AAI
-            password: AAI
-          - username: DCAE
-            password: DCAE
-          - username: MSO
-            password: MSO
-          - username: POLICY
-            password: POLICY
-          - username: ASDC
-            password: ASDC
-          - username: ModelLoader
-            password: ModelLoader
-          - username: AaiUI
-            password: AaiUI
-
     # Active spring profiles for the resources microservice
     profiles:
       active: production,kafka
@@ -133,7 +130,7 @@ global: # global defaults
     someConfig: random
 
 # application image
-image: onap/aai-traversal:1.15.5
+image: onap/aai-traversal:1.16-STAGING-20250402T061549Z
 pullPolicy: Always
 restartPolicy: Always
 flavor: small
@@ -454,6 +451,7 @@ 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/onap/Chart.yaml b/kubernetes/onap/Chart.yaml
index 2bae04b..93dbfa4 100644 (file)
--- a/kubernetes/onap/Chart.yaml
+++ b/kubernetes/onap/Chart.yaml
@@ -30,7 +30,7 @@ dependencies:
     repository: '@local'
     condition: authentication:enabled
   - name: aai
-    version: ~15.x-0
+    version: ~16.x-0
     repository: '@local'
     condition: aai.enabled
   - name: cassandra