summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSrivahni <srivahni.chivukula@intel.com>2019-10-14 14:35:11 -0700
committerSrivahni <srivahni.chivukula@intel.com>2019-10-14 14:52:05 -0700
commit3289af42fd3af32fd07c565d072c65743249ebce (patch)
tree9ce0f03e1150c0ffec10bec385cc36907f79f82e
parent9ad7d878dd3e5817fec67cceb6cccc298083a7c1 (diff)
Change NodePort to ClusterIP in coll, promOper pkg
Issue-ID: ONAPARC-393 Signed-off-by: Srivahni <srivahni.chivukula@intel.com> Change-Id: Ica0be8d255074b78dede3fd3b0045f41fde02136
-rw-r--r--vnfs/DAaaS/deploy/collection/charts/cadvisor/templates/service.yaml6
-rw-r--r--vnfs/DAaaS/deploy/collection/charts/cadvisor/values.yaml4
-rw-r--r--vnfs/DAaaS/deploy/collection/charts/prometheus/values.yaml5
-rw-r--r--vnfs/DAaaS/deploy/operator/charts/prometheus-operator/values.yaml8
4 files changed, 12 insertions, 11 deletions
diff --git a/vnfs/DAaaS/deploy/collection/charts/cadvisor/templates/service.yaml b/vnfs/DAaaS/deploy/collection/charts/cadvisor/templates/service.yaml
index a8a932d1..c52eb22d 100644
--- a/vnfs/DAaaS/deploy/collection/charts/cadvisor/templates/service.yaml
+++ b/vnfs/DAaaS/deploy/collection/charts/cadvisor/templates/service.yaml
@@ -22,8 +22,8 @@ metadata:
app: cadvisor
release: {{ .Release.Name }}
spec:
- type: NodePort
- externalTrafficPolicy: Local
+ type: ClusterIP
+ #externalTrafficPolicy: Local
selector:
{{ include "rangeskipempty" .Values.cadvisor_prometheus.service.selector | indent 4 }}
ports:
@@ -33,5 +33,5 @@ spec:
{{- end }}
protocol: TCP
port: {{ .Values.cadvisor_prometheus.service.port }}
- nodePort: {{ .Values.global.nodePortPrefix }}{{ .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/deploy/collection/charts/cadvisor/values.yaml b/vnfs/DAaaS/deploy/collection/charts/cadvisor/values.yaml
index a17c3dd5..345b2281 100644
--- a/vnfs/DAaaS/deploy/collection/charts/cadvisor/values.yaml
+++ b/vnfs/DAaaS/deploy/collection/charts/cadvisor/values.yaml
@@ -14,9 +14,9 @@ resources: {}
# lines, adjust them as necessary, and remove the curly braces after 'resources:'.
cadvisor_prometheus:
service:
- type: NodePort
+ type: ClusterIP
port: 80
- nodePort: 91
+ #nodePort: 91
targetPort: 8080
selector:
app: cadvisor
diff --git a/vnfs/DAaaS/deploy/collection/charts/prometheus/values.yaml b/vnfs/DAaaS/deploy/collection/charts/prometheus/values.yaml
index b3e685c5..c939af4b 100644
--- a/vnfs/DAaaS/deploy/collection/charts/prometheus/values.yaml
+++ b/vnfs/DAaaS/deploy/collection/charts/prometheus/values.yaml
@@ -40,6 +40,7 @@ prometheus:
resources: {}
service:
+ type: ClusterIP
annotations: {}
labels: {}
clusterIP: ""
@@ -55,7 +56,7 @@ prometheus:
## Port to expose on each node
## Only used if service.type is 'NodePort'
##
- nodePort: 90
+ # nodePort: 90
## Loadbalancer IP
## Only use if service.type is "loadbalancer"
@@ -63,7 +64,7 @@ prometheus:
loadBalancerSourceRanges: []
## Service type
##
- type: NodePort
+ #type: NodePort
sessionAffinity: ""
m3db:
diff --git a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/values.yaml b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/values.yaml
index fc0bc243..23841a48 100644
--- a/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/values.yaml
+++ b/vnfs/DAaaS/deploy/operator/charts/prometheus-operator/values.yaml
@@ -162,7 +162,7 @@ alertmanager:
## Port to expose on each node
## Only used if service.type is 'NodePort'
##
- nodePort: 30903
+ #nodePort: 30903
## List of IP addresses at which the Prometheus server service is available
## Ref: https://kubernetes.io/docs/user-guide/services/#external-ips
##
@@ -567,7 +567,7 @@ prometheusOperator:
## Port to expose on each node
## Only used if service.type is 'NodePort'
##
- nodePort: 30080
+ #nodePort: 30080
## Loadbalancer IP
@@ -579,7 +579,7 @@ prometheusOperator:
## Service type
## NodepPort, ClusterIP, loadbalancer
##
- type: NodePort
+ type: ClusterIP
## List of IP addresses at which the Prometheus server service is available
## Ref: https://kubernetes.io/docs/user-guide/services/#external-ips
@@ -734,7 +734,7 @@ prometheus:
loadBalancerSourceRanges: []
## Service type
##
- type: NodePort
+ type: ClusterIP
sessionAffinity: ""