8 files changed, 43 insertions, 28 deletions
diff --git a/kubernetes/aaf/charts/aaf-cass/values.yaml b/kubernetes/aaf/charts/aaf-cass/values.yaml
index 3d9f21e297..e347df2e95 100644
--- a/kubernetes/aaf/charts/aaf-cass/values.yaml
+++ b/kubernetes/aaf/charts/aaf-cass/values.yaml
@@ -34,7 +34,7 @@ liveness:
   enabled: true
   port: tcp-cql
 
-image: onap/aaf/aaf_cass:2.1.20
+image: onap/aaf/aaf_cass:2.1.22
 
 config:
   cluster_name: osaaf
diff --git a/kubernetes/aaf/charts/aaf-hello/values.yaml b/kubernetes/aaf/charts/aaf-hello/values.yaml
index aeb659082d..786f0b03a5 100644
--- a/kubernetes/aaf/charts/aaf-hello/values.yaml
+++ b/kubernetes/aaf/charts/aaf-hello/values.yaml
@@ -41,7 +41,7 @@ aaf_init:
 
 replicaCount: 0
 
-image: onap/aaf/aaf_hello:2.1.20
+image: onap/aaf/aaf_hello:2.1.22
 
 service:
   name: aaf-hello
diff --git a/kubernetes/aaf/charts/aaf-locate/values.yaml b/kubernetes/aaf/charts/aaf-locate/values.yaml
index 47b2f205e5..01a5ab158a 100644
--- a/kubernetes/aaf/charts/aaf-locate/values.yaml
+++ b/kubernetes/aaf/charts/aaf-locate/values.yaml
@@ -62,18 +62,18 @@ ingress:
 
 # Configure resource requests and limits
 resources:
-  small:
-    limits:
-      cpu: 100m
-      memory: 320Mi
-    requests:
-      cpu: 1m
-      memory: 210Mi
-  large:
-    limits:
-      cpu: 400m
-      memory: 1Gi
-    requests:
-      cpu: 40m
-      memory: 500Mi
-  unlimited: {}
+ small:
+   limits:
+     cpu: 500m
+     memory: 320Mi
+   requests:
+     cpu: 1m
+     memory: 210Mi
+ large:
+   limits:
+     cpu: 400m
+     memory: 1Gi
+   requests:
+     cpu: 40m
+     memory: 500Mi
+ unlimited: {}
diff --git a/kubernetes/aaf/charts/aaf-sms/resources/config/osdf.json b/kubernetes/aaf/charts/aaf-sms/resources/config/osdf.json
index 7666ff3077..add0808701 100644
--- a/kubernetes/aaf/charts/aaf-sms/resources/config/osdf.json
+++ b/kubernetes/aaf/charts/aaf-sms/resources/config/osdf.json
@@ -5,8 +5,8 @@
             {
                 "name": "so",
                 "values": {
-                    "UserName": "",
-                    "Password": ""
+                    "UserName": "${SO_USER}",
+                    "Password": "${SO_PASS}"
                 }
             },
             {
diff --git a/kubernetes/aaf/charts/aaf-sms/templates/job.yaml b/kubernetes/aaf/charts/aaf-sms/templates/job.yaml
index 7a17b917ae..bb145ef3f8 100644
--- a/kubernetes/aaf/charts/aaf-sms/templates/job.yaml
+++ b/kubernetes/aaf/charts/aaf-sms/templates/job.yaml
@@ -51,6 +51,7 @@ spec:
            export CONFIG_DB_PASS=${CONFIG_DB_PASS_PLAIN};
            export OSDF_PCI_OPT_PASS=${OSDF_PCI_OPT_PASS_PLAIN};
            export OSDF_OPT_ENGINE_PASS=${OSDF_OPT_ENGINE_PASS_PLAIN};
+           export SO_PASS=${SO_PASS_PLAIN};
            cd /config-input;
            for PFILE in `find . -not -type d | grep -v -F ..`; do
              envsubst <${PFILE} >/config/${PFILE};
@@ -125,6 +126,12 @@ spec:
           {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "osdf-opt-engine-creds" "key" "login") | indent 10 }}
         - name: OSDF_OPT_ENGINE_PASS_PLAIN
           {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "osdf-opt-engine-creds" "key" "password") | indent 10 }}
+
+        - name: SO_USER
+          {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "so-creds" "key" "login") | indent 10 }}
+        - name: SO_PASS_PLAIN
+          {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "so-creds" "key" "password") | indent 10 }}
+
         volumeMounts:
         - mountPath: /config-input
           name: {{ include "common.name" . }}-preload-input
diff --git a/kubernetes/aaf/charts/aaf-sms/values.yaml b/kubernetes/aaf/charts/aaf-sms/values.yaml
index 12312c5430..7e0aa5c282 100644
--- a/kubernetes/aaf/charts/aaf-sms/values.yaml
+++ b/kubernetes/aaf/charts/aaf-sms/values.yaml
@@ -156,6 +156,11 @@ secrets:
     login: '{{ .Values.oofCreds.osdfOptEngineUsername }}'
     password: '{{ .Values.oofCreds.osdfOptEnginePassword }}'
     passwordPolicy: required
+  - uid: so-creds
+    type: basicAuth
+    login: '{{ .Values.oofCreds.soUsername }}'
+    password: '{{ .Values.oofCreds.soPassword }}'
+    passwordPolicy: required
 
 oofCreds:
   aaiUsername: oof@oof.onap.org
@@ -173,11 +178,11 @@ oofCreds:
   aafUsername: aaf_admin@people.osaaf.org
   aafPassword: demo123456!
 
-  policyPlatUsername: testpdp
-  policyPlatPassword: alpha123
+  policyPlatUsername: healthcheck
+  policyPlatPassword: zb!XztG34
 
-  policyCliUsername: python
-  policyCliPassword: test
+  policyCliUsername: healthcheck
+  policyCliPassword: zb!XztG34
 
   osdfPlacementUsername: test
   osdfPlacementPassword: testpwd
@@ -200,6 +205,9 @@ oofCreds:
   osdfOptEngineUsername: opt_test
   osdfOptEnginePassword: opt_testpwd
 
+  soUsername: apihBpmn
+  soPassword: password1$
+
 # Configure resource requests and limits
 resources:
   small:
diff --git a/kubernetes/aaf/charts/aaf-sshsm/charts/aaf-sshsm-testca/values.yaml b/kubernetes/aaf/charts/aaf-sshsm/charts/aaf-sshsm-testca/values.yaml
index 3f7782c604..dd04c93bd7 100644
--- a/kubernetes/aaf/charts/aaf-sshsm/charts/aaf-sshsm-testca/values.yaml
+++ b/kubernetes/aaf/charts/aaf-sshsm/charts/aaf-sshsm-testca/values.yaml
@@ -46,8 +46,8 @@ flavor: small
 resources:
   small:
     limits:
-      cpu: 20m
-      memory: 50Mi
+      cpu: 50m
+      memory: 100Mi
     requests:
       cpu: 10m
       memory: 10Mi
diff --git a/kubernetes/aaf/values.yaml b/kubernetes/aaf/values.yaml
index bedf243639..cc97e9854b 100644
--- a/kubernetes/aaf/values.yaml
+++ b/kubernetes/aaf/values.yaml
@@ -42,10 +42,10 @@ global:
 
   aaf:
     readiness: false
-    image: onap/aaf/aaf_core:2.1.20
+    image: onap/aaf/aaf_core:2.1.22
     aaf_env: "DEV"
     public_fqdn: "aaf.osaaf.org"
-    aaf_release: "El Alto"
+    aaf_release: "Frankfurt"
   # DUBLIN ONLY - for M4 compatibility with Casablanca
   #  aaf_locator_name: "public.%NS.%N"
   #  aaf_locator_name_oom: "%NS.%N"
@@ -57,7 +57,7 @@ global:
     cadi_x509_issuers: "CN=intermediateCA_1, OU=OSAAF, O=ONAP, C=US:CN=intermediateCA_7, OU=OSAAF, O=ONAP, C=US"
 
     config:
-      image: onap/aaf/aaf_config:2.1.20
+      image: onap/aaf/aaf_config:2.1.22
 
     service:
       fqdn: "aaf-service"