summaryrefslogtreecommitdiffstats
path: root/vnfs/DAaaS/collection/charts
diff options
context:
space:
mode:
authorMarco Platania <platania@research.att.com>2019-05-07 14:55:18 +0000
committerGerrit Code Review <gerrit@onap.org>2019-05-07 14:55:18 +0000
commit3afda8117eea2124c7d22b3c50418a17fe412163 (patch)
treea7454b0a434b31020f629b8d31300492b1926b9b /vnfs/DAaaS/collection/charts
parentefe1bac85828cff233167bdaaae7edd26b03e7a4 (diff)
parent05b95b1d9e313c7d0a9de55be98befc6916c4b8f (diff)
Merge "Use global nodePortPrefix for cAdvisor"
Diffstat (limited to 'vnfs/DAaaS/collection/charts')
-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