[AAI] aai-resources 16.0.0 release

- 1.16.0 image with spring-boot 3
- rename .global.config.basicAuth.* to .global.auth.*

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

diff --git a/kubernetes/aai/Chart.yaml b/kubernetes/aai/Chart.yaml
index ceb0b94..bb70fa2 100644 (file)
--- a/kubernetes/aai/Chart.yaml
+++ b/kubernetes/aai/Chart.yaml
@@ -50,7 +50,7 @@ dependencies:
     repository: 'file://components/aai-modelloader'
     condition: aai-modelloader.enabled
   - name: aai-resources
-    version: ~15.x-0
+    version: ~16.x-0
     repository: 'file://components/aai-resources'
     condition: aai-resources.enabled
   - name: aai-schema-service

diff --git a/kubernetes/aai/components/aai-resources/Chart.yaml b/kubernetes/aai/components/aai-resources/Chart.yaml
index 7e6c6b6..29afa6a 100644 (file)
--- a/kubernetes/aai/components/aai-resources/Chart.yaml
+++ b/kubernetes/aai/components/aai-resources/Chart.yaml
@@ -18,7 +18,7 @@
 apiVersion: v2
 description: ONAP AAI resources
 name: aai-resources
-version: 15.0.3
+version: 16.0.0
 
 dependencies:
   - name: common

diff --git a/kubernetes/aai/components/aai-resources/resources/config/aaiconfig.properties b/kubernetes/aai/components/aai-resources/resources/config/aaiconfig.properties
index 4985a97..44d9070 100644 (file)
--- a/kubernetes/aai/components/aai-resources/resources/config/aaiconfig.properties
+++ b/kubernetes/aai/components/aai-resources/resources/config/aaiconfig.properties
@@ -43,10 +43,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 .Values.global.config.basic.auth.enabled }}
+{{ if .Values.global.auth.enabled }}
 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-resources/resources/config/application.properties b/kubernetes/aai/components/aai-resources/resources/config/application.properties
index daa4e7d..7676475 100644 (file)
--- a/kubernetes/aai/components/aai-resources/resources/config/application.properties
+++ b/kubernetes/aai/components/aai-resources/resources/config/application.properties
@@ -28,13 +28,10 @@ spring.jersey.type=filter
 spring.main.allow-bean-definition-overriding=true
 server.servlet.context-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 }}
 
 spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration,org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration,org.keycloak.adapters.springboot.KeycloakAutoConfiguration,org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration,org.springframework.boot.actuate.autoconfigure.security.servlet.ManagementWebSecurityAutoConfiguration
 
@@ -51,7 +48,7 @@ server.tomcat.max-idle-time=60000
 # If thats not it, please check if the key-store file path makes sense
 server.local.startpath=aai-resources/src/main/resources/
 
-server.port=8447
+server.port={{ .Values.service.resourcesPort }}
 
 spring.kafka.producer.bootstrap-servers=${BOOTSTRAP_SERVERS}
 spring.kafka.producer.properties.security.protocol=SASL_PLAINTEXT
@@ -120,8 +117,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-resources/templates/_helpers.tpl b/kubernetes/aai/components/aai-resources/templates/_helpers.tpl
index ad40cbd..7352b5d 100644 (file)
--- a/kubernetes/aai/components/aai-resources/templates/_helpers.tpl
+++ b/kubernetes/aai/components/aai-resources/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-resources/values.yaml b/kubernetes/aai/components/aai-resources/values.yaml
index 861d6da..f97ca98 100644 (file)
--- a/kubernetes/aai/components/aai-resources/values.yaml
+++ b/kubernetes/aai/components/aai-resources/values.yaml
@@ -42,6 +42,37 @@ global: # global defaults
     migration:
       enabled: false
 
+  # Specifies if basic authorization is enabled
+  auth:
+    enabled: true
+    # users that can authenticate via basic auth
+    users:
+      - username: aai@aai.onap.org
+        password: demo123456!
+      - username: so@so.onap.org
+        password: demo123456!
+      - username: sdnc@sdnc.onap.org
+        password: demo123456!
+      - username: dcae@dcae.onap.org
+        password: demo123456!
+      - username: policy@policy.onap.org
+        password: demo123456!
+      - username: sdc@sdc.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
   config:
     # Specifies that the cluster connected to a dynamic
     # cluster being spinned up by kubernetes deployment
@@ -49,38 +80,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: so@so.onap.org
-            password: demo123456!
-          - username: sdnc@sdnc.onap.org
-            password: demo123456!
-          - username: dcae@dcae.onap.org
-            password: demo123456!
-          - username: policy@policy.onap.org
-            password: demo123456!
-          - username: sdc@sdc.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
@@ -165,7 +164,7 @@ aai_enpoints:
     url: external-system
 
 # application image
-image: onap/aai-resources:1.15.5
+image: onap/aai-resources:1.16.0
 pullPolicy: Always
 restartPolicy: Always
 flavor: small