Merge "[PORTAL] Use common aaf template in portal-app"

diff --combined kubernetes/portal/components/portal-app/values.yaml
index 259a4b7,d118c84..9564723
--- 1/kubernetes/portal/components/portal-app/values.yaml
--- 2/kubernetes/portal/components/portal-app/values.yaml
+++ b/kubernetes/portal/components/portal-app/values.yaml
@@@ -26,7 -26,6 +26,6 @@@ global
    loggingImage: beats/filebeat:5.5.0
    #AAF service
    aafEnabled: true
-   aafAgentImage: onap/aaf/aaf_agent:2.1.20
  
  #################################################################
  # Application configuration defaults.
@@@ -34,36 -33,31 +33,31 @@@
  
  # application image
  repository: nexus3.onap.org:10001
 -image: onap/portal-app:3.2.2
 +image: onap/portal-app:3.2.3
  pullPolicy: Always
  
  #AAF local config
  
  aafURL: https://aaf-service:8100/authz/
- aafConfig:
+ certInitializer:
+   nameOverride: portal-app-cert-initializer
    aafDeployFqi: deployer@people.osaaf.org
    aafDeployPass: demo123456!
    fqdn: portal
    fqi: portal@portal.onap.org
-   publicFqdn: portal.onap.org
+   public_fqdn: portal.onap.org
    cadi_latitude: "38.0"
    cadi_longitude: "-72.0"
    credsPath: /opt/app/osaaf/local
    app_ns: org.osaaf.aaf
    permission_user: 1000
    permission_group: 999
-   addconfig: true
-   secret_uid: &aaf_secret_uid portal-app-aaf-deploy-creds
    keystoreFile: "org.onap.portal.p12"
    truststoreFile: "org.onap.portal.trust.jks"
- 
- secrets:
-   - uid: *aaf_secret_uid
-     type: basicAuth
-     externalSecret: '{{ ternary (tpl (default "" .Values.aafConfig.aafDeployCredsExternalSecret) .) "aafIsDiabled" .Values.global.aafEnabled }}'
-     login: '{{ .Values.aafConfig.aafDeployFqi }}'
-     password: '{{ .Values.aafConfig.aafDeployPass }}'
-     passwordPolicy: required
+   aaf_add_config: >
+     /opt/app/aaf_config/bin/agent.sh;
+     /opt/app/aaf_config/bin/agent.sh local showpass \
+     {{.Values.fqi}} {{ .Values.fqdn }} > {{ .Values.credsPath }}/mycreds.prop
  
  # default number of instances
  replicaCount: 1