From 05b95b1d9e313c7d0a9de55be98befc6916c4b8f Mon Sep 17 00:00:00 2001 From: Srivahni Date: Mon, 8 Apr 2019 11:17:50 -0700 Subject: [PATCH] Use global nodePortPrefix for cAdvisor Issue-ID: ONAPARC-393 Change-Id: Id259b12505f899147b833f2b5cdb6ea66f6d560a Signed-off-by: Srivahni --- vnfs/DAaaS/collection/charts/cadvisor/templates/service.yaml | 5 ++++- vnfs/DAaaS/collection/charts/cadvisor/values.yaml | 2 +- 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 -- 2.16.6