diff options
| author |   Mike Elliott <mike.elliott@amdocs.com> | 2018-12-20 20:03:19 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-12-20 20:03:19 +0000 |
| commit | 84c242e22e45c8bf63c0bcde68e56fa6c4a2344d (patch) | |
| tree | e7fba08493ef73dc8d15a9815d894b01b1dc48ae | |
| parent | edb5d8299738142f4083745abddf49cba3aa69ed (diff) | |
| parent | c07e737bdf497431e2573ff11067e87207da157d (diff) | |
Merge "Fix OOM for Network Discovery"
| -rw-r--r--[-rwxr-xr-x] | kubernetes/pomba/charts/pomba-contextaggregator/resources/config/builders/ndcb.properties (renamed from kubernetes/pomba/charts/pomba-contextaggregator/resources/config/future-builders/ndcb.properties) | 0 | ||||
| -rw-r--r-- | kubernetes/pomba/charts/pomba-networkdiscovery/templates/service.yaml | 3 | ||||
| -rw-r--r-- | kubernetes/pomba/charts/pomba-networkdiscovery/values.yaml | 8 | ||||
| -rw-r--r-- | kubernetes/pomba/charts/pomba-networkdiscoveryctxbuilder/values.yaml | 2 |
4 files changed, 5 insertions, 8 deletions
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 index f07cb65c31..f07cb65c31 100755..100644 --- a/kubernetes/pomba/charts/pomba-contextaggregator/resources/config/future-builders/ndcb.properties +++ b/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 2b54defa4e..913a2d8eaf 100644 --- a/kubernetes/pomba/charts/pomba-networkdiscovery/templates/service.yaml +++ b/kubernetes/pomba/charts/pomba-networkdiscovery/templates/service.yaml @@ -27,8 +27,7 @@ spec: ports:
{{if eq .Values.service.type "NodePort" -}}
- port: {{ .Values.service.externalPort }}
- #Example internal target port if required
- #targetPort: {{ .Values.service.internalPort }}
+ targetPort: {{ .Values.service.internalPort }}
nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }}
name: {{ .Values.service.portName | default "http" }}
{{- else -}}
diff --git a/kubernetes/pomba/charts/pomba-networkdiscovery/values.yaml b/kubernetes/pomba/charts/pomba-networkdiscovery/values.yaml index 33eb2b82ed..fdc44298e2 100644 --- 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 9e4a8807cb..b45c24b9e9 100644 --- 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 |