aboutsummaryrefslogtreecommitdiffstats
path: root/vnfs
diff options
context:
space:
mode:
authorSrivahni <srivahni.chivukula@intel.com>2019-04-08 11:17:50 -0700
committerSrivahni Chivukula <srivahni.chivukula@intel.com>2019-04-29 18:03:40 +0000
commit05b95b1d9e313c7d0a9de55be98befc6916c4b8f (patch)
treeb4e19d3451beb8fb81a55d30943952e8fffbc03b /vnfs
parent5b1cd4ca88dd979c4b538c41db53031706e8d31b (diff)
Use global nodePortPrefix for cAdvisor
Issue-ID: ONAPARC-393 Change-Id: Id259b12505f899147b833f2b5cdb6ea66f6d560a Signed-off-by: Srivahni <srivahni.chivukula@intel.com>
Diffstat (limited to 'vnfs')
-rw-r--r--vnfs/DAaaS/collection/charts/cadvisor/templates/service.yaml5
-rw-r--r--vnfs/DAaaS/collection/charts/cadvisor/values.yaml2
2 files changed, 5 insertions, 2 deletions
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