Merge "[SO] Correct connection configuration to sdnc"

diff --combined kubernetes/so/charts/so-bpmn-infra/values.yaml
index 1d2c5f1,ce9b6c8..b04343f
--- 1/kubernetes/so/charts/so-bpmn-infra/values.yaml
--- 2/kubernetes/so/charts/so-bpmn-infra/values.yaml
+++ b/kubernetes/so/charts/so-bpmn-infra/values.yaml
@@@ -22,6 -22,9 +22,9 @@@ global
    readinessImage: readiness-check:2.0.2
    persistence:
      mountPath: /dockerdata-nfs
+   #This configuration specifies Service and port for SDNC OAM interface
+   sdncOamService: sdnc-oam
+   sdncOamPort: 8282
  
  #################################################################
  # Secrets metaconfig
@@@ -41,20 -44,13 +44,20 @@@ secrets
      login: '{{ .Values.db.adminName }}'
      password: '{{ .Values.db.adminPassword }}'
      passwordPolicy: required
 +  - uid: "so-onap-certs"
 +    externalSecret: '{{ tpl (default "" .Values.certSecret) . }}'
 +    type: generic
 +    filePaths: '{{ .Values.secretsFilePaths }}'
  
 +#secretsFilePaths: |
 +#  - 'my file 1'
 +#  - '{{ include "templateThatGeneratesFileName" . }}'
  
  #################################################################
  # Application configuration defaults.
  #################################################################
  repository: nexus3.onap.org:10001
 -image: onap/so/bpmn-infra:1.5.3
 +image: onap/so/bpmn-infra:1.6.0
  pullPolicy: Always
  
  db:

diff --combined kubernetes/so/charts/so-sdnc-adapter/values.yaml
index a4b2496,fb0e478..42c5d4d
--- 1/kubernetes/so/charts/so-sdnc-adapter/values.yaml
--- 2/kubernetes/so/charts/so-sdnc-adapter/values.yaml
+++ b/kubernetes/so/charts/so-sdnc-adapter/values.yaml
@@@ -22,6 -22,9 +22,9 @@@ global
    readinessImage: readiness-check:2.0.2
    persistence:
      mountPath: /dockerdata-nfs
+   #This configuration specifies Service and port for SDNC OAM interface
+   sdncOamService: sdnc-oam
+   sdncOamPort: 8282
  
  #################################################################
  # Secrets metaconfig
@@@ -39,20 -42,12 +42,20 @@@ secrets
      login: '{{ .Values.db.adminName }}'
      password: '{{ .Values.db.adminPassword }}'
      passwordPolicy: required
 +  - uid: "so-onap-certs"
 +    externalSecret: '{{ tpl (default "" .Values.certSecret) . }}'
 +    type: generic
 +    filePaths: '{{ .Values.secretsFilePaths }}'
 +
 +#secretsFilePaths: |
 +#  - 'my file 1'
 +#  - '{{ include "templateThatGeneratesFileName" . }}'
  
  #################################################################
  # Application configuration defaults.
  #################################################################
  repository: nexus3.onap.org:10001
 -image: onap/so/sdnc-adapter:1.5.3
 +image: onap/so/sdnc-adapter:1.6.0
  pullPolicy: Always
  
  db:

diff --combined kubernetes/so/values.yaml
index 8a83427,eb89f01..4cf991e
--- 1/kubernetes/so/values.yaml
--- 2/kubernetes/so/values.yaml
+++ b/kubernetes/so/values.yaml
@@@ -22,7 -22,6 +22,7 @@@ global
    readinessImage: readiness-check:2.0.2
    loggingRepository: docker.elastic.co
    loggingImage: beats/filebeat:5.5.0
 +  soBaseImage: onap/so/base-image:1.0
    mariadbGalera:
      nameOverride: mariadb-galera
      serviceName: mariadb-galera
@@@ -34,6 -33,9 +34,9 @@@
      localCluster: false
    persistence:
      mountPath: /dockerdata-nfs
+   #This configuration specifies Service and port for SDNC OAM interface
+   sdncOamService: sdnc-oam
+   sdncOamPort: 8282
    #This configuration will run the migration. The configurations are for backing up the data
    #from DB and then restoring it to the present versions preferred DB.
    migration:
@@@ -72,9 -74,6 +75,9 @@@
      certs:
        trustStorePassword: b25hcDRzbw==
        keyStorePassword: c280b25hcA==
 +  certificates:
 +    path: /etc/ssl/certs
 +    share_path: /usr/local/share/ca-certificates/
  
  #################################################################
  # Secrets metaconfig
@@@ -110,13 -109,6 +113,13 @@@ secrets
      login: '{{ .Values.dbCreds.adminName }}'
      password: '{{ .Values.dbCreds.adminPassword }}'
      passwordPolicy: generate
 +  - uid: "so-onap-certs"
 +    name: &so-certs '{{ include "common.release" . }}-so-certs'
 +    externalSecret: '{{ tpl (default "" .Values.certSecret) . }}'
 +    type: generic
 +    filePaths:
 +      - resources/config/certificates/onap-ca.crt
 +      - resources/config/certificates/msb-ca.crt
  
  #################################################################
  # Application configuration defaults.
@@@ -132,7 -124,7 +135,7 @@@ dbCreds
    adminName: so_admin
  
  repository: nexus3.onap.org:10001
 -image: onap/so/api-handler-infra:1.5.3
 +image: onap/so/api-handler-infra:1.6.0
  pullPolicy: Always
  replicaCount: 1
  minReadySeconds: 10
@@@ -152,8 -144,6 +155,8 @@@ updateStrategy
  # Resource Limit flavor -By Default using small
  flavor: small
  # Segregation for Different environment (Small and Large)
 +persistence:
 +  certificatesPath: /certificates
  resources:
    small:
      limits:
@@@ -187,6 -177,7 +190,6 @@@ config
    logstashServiceName: log-ls
    logstashPort: 5044
  
 -
  #Used only if localCluster is enabled. Instantiates SO's own cassandra cluster
  #helm deploy demo local/onap --namespace onap --verbose --set so.enabled=true \
  #                                                       --set so.global.mariadbGalera.localCluster=true \
@@@ -236,7 -227,6 +239,7 @@@ mso
      auth: basic bXNvX2FkbWlufHBhc3N3b3JkMSQ=
  
  so-bpmn-infra:
 +  certSecret: *so-certs
    db:
      <<: *dbSecrets
    cds:
@@@ -272,7 -262,6 +275,7 @@@
          auth: Basic dm5mbTpwYXNzd29yZDEk
  
  so-catalog-db-adapter:
 +  certSecret: *so-certs
    db:
      <<: *dbSecrets
    mso:
@@@ -286,13 -275,7 +289,13 @@@
        db:
          auth: Basic YnBlbDpwYXNzd29yZDEk
  
 +so-monitoring:
 +  certSecret: *so-certs
 +  db:
 +    <<: *dbSecrets
 +
  so-openstack-adapter:
 +  certSecret: *so-certs
    db:
      <<: *dbSecrets
    aaf:
@@@ -321,7 -304,6 +324,7 @@@
        auth: Basic YnBlbDpwYXNzd29yZDEk
  
  so-request-db-adapter:
 +  certSecret: *so-certs
    db:
      <<: *dbSecrets
    mso:
@@@ -336,7 -318,6 +339,7 @@@
          auth: Basic YnBlbDpwYXNzd29yZDEk
  
  so-sdc-controller:
 +  certSecret: *so-certs
    db:
      <<: *dbSecrets
    aai:
@@@ -357,9 -338,7 +360,9 @@@
      asdc-connections:
        asdc-controller1:
          password: 76966BDD3C7414A03F7037264FF2E6C8EEC6C28F2B67F2840A1ED857C0260FEE731D73F47F828E5527125D29FD25D3E0DE39EE44C058906BF1657DE77BF897EECA93BDC07FA64F
 +
  so-sdnc-adapter:
 +  certSecret: *so-certs
    db:
      <<: *dbSecrets
    org:
@@@ -384,11 -363,7 +387,11 @@@
      rest:
        aafEncrypted: 3EDC974C5CD7FE54C47C7490AF4D3B474CDD7D0FFA35A7ACDE3E209631E45F428976EAC0858874F17390A13149E63C90281DD8D20456
  
 +so-ve-vnfm-adapter:
 +  certSecret: *so-certs
 +
  so-vfc-adapter:
 +  certSecret: *so-certs
    db:
      <<: *dbSecrets
    mso:
@@@ -401,9 -376,7 +404,9 @@@
      adapters:
        requestDb:
          auth: Basic YnBlbDpwYXNzd29yZDEk
 +
  so-vnfm-adapter:
 +  certSecret: *so-certs
    aaf:
      auth:
        username: so@so.onap.org
@@@ -423,6 -396,10 +426,6 @@@
          apiEnforcement: org.onap.so.vnfmAdapterPerm
          noAuthn: /manage/health
  
 -so-monitoring:
 -  db:
 -    <<: *dbSecrets
 -
  so-mariadb:
    db:
      rootPasswordExternalSecretLocalDb: *dbRootPassSecretName