[SO] 15.1.1 release

- deploy 1.15.2 images of so repo
- deploy 1.12.3 image of cnf-adapater
- deploy 1.10.0 image of nssmf-adapter
- deploy 1.10.0 image of oof-adapter
- images contain removal of AAF dependency
- rename auth-related properties
  - mso.config.cadi.aafId -> mso.auth.user
  - mso.auth              -> mso.auth.password

Issue-ID: SO-4159
Change-Id: I4f40f41c6fb525a8e4e1381ff1788b1d6b31070a
Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>

diff --git a/kubernetes/so/Chart.yaml b/kubernetes/so/Chart.yaml
index d643491..24eddb3 100755 (executable)
--- a/kubernetes/so/Chart.yaml
+++ b/kubernetes/so/Chart.yaml
@@ -51,7 +51,7 @@ dependencies:
     repository: 'file://components/so-catalog-db-adapter'
     condition: so-catalog-db-adapter.enabled
   - name: so-cnf-adapter
-    version: ~13.x-0
+    version: ~15.x-0
     repository: "file://components/so-cnf-adapter"
     condition: so-cnf-adapter.enabled
   - name: so-cnfm-lcm
@@ -70,11 +70,11 @@ dependencies:
     version: ~16.x-0
     repository: 'file://components/so-mariadb'
   - name: so-nssmf-adapter
-    version: ~13.x-0
+    version: ~15.x-0
     repository: 'file://components/so-nssmf-adapter'
     condition: so-nssmf-adapter.enabled
   - name: so-oof-adapter
-    version: ~13.x-0
+    version: ~15.x-0
     repository: 'file://components/so-oof-adapter'
     condition: so-oof-adapter.enabled
   - name: so-openstack-adapter

diff --git a/kubernetes/so/components/so-bpmn-infra/Chart.yaml b/kubernetes/so/components/so-bpmn-infra/Chart.yaml
index b151624..2ed1abc 100755 (executable)
--- a/kubernetes/so/components/so-bpmn-infra/Chart.yaml
+++ b/kubernetes/so/components/so-bpmn-infra/Chart.yaml
@@ -18,7 +18,7 @@ apiVersion: v2
 appVersion: "1.0"
 description: A Helm chart for SO Bpmn Infra
 name: so-bpmn-infra
-version: 15.1.0
+version: 15.1.1
 
 dependencies:
   - name: common

diff --git a/kubernetes/so/components/so-bpmn-infra/values.yaml b/kubernetes/so/components/so-bpmn-infra/values.yaml
index db6a1cd..cc6eb6b 100755 (executable)
--- a/kubernetes/so/components/so-bpmn-infra/values.yaml
+++ b/kubernetes/so/components/so-bpmn-infra/values.yaml
@@ -69,7 +69,7 @@ secrets:
 #################################################################
 # Application configuration defaults.
 #################################################################
-image: onap/so/bpmn-infra:1.15.1
+image: onap/so/bpmn-infra:1.15.2
 pullPolicy: Always
 
 kafkaUser:

diff --git a/kubernetes/so/components/so-catalog-db-adapter/Chart.yaml b/kubernetes/so/components/so-catalog-db-adapter/Chart.yaml
index 6f3baf4..7841938 100755 (executable)
--- a/kubernetes/so/components/so-catalog-db-adapter/Chart.yaml
+++ b/kubernetes/so/components/so-catalog-db-adapter/Chart.yaml
@@ -16,7 +16,7 @@
 apiVersion: v2
 description: A Helm chart for so-catalog-db-adapter
 name: so-catalog-db-adapter
-version: 15.1.0
+version: 15.1.1
 
 dependencies:
   - name: common

diff --git a/kubernetes/so/components/so-catalog-db-adapter/values.yaml b/kubernetes/so/components/so-catalog-db-adapter/values.yaml
index 0cbef83..550d2d8 100755 (executable)
--- a/kubernetes/so/components/so-catalog-db-adapter/values.yaml
+++ b/kubernetes/so/components/so-catalog-db-adapter/values.yaml
@@ -62,7 +62,7 @@ secrets:
 #################################################################
 # Application configuration defaults.
 #################################################################
-image: onap/so/catalog-db-adapter:1.15.1
+image: onap/so/catalog-db-adapter:1.15.2
 pullPolicy: Always
 
 # Local mariadb galera instance default name

diff --git a/kubernetes/so/components/so-cnf-adapter/Chart.yaml b/kubernetes/so/components/so-cnf-adapter/Chart.yaml
index c9bac65..d386cb3 100755 (executable)
--- a/kubernetes/so/components/so-cnf-adapter/Chart.yaml
+++ b/kubernetes/so/components/so-cnf-adapter/Chart.yaml
@@ -18,7 +18,7 @@ apiVersion: v2
 appVersion: "1.7.1"
 description: A Helm chart for Kubernetes
 name: so-cnf-adapter
-version: 13.0.0
+version: 15.0.0
 
 dependencies:
   - name: common

diff --git a/kubernetes/so/components/so-cnf-adapter/values.yaml b/kubernetes/so/components/so-cnf-adapter/values.yaml
index 1eb8c62..126f4d3 100755 (executable)
--- a/kubernetes/so/components/so-cnf-adapter/values.yaml
+++ b/kubernetes/so/components/so-cnf-adapter/values.yaml
@@ -63,7 +63,7 @@ secrets:
 #################################################################
 # Application configuration defaults.
 #################################################################
-image: onap/so/so-cnf-adapter:1.12.2
+image: onap/so/so-cnf-adapter:1.12.3
 pullPolicy: Always
 
 readinessCheck:

diff --git a/kubernetes/so/components/so-nssmf-adapter/Chart.yaml b/kubernetes/so/components/so-nssmf-adapter/Chart.yaml
index 0dc42e4..b06e503 100755 (executable)
--- a/kubernetes/so/components/so-nssmf-adapter/Chart.yaml
+++ b/kubernetes/so/components/so-nssmf-adapter/Chart.yaml
@@ -17,7 +17,7 @@ apiVersion: v2
 appVersion: "1.0"
 description: A Helm chart for Kubernetes
 name: so-nssmf-adapter
-version: 13.0.0
+version: 15.0.0
 
 dependencies:
   - name: common

diff --git a/kubernetes/so/components/so-nssmf-adapter/values.yaml b/kubernetes/so/components/so-nssmf-adapter/values.yaml
index c5bef0c..fc26535 100755 (executable)
--- a/kubernetes/so/components/so-nssmf-adapter/values.yaml
+++ b/kubernetes/so/components/so-nssmf-adapter/values.yaml
@@ -71,7 +71,7 @@ secrets:
 #################################################################
 # Application configuration defaults.
 #################################################################
-image: onap/so/so-nssmf-adapter:1.9.1
+image: onap/so/so-nssmf-adapter:1.10.0
 pullPolicy: Always
 
 # Local mariadb galera instance default name

diff --git a/kubernetes/so/components/so-oof-adapter/Chart.yaml b/kubernetes/so/components/so-oof-adapter/Chart.yaml
index 08e8071..00fa469 100755 (executable)
--- a/kubernetes/so/components/so-oof-adapter/Chart.yaml
+++ b/kubernetes/so/components/so-oof-adapter/Chart.yaml
@@ -18,7 +18,7 @@ apiVersion: v2
 appVersion: "1.0"
 description: A Helm chart for Kubernetes
 name: so-oof-adapter
-version: 13.0.0
+version: 15.0.0
 
 dependencies:
   - name: common

diff --git a/kubernetes/so/components/so-oof-adapter/values.yaml b/kubernetes/so/components/so-oof-adapter/values.yaml
index d1b795d..af3e10b 100755 (executable)
--- a/kubernetes/so/components/so-oof-adapter/values.yaml
+++ b/kubernetes/so/components/so-oof-adapter/values.yaml
@@ -67,7 +67,7 @@ secrets:
 #################################################################
 # Application configuration defaults.
 #################################################################
-image: onap/so/so-oof-adapter:1.8.3
+image: onap/so/so-oof-adapter:1.10.0
 pullPolicy: Always
 
 # Local mariadb galera instance default name

diff --git a/kubernetes/so/components/so-openstack-adapter/Chart.yaml b/kubernetes/so/components/so-openstack-adapter/Chart.yaml
index 55f7c15..4324d1b 100755 (executable)
--- a/kubernetes/so/components/so-openstack-adapter/Chart.yaml
+++ b/kubernetes/so/components/so-openstack-adapter/Chart.yaml
@@ -17,7 +17,7 @@ apiVersion: v2
 appVersion: "1.0"
 description: A Helm chart for Kubernetes
 name: so-openstack-adapter
-version: 15.1.0
+version: 15.1.1
 
 dependencies:
   - name: common

diff --git a/kubernetes/so/components/so-openstack-adapter/resources/config/overrides/override.yaml b/kubernetes/so/components/so-openstack-adapter/resources/config/overrides/override.yaml
index ad58d90..caaff52 100755 (executable)
--- a/kubernetes/so/components/so-openstack-adapter/resources/config/overrides/override.yaml
+++ b/kubernetes/so/components/so-openstack-adapter/resources/config/overrides/override.yaml
@@ -131,7 +131,9 @@ mso:
     requestDb:
       endpoint: http://so-request-db-adapter.{{ include "common.namespace" . }}:8083
       auth: {{ .Values.mso.db.auth }}
-  auth: {{ .Values.mso.auth }}
+  auth:
+    user: {{ .Values.mso.auth.user }}
+    password: {{ .Values.mso.auth.password }}
   logPath: ./logs/openstack
   msb-ip: msb-iag
   msb-port: 80
@@ -139,9 +141,6 @@ mso:
   workflow:
     endpoint: http://so-bpmn-infra.{{ include "common.namespace" . }}:8081/sobpmnengine
   msoKey: {{ .Values.mso.msoKey }}
-  config:
-    cadi:
-      aafId: {{ .Values.mso.basicUser }}
   catalog:
     db:
       spring:

diff --git a/kubernetes/so/components/so-openstack-adapter/values.yaml b/kubernetes/so/components/so-openstack-adapter/values.yaml
index 931f470..535b3e6 100755 (executable)
--- a/kubernetes/so/components/so-openstack-adapter/values.yaml
+++ b/kubernetes/so/components/so-openstack-adapter/values.yaml
@@ -61,7 +61,7 @@ secrets:
 #################################################################
 # Application configuration defaults.
 #################################################################
-image: onap/so/openstack-adapter:1.15.1
+image: onap/so/openstack-adapter:1.15.2
 pullPolicy: Always
 
 # Local mariadb galera instance default name
@@ -90,8 +90,9 @@ org:
         bpelauth: D1A67FA93B6A6419132D0F83CC771AF774FD3C60853C50C22C8C6FC5088CC79E9E81EDE9EA39F22B2F66A0068E
 mso:
   msoKey: 07a7159d3bf51a0e53be7a8f89699be7
-  basicUser: poBpmn
-  auth: BEA8637716A7EB617DF472BA6552D22F68C1CB17B0D094D77DDA562F4ADAAC4457CAB848E1A4
+  auth:
+    user: poBpmn
+    password: BEA8637716A7EB617DF472BA6552D22F68C1CB17B0D094D77DDA562F4ADAAC4457CAB848E1A4
   db:
     auth: Basic YnBlbDpwYXNzd29yZDEk
 

diff --git a/kubernetes/so/components/so-request-db-adapter/Chart.yaml b/kubernetes/so/components/so-request-db-adapter/Chart.yaml
index ea27c0c..c7178fd 100755 (executable)
--- a/kubernetes/so/components/so-request-db-adapter/Chart.yaml
+++ b/kubernetes/so/components/so-request-db-adapter/Chart.yaml
@@ -16,7 +16,7 @@
 apiVersion: v2
 description: A Helm chart for request-db-adapter
 name: so-request-db-adapter
-version: 15.1.0
+version: 15.1.1
 
 dependencies:
   - name: common

diff --git a/kubernetes/so/components/so-request-db-adapter/values.yaml b/kubernetes/so/components/so-request-db-adapter/values.yaml
index 80d06dd..8d21cab 100755 (executable)
--- a/kubernetes/so/components/so-request-db-adapter/values.yaml
+++ b/kubernetes/so/components/so-request-db-adapter/values.yaml
@@ -60,7 +60,7 @@ secrets:
 #################################################################
 # Application configuration defaults.
 #################################################################
-image: onap/so/request-db-adapter:1.15.1
+image: onap/so/request-db-adapter:1.15.2
 pullPolicy: Always
 
 # Local mariadb galera instance default name

diff --git a/kubernetes/so/components/so-sdc-controller/Chart.yaml b/kubernetes/so/components/so-sdc-controller/Chart.yaml
index fd0c157..bec23d0 100755 (executable)
--- a/kubernetes/so/components/so-sdc-controller/Chart.yaml
+++ b/kubernetes/so/components/so-sdc-controller/Chart.yaml
@@ -17,7 +17,7 @@ apiVersion: v2
 appVersion: "1.0"
 description: A Helm chart for Kubernetes
 name: so-sdc-controller
-version: 15.1.0
+version: 15.1.1
 
 dependencies:
   - name: common

diff --git a/kubernetes/so/components/so-sdc-controller/values.yaml b/kubernetes/so/components/so-sdc-controller/values.yaml
index 8bfe127..3845c27 100755 (executable)
--- a/kubernetes/so/components/so-sdc-controller/values.yaml
+++ b/kubernetes/so/components/so-sdc-controller/values.yaml
@@ -64,7 +64,7 @@ secrets:
 #################################################################
 # Application configuration defaults.
 #################################################################
-image: onap/so/sdc-controller:1.15.1
+image: onap/so/sdc-controller:1.15.2
 pullPolicy: Always
 
 # Local mariadb galera instance default name

diff --git a/kubernetes/so/components/so-sdnc-adapter/Chart.yaml b/kubernetes/so/components/so-sdnc-adapter/Chart.yaml
index 6a391f1..ce72fe4 100755 (executable)
--- a/kubernetes/so/components/so-sdnc-adapter/Chart.yaml
+++ b/kubernetes/so/components/so-sdnc-adapter/Chart.yaml
@@ -17,7 +17,7 @@ apiVersion: v2
 appVersion: "1.0"
 description: A Helm chart for Kubernetes
 name: so-sdnc-adapter
-version: 15.1.0
+version: 15.1.1
 
 dependencies:
   - name: common

diff --git a/kubernetes/so/components/so-sdnc-adapter/resources/config/overrides/override.yaml b/kubernetes/so/components/so-sdnc-adapter/resources/config/overrides/override.yaml
index 4bbd7e7..6e1771f 100755 (executable)
--- a/kubernetes/so/components/so-sdnc-adapter/resources/config/overrides/override.yaml
+++ b/kubernetes/so/components/so-sdnc-adapter/resources/config/overrides/override.yaml
@@ -20,15 +20,14 @@ server:
     port: {{ index .Values.containerPort }}
 mso:
     msoKey: ${MSO_KEY}
-    auth: ${MSO_AUTH}
+    auth:
+        user: so@so.onap.org
+        password: ${MSO_AUTH}
     async:
         core-pool-size: 50
         max-pool-size: 50
         queue-capacity: 500
     logPath: ./logs/sdnc
-    config:
-        cadi:
-          aafId: so@so.onap.org
     catalog:
         db:
           spring:

diff --git a/kubernetes/so/components/so-sdnc-adapter/values.yaml b/kubernetes/so/components/so-sdnc-adapter/values.yaml
index 71b58f1..22fe582 100755 (executable)
--- a/kubernetes/so/components/so-sdnc-adapter/values.yaml
+++ b/kubernetes/so/components/so-sdnc-adapter/values.yaml
@@ -67,7 +67,7 @@ secrets:
 #################################################################
 # Application configuration defaults.
 #################################################################
-image: onap/so/sdnc-adapter:1.15.1
+image: onap/so/sdnc-adapter:1.15.2
 pullPolicy: Always
 
 org:

diff --git a/kubernetes/so/values.yaml b/kubernetes/so/values.yaml
index b35cae3..7e9261c 100755 (executable)
--- a/kubernetes/so/values.yaml
+++ b/kubernetes/so/values.yaml
@@ -159,7 +159,7 @@ dbCreds:
   userName: so_user
   adminName: so_admin
 
-image: onap/so/api-handler-infra:1.15.1
+image: onap/so/api-handler-infra:1.15.2
 
 server:
   aai: