From: Sylvain Desbureaux <sylvain.desbureaux@orange.com>
Date: Mon, 4 May 2020 17:05:04 +0000 (+0000)
Subject: Merge "Change ingress hosnames for exposed services"
X-Git-Tag: 6.0.0~91
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=180578d41ed15c8e349faa943fa82bf41a145779;hp=-c;p=oom.git

Merge "Change ingress hosnames for exposed services"
---

180578d41ed15c8e349faa943fa82bf41a145779
diff --combined kubernetes/appc/values.yaml
index dd462e819d,f80bba6948..45a9b4cfa1
--- a/kubernetes/appc/values.yaml
+++ b/kubernetes/appc/values.yaml
@@@ -143,15 -143,6 +143,15 @@@ dgbuilder
    service:
      name: appc-dgbuilder
  
 +  ingress:
 +    enabled: false
 +    service:
 +      - baseaddr: "appc-dgbuilder"
 +        name: "appc-dgbuilder"
 +        port: 3000
 +    config:
 +      ssl: "redirect"
 +
  #passing value to cdt chart. value of nodePort3 will be same as appc.service.nodePort3.
  appc-cdt:
    nodePort3: 11
@@@ -216,7 -207,7 +216,7 @@@ persistence
  ingress:
    enabled: false
    service:
-     - baseaddr: appc
+     - baseaddr: "appc.api"
        name: "appc"
        port: 8443
    config:
diff --combined kubernetes/policy/values.yaml
index 767e7ec9e0,d4371d5d10..f283d9042f
--- a/kubernetes/policy/values.yaml
+++ b/kubernetes/policy/values.yaml
@@@ -67,7 -67,7 +67,7 @@@ secrets
  #################################################################
  # application image
  repository: nexus3.onap.org:10001
 -image: onap/policy-pe:1.6.2
 +image: onap/policy-pe:1.6.3
  mariadb_image: library/mariadb:10
  pullPolicy: Always
  
@@@ -137,6 -137,12 +137,12 @@@ service
  
  ingress:
    enabled: false
+   service:
+     - baseaddr: "policy.api"
+       name: "pap"
+       port: 8443
+   config:
+     ssl: "redirect"
  
  mariadb-galera:
    # mariadb-galera.config and global.mariadb.config must be equals
diff --combined kubernetes/portal/charts/portal-app/values.yaml
index a33bff1d29,beca45e6d7..8d18fd0dbd
--- a/kubernetes/portal/charts/portal-app/values.yaml
+++ b/kubernetes/portal/charts/portal-app/values.yaml
@@@ -37,7 -37,7 +37,7 @@@ pullPolicy: Alway
  
  #AAF local config
  
 -aafURL: https://aaf-service:8100/
 +aafURL: https://aaf-service:8100/authz/
  aafConfig:
    aafDeployFqi: deployer@people.osaaf.org
    aafDeployPass: demo123456!
@@@ -121,7 -121,7 +121,7 @@@ messageRouter
  ingress:
    enabled: false
    service:
-     - baseaddr: portalapp
+     - baseaddr: portal.api
        name: "portal-app"
        port: 8443
    config:
diff --combined kubernetes/portal/charts/portal-sdk/values.yaml
index 96ae9099b0,7318d3f5aa..02104414d6
--- a/kubernetes/portal/charts/portal-sdk/values.yaml
+++ b/kubernetes/portal/charts/portal-sdk/values.yaml
@@@ -37,7 -37,7 +37,7 @@@ image: onap/portal-sdk:3.2.
  pullPolicy: Always
  
  #AAF local config
 -aafURL: https://aaf-service:8100/
 +aafURL: https://aaf-service:8100/authz/
  aafConfig:
    aafDeployFqi: deployer@people.osaaf.org
    aafDeployPass: demo123456!
@@@ -115,7 -115,7 +115,7 @@@ messageRouter
  ingress:
    enabled: false
    service:
-     - baseaddr: portalsdk
+     - baseaddr: portal-sdk
        name: "portal-sdk"
        port: 8443
    config:
diff --combined kubernetes/sdnc/values.yaml
index 27caef3c7f,96100d5079..f0d70e2c33
--- a/kubernetes/sdnc/values.yaml
+++ b/kubernetes/sdnc/values.yaml
@@@ -289,15 -289,6 +289,15 @@@ dgbuilder
      name: sdnc-dgbuilder
      nodePort: "03"
  
 +  ingress:
 +    enabled: false
 +    service:
 +      - baseaddr: "sdnc-dgbuilder"
 +        name: "sdnc-dgbuilder"
 +        port: 3000
 +    config:
 +      ssl: "redirect"
 +
  # local elasticsearch cluster
  localElasticCluster: true
  elasticsearch:
@@@ -418,7 -409,7 +418,7 @@@ certpersistence
  ingress:
    enabled: false
    service:
-     - baseaddr: "sdnc"
+     - baseaddr: "sdnc.api"
        name: "sdnc"
        port: 8443
    config:
diff --combined kubernetes/so/values.yaml
index 6cbfc74b52,61f8a0a011..feb0017979
--- a/kubernetes/so/values.yaml
+++ b/kubernetes/so/values.yaml
@@@ -211,7 -211,7 +211,7 @@@ mariadb-galera
  ingress:
    enabled: false
    service:
-     - baseaddr: "so"
+     - baseaddr: "so.api"
        name: "so"
        port: 8080
    config:
@@@ -407,28 -407,6 +407,28 @@@ so-vfc-adapter
        requestDb:
          auth: Basic YnBlbDpwYXNzd29yZDEk
  
 +so-nssmf-adapter:
 +  certSecret: *so-certs
 +  db:
 +    <<: *dbSecrets
 +  aaf:
 +    auth:
 +      username: so@so.onap.org
 +      password: 8DB1C939BFC6A35C3832D0E52E452D0E05AE2537AF142CECD125FF827C05A972FDD0F4700547DA
 +  aai:
 +    auth: 2A11B07DB6214A839394AA1EC5844695F5114FC407FF5422625FB00175A3DCB8A1FF745F22867EFA72D5369D599BBD88DA8BED4233CF5586
 +  mso:
 +    key: 07a7159d3bf51a0e53be7a8f89699be7
 +    config:
 +      cadi:
 +        aafId: so@so.onap.org
 +        aafPassword: enc:EME-arXn2lx8PO0f2kEtyK7VVGtAGWavXorFoxRmPO9
 +        apiEnforcement: org.onap.so.nssmfAdapterPerm
 +        noAuthn: /manage/health
 +    adapters:
 +      requestDb:
 +        auth: Basic YnBlbDpwYXNzd29yZDEk
 +
  so-vnfm-adapter:
    certSecret: *so-certs
    aaf: