Merge "[AAI] Service monitor for scraping prometheus metrics"

[oom.git] / kubernetes / sdnc / values.yaml

diff --git a/kubernetes/sdnc/values.yaml b/kubernetes/sdnc/values.yaml
index 5d2f5be..1fd5bf3 100644 (file)
--- a/kubernetes/sdnc/values.yaml
+++ b/kubernetes/sdnc/values.yaml
@@ -210,7 +210,7 @@ certificates:
 # application images
 
 pullPolicy: Always
-image: onap/sdnc-image:2.2.5
+image: onap/sdnc-image:2.4.1
 
 # flag to enable debugging - application support required
 debugEnabled: false
@@ -386,8 +386,7 @@ certInitializer:
   cadi_longitude: "-72.0"
   credsPath: /opt/app/osaaf/local
   aaf_add_config: >
-    cd /opt/app/osaaf/local;
-    /opt/app/aaf_config/bin/agent.sh local showpass {{.Values.fqi}} {{ .Values.fqdn }} | grep cadi_keystore_password= | cut -d= -f 2 > {{ .Values.credsPath }}/.pass 2>&1
+    echo "$cadi_keystore_password" > {{ .Values.credsPath }}/.pass 2>&1
 
 # dependency / sub-chart configuration
 network-name-gen:
@@ -486,12 +485,13 @@ dgbuilder:
   ingress:
     enabled: false
     service:
-      - baseaddr: "sdnc-dgbuilder"
+      - baseaddr: "sdnc-dgbuilder-ui"
         name: "sdnc-dgbuilder"
         port: 3000
-      - baseaddr: "sdnc-web-service"
+      - baseaddr: "sdnc-web-service-api"
         name: "sdnc-web-service"
         port: 8443
+        plain_port: 8080
     config:
       ssl: "redirect"
 
@@ -543,7 +543,7 @@ readiness:
 service:
   type: NodePort
   name: sdnc
-  portName: sdnc
+  portName: http
   internalPort: 8181
   internalPort2: 8101
   internalPort3: 8080
@@ -570,7 +570,7 @@ service:
   geoNodePort5: 65
   geoNodePort6: 66
 
-  callHomePort: 6666
+  callHomePort: 4334
   callHomeNodePort: 66
 
 ## Persist data to a persitent volume
@@ -617,9 +617,10 @@ certpersistence:
 ingress:
   enabled: false
   service:
-    - baseaddr: "sdnc.api"
+    - baseaddr: "sdnc-api"
       name: "sdnc"
       port: 8443
+      plain_port: 8282
   config:
     ssl: "redirect"