Add roadmap, fix manifests, improve hack scripts

This commit is contained in:
Fabian Reinartz
2016-10-24 11:55:51 +02:00
parent 79ed777dea
commit 7b92c0289a
11 changed files with 46 additions and 36 deletions

View File

@@ -20,7 +20,4 @@ spec:
memory: 50Mi
limits:
cpu: 200m
memory: 100Mi
imagePullSecrets:
- name: coreos-quay
memory: 100Mi

View File

@@ -20,7 +20,4 @@ spec:
memory: 50Mi
limits:
cpu: 200m
memory: 100Mi
imagePullSecrets:
- name: coreos-quay
memory: 100Mi

View File

@@ -12,4 +12,5 @@ spec:
protocol: TCP
targetPort: web
selector:
prometheus.coreos.com: prometheus-frontend
prometheus.coreos.com/type: prometheus
prometheus.coreos.com/name: prometheus-frontend

View File

@@ -54,6 +54,4 @@ spec:
- name: grafana-dashboards
configMap:
name: grafana-dashboards
imagePullSecrets:
- name: coreos-quay

View File

@@ -7,11 +7,11 @@ metadata:
annotations:
prometheus.io/scrape: 'true'
spec:
type: NodePort
ports:
- name: web
port: 3000
protocol: TCP
nodePort: 30902
selector:
app: grafana
type: NodePort
app: grafana

View File

@@ -7,10 +7,6 @@ data:
global:
evaluation_interval: 30s
# Add your etcd scrape config here. We cannot default here as etcd is a
# prerequisite for Kubernetes.
# TODO(fabxc): potentially make this configurable via KPM in the future.
scrape_configs:
- job_name: kubelets
scrape_interval: 20s

View File

@@ -11,4 +11,5 @@ spec:
protocol: TCP
targetPort: web
selector:
prometheus.coreos.com: prometheus-k8s
prometheus.coreos.com/type: prometheus
prometheus.coreos.com/name: prometheus-k8s