github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 06:27:05 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #7626 from crossorigin/heapster-0.11.0

Browse Source 
bump heapster to v0.11.0 and grafana to v0.7.0
This commit is contained in:
Vish Kannan 2015-05-01 14:24:25 -07:00
commit 3cc53127de
4 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cluster/addons/cluster-monitoring/heapster-controller.yaml
View File

@ -12,14 +12,12 @@ desiredState:
id: monitoring-heapster
containers:
- name: heapster
image: gcr.io/google_containers/heapster:v0.10.0
image: gcr.io/google_containers/heapster:v0.11.0
env:
- name: "INFLUXDB_HOST"
value: "monitoring-influxdb"
- name: "SINK"
value: "influxdb"
- name: "FLAGS"
value: "--kubelet_port=10255"
volumeMounts:
- name: ssl-certs
mountPath: /etc/ssl/certs

2
cluster/addons/cluster-monitoring/influxdb-grafana-controller.yaml
View File

@ -22,7 +22,7 @@ desiredState:
- containerPort: 8086
hostPort: 8086
- name: grafana
image: gcr.io/google_containers/heapster_grafana:v0.6
image: gcr.io/google_containers/heapster_grafana:v0.7
env:
- name: "INFLUXDB_EXTERNAL_URL"
value: '/api/v1beta1/proxy/services/monitoring-grafana/db/'

6
cluster/addons/cluster-monitoring/v1beta3/heapster-controller.yaml
View File

@ -16,15 +16,13 @@ spec:
kubernetes.io/cluster-service: "true"
spec:
containers:
- image: gcr.io/google_containers/heapster:v0.10.0
- image: gcr.io/google_containers/heapster:v0.11.0
name: heapster
env:
- name: "INFLUXDB_HOST"
value: "monitoring-influxdb"
value: "http://monitoring-influxdb"
- name: "SINK"
value: "influxdb"
- name: "FLAGS"
value: "--kubelet_port=10255"
volumeMounts:
- name: ssl-certs
mountPath: /etc/ssl/certs

2
cluster/addons/cluster-monitoring/v1beta3/influxdb-grafana-controller.yaml
View File

@ -24,7 +24,7 @@ spec:
- containerPort: 8086
hostPort: 8086
- name: grafana
image: gcr.io/google_containers/heapster_grafana:v0.6
image: gcr.io/google_containers/heapster_grafana:v0.7
env:
- name: "INFLUXDB_EXTERNAL_URL"
value: '/api/v1beta1/proxy/services/monitoring-grafana/db/'