openstack
/
magnum
Code Issues Proposed changes

Merge "[k8s-fedora-atomic] Use ClusterIP for prometheus service"

This commit is contained in:
Zuul 2019-03-01 02:36:49 +00:00 committed by Gerrit Code Review
parent 57a3b73fa0 2bbfd52abc
commit e256f87d1a
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
magnum/drivers/common/templates/kubernetes/fragments/enable-prometheus-monitoring.sh
View File

@ -197,12 +197,11 @@ metadata:
spec: spec:
selector: selector:
app: prometheus app: prometheus
type: NodePort type: ClusterIP
ports: ports:
- name: prometheus - name: prometheus
protocol: TCP protocol: TCP
port: 9090 port: 9090
nodePort: 30900
--- ---
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta1
kind: Deployment kind: Deployment
@ -307,11 +306,10 @@ metadata:
name: grafana name: grafana
namespace: prometheus-monitoring namespace: prometheus-monitoring
spec: spec:
type: "NodePort" type: ClusterIP
ports: ports:
- port: 3000 - port: 3000
targetPort: 3000 targetPort: 3000
nodePort: 30603
selector: selector:
grafana: "true" grafana: "true"
--- ---

7
releasenotes/notes/k8s-prometheus-clusterip-b191fa163e3f1125.yaml Normal file
View File

@ -0,0 +1,7 @@
---
features:
- |
Use ClusterIP as the default Prometheus service type, because the NodePort
type service has the requirement that extra security group rule is properly
configured. Kubernetes cluster administrator could still change the service
type after the cluster creation.