[AAI] Model-loader 15.0.2 release

- update model-loader image (1.14.2 -> 1.14.3)
- make auth globally configurable via .global.auth.users

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

diff --git a/kubernetes/aai/components/aai-modelloader/Chart.yaml b/kubernetes/aai/components/aai-modelloader/Chart.yaml
index 2f56133..0709eef 100644 (file)
--- a/kubernetes/aai/components/aai-modelloader/Chart.yaml
+++ b/kubernetes/aai/components/aai-modelloader/Chart.yaml
@@ -17,7 +17,7 @@
 apiVersion: v2
 description: ONAP AAI modelloader
 name: aai-modelloader
-version: 15.0.1
+version: 15.0.2
 
 dependencies:
   - name: common

diff --git a/kubernetes/aai/components/aai-modelloader/resources/application.properties b/kubernetes/aai/components/aai-modelloader/resources/application.properties
index e2dc186..8180e96 100644 (file)
--- a/kubernetes/aai/components/aai-modelloader/resources/application.properties
+++ b/kubernetes/aai/components/aai-modelloader/resources/application.properties
@@ -7,10 +7,6 @@ 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
 
@@ -29,3 +25,15 @@ server.tomcat.threads.min-spare=25
 
 # Spring Boot logging
 logging.config=${logback.configurationFile}
+
+# Model Loader Client Configuration for the A&AI REST interface
+ml.aai.base-url=http://aai.{{.Release.Namespace}}:80
+ml.aai.model-url=/aai/%s/service-design-and-creation/models/model/
+ml.aai.named-query-url=/aai/%s/service-design-and-creation/named-queries/named-query/
+ml.aai.vnf-image-url=/aai/v*/service-design-and-creation/vnf-images # v* is supported by the resources api and translates to 'latest'
+ml.aai.auth-user={{ (index .Values.global.auth.users 0).username }}
+ml.aai.auth-password={{ (index .Values.global.auth.users 0).password }}
+ml.aai.use-gizmo=false
+# Babel client config
+ml.babel.base-url={{ include "common.scheme" . }}://aai-babel.{{.Release.Namespace}}:9516
+ml.babel.generate-artifacts-url=/services/babel-service/v1/app/generateArtifacts

diff --git a/kubernetes/aai/components/aai-modelloader/resources/config/model-loader.properties b/kubernetes/aai/components/aai-modelloader/resources/config/model-loader.properties
index 7c65c86..2c0696c 100644 (file)
--- a/kubernetes/aai/components/aai-modelloader/resources/config/model-loader.properties
+++ b/kubernetes/aai/components/aai-modelloader/resources/config/model-loader.properties
@@ -32,22 +32,3 @@ ml.distribution.POLLING_TIMEOUT=20
 ml.distribution.USER={{ .name }}
 {{- end }}
 ml.distribution.ARTIFACT_TYPES=MODEL_QUERY_SPEC,TOSCA_CSAR
-
-# Model Loader AAI REST Client Configuration
-ml.aai.BASE_URL=http://aai.{{.Release.Namespace}}:80
-ml.aai.USE_HTTPS= false
-ml.aai.MODEL_URL=/aai/v*/service-design-and-creation/models/model/
-ml.aai.NAMED_QUERY_URL=/aai/v*/service-design-and-creation/named-queries/named-query/
-ml.aai.VNF_IMAGE_URL=/aai/v*/service-design-and-creation/vnf-images
-
-ml.aai.AUTH_USER=ModelLoader
-ml.aai.AUTH_PASSWORD=OBF:1qvu1v2h1sov1sar1wfw1j7j1wg21saj1sov1v1x1qxw
-
-# Model Loader Babel REST Client Configuration\r
-ml.babel.BASE_URL={{ include "common.scheme" . }}://aai-babel.{{.Release.Namespace}}:9516
-ml.babel.GENERATE_ARTIFACTS_URL=/services/babel-service/v1/app/generateArtifacts
-ml.babel.KEYSTORE_FILE=
-ml.babel.KEYSTORE_PASSWORD=
-ml.babel.TRUSTSTORE_FILE=
-ml.babel.TRUSTSTORE_PASSWORD=
-ml.babel.USE_HTTPS= false

diff --git a/kubernetes/aai/components/aai-modelloader/values.yaml b/kubernetes/aai/components/aai-modelloader/values.yaml
index 08d6351..6d43771 100644 (file)
--- a/kubernetes/aai/components/aai-modelloader/values.yaml
+++ b/kubernetes/aai/components/aai-modelloader/values.yaml
@@ -25,10 +25,17 @@ global: # global defaults
       baseUrl: http://jaeger-collector.istio-config:9411
     sampling:
       probability: 1.0 # percentage of requests that are sampled (between 0-1/0%-100%)
+  auth:
+    # users that can authenticate via basic auth
+    users:
+      - username: aai@aai.onap.org
+        password: demo123456!
+      - username: AAI
+        password: AAI
 
 
 # application image
-image: onap/model-loader:1.14.2
+image: onap/model-loader:1.14.3
 pullPolicy: Always
 restartPolicy: Always
 flavor: small
@@ -48,7 +55,7 @@ kafkaUser:
 replicaCount: 1
 
 # number of ReplicaSets that should be retained for the Deployment
-revisionHistoryLimit: 2
+revisionHistoryLimit: 1
 
 updateStrategy:
   type: RollingUpdate