From: Marco Platania <platania@research.att.com>
Date: Tue, 7 May 2019 14:55:18 +0000 (+0000)
Subject: Merge "Use global nodePortPrefix for cAdvisor"
X-Git-Tag: 1.4.0~17
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=3afda8117eea2124c7d22b3c50418a17fe412163;hp=efe1bac85828cff233167bdaaae7edd26b03e7a4;p=demo.git

Merge "Use global nodePortPrefix for cAdvisor"
---

diff --git a/vnfs/DAaaS/collection/charts/cadvisor/templates/service.yaml b/vnfs/DAaaS/collection/charts/cadvisor/templates/service.yaml
index f3432499..a8a932d1 100644
--- a/vnfs/DAaaS/collection/charts/cadvisor/templates/service.yaml
+++ b/vnfs/DAaaS/collection/charts/cadvisor/templates/service.yaml
@@ -28,7 +28,10 @@ spec:
 {{ include "rangeskipempty" .Values.cadvisor_prometheus.service.selector | indent 4 }}
   ports:
   - name: cadvisor-prometheus 
+    {{- if eq .Values.cadvisor_prometheus.service.type "NodePort" }}
+    nodePort: {{ .Values.global.nodePortPrefix }}{{ .Values.cadvisor_prometheus.service.nodePort }}
+    {{- end }}
     protocol: TCP
     port: {{ .Values.cadvisor_prometheus.service.port }}
-    nodePort: {{ .Values.cadvisor_prometheus.service.nodePort }}
+    nodePort: {{ .Values.global.nodePortPrefix }}{{ .Values.cadvisor_prometheus.service.nodePort }}
     targetPort: {{ .Values.cadvisor_prometheus.service.targetPort }}
diff --git a/vnfs/DAaaS/collection/charts/cadvisor/values.yaml b/vnfs/DAaaS/collection/charts/cadvisor/values.yaml
index 8d25ba7f..a17c3dd5 100644
--- a/vnfs/DAaaS/collection/charts/cadvisor/values.yaml
+++ b/vnfs/DAaaS/collection/charts/cadvisor/values.yaml
@@ -16,7 +16,7 @@ cadvisor_prometheus:
   service:
     type: NodePort
     port: 80
-    nodePort: 30091
+    nodePort: 91
     targetPort: 8080
     selector:
       app: cadvisor