Merge "Fix OOM for Network Discovery"

diff --git a/kubernetes/pomba/charts/pomba-contextaggregator/resources/config/future-builders/ndcb.properties b/kubernetes/pomba/charts/pomba-contextaggregator/resources/config/builders/ndcb.properties
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from kubernetes/pomba/charts/pomba-contextaggregator/resources/config/future-builders/ndcb.properties
rename to kubernetes/pomba/charts/pomba-contextaggregator/resources/config/builders/ndcb.properties

diff --git a/kubernetes/pomba/charts/pomba-networkdiscovery/templates/service.yaml b/kubernetes/pomba/charts/pomba-networkdiscovery/templates/service.yaml
index 2b54def..913a2d8 100644 (file)
--- a/kubernetes/pomba/charts/pomba-networkdiscovery/templates/service.yaml
+++ b/kubernetes/pomba/charts/pomba-networkdiscovery/templates/service.yaml
@@ -27,8 +27,7 @@ spec:
   ports:\r
     {{if eq .Values.service.type "NodePort" -}}\r
     - port: {{ .Values.service.externalPort }}\r
-      #Example internal target port if required\r
-      #targetPort: {{ .Values.service.internalPort }}\r
+      targetPort: {{ .Values.service.internalPort }}\r
       nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }}\r
       name: {{ .Values.service.portName | default "http" }}\r
     {{- else -}}\r

diff --git a/kubernetes/pomba/charts/pomba-networkdiscovery/values.yaml b/kubernetes/pomba/charts/pomba-networkdiscovery/values.yaml
index 33eb2b8..fdc4429 100644 (file)
--- a/kubernetes/pomba/charts/pomba-networkdiscovery/values.yaml
+++ b/kubernetes/pomba/charts/pomba-networkdiscovery/values.yaml
@@ -24,7 +24,7 @@ global:
 #################################################################
 # application image
 repository: nexus3.onap.org:10001
-image:  onap/network-discovery:latest
+image:  onap/network-discovery:1.4.1-latest
 pullPolicy: Always
 
 # flag to enable debugging - application support required
@@ -86,12 +86,10 @@ service:
   #service being defined.
   type: NodePort
   name: pomba-networkdiscovery  
-  externalPort: 8443
+  externalPort: 9531
   internalPort: 8443
   nodePort: 99
-#  nodePort: <replace with unused node port suffix eg. 23>
-  # optional port name override - default can be defined in service.yaml
-  #portName: http
+  portName: https
 
 ingress:
   enabled: false

diff --git a/kubernetes/pomba/charts/pomba-networkdiscoveryctxbuilder/values.yaml b/kubernetes/pomba/charts/pomba-networkdiscoveryctxbuilder/values.yaml
index 9e4a880..b45c24b 100644 (file)
--- a/kubernetes/pomba/charts/pomba-networkdiscoveryctxbuilder/values.yaml
+++ b/kubernetes/pomba/charts/pomba-networkdiscoveryctxbuilder/values.yaml
@@ -24,7 +24,7 @@ global:
 #################################################################
 # application image
 repository: nexus3.onap.org:10001
-image:  onap/pomba-network-discovery-context-builder:1.3.1
+image:  onap/pomba-network-discovery-context-builder:1.4.0-SNAPSHOT-latest
 pullPolicy: Always
 
 # flag to enable debugging - application support required