Skip to content

Commit

Permalink
Merge pull request kubernetes#6331 from vishh/heapster_release
Browse files Browse the repository at this point in the history
Update heapster version to v0.10.0
  • Loading branch information
jszczepkowski committed Apr 2, 2015
2 parents 860257e + e683363 commit a94ffc8
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 38 deletions.
2 changes: 1 addition & 1 deletion cluster/addons/cluster-monitoring/grafana-service.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v1beta1
kind: Service
id: monitoring-grafana
port: 80
containerPort: 80
containerPort: 8080
labels:
name: grafana
kubernetes.io/cluster-service: "true"
Expand Down
2 changes: 1 addition & 1 deletion cluster/addons/cluster-monitoring/heapster-controller.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ desiredState:
id: monitoring-heapster
containers:
- name: heapster
image: gcr.io/google_containers/heapster:v0.9
image: gcr.io/google_containers/heapster:v0.10.0
env:
- name: "INFLUXDB_HOST"
value: "monitoring-influxdb"
Expand Down
21 changes: 5 additions & 16 deletions cluster/addons/cluster-monitoring/influxdb-grafana-controller.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,26 +16,15 @@ desiredState:
containers:
- name: influxdb
image: gcr.io/google_containers/heapster_influxdb:v0.3
ports:
- containerPort: 8083
hostPort: 8083
- containerPort: 8086
hostPort: 8086
- name: grafana
image: gcr.io/google_containers/heapster_grafana:v0.5
image: gcr.io/google_containers/heapster_grafana:v0.6
env:
- name: "HTTP_USER"
value: "admin"
- name: "HTTP_PASS"
value: "**None**"
- name: "INFLUXDB_PROTO"
value: "https"
- name: "INFLUXDB_EXTERNAL_URL"
value: '/api/v1beta1/proxy/services/monitoring-grafana/db/'
- name: "INFLUXDB_HOST"
value: "localhost"
value: 'monitoring-influxdb'
- name: "INFLUXDB_PORT"
value: ""
- name: "KUBERNETES_API_PORT"
value: ""
value: '80'
labels:
name: influxGrafana
kubernetes.io/cluster-service: "true"
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ metadata:
spec:
ports:
- port: 80
targetPort: 80
targetPort: 8080
selector:
name: influxGrafana
kubernetes.io/cluster-service: "true"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ spec:
kubernetes.io/cluster-service: "true"
spec:
containers:
- image: gcr.io/google_containers/heapster:v0.9
- image: gcr.io/google_containers/heapster:v0.10.0
name: heapster
env:
- name: "INFLUXDB_HOST"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,25 +18,12 @@ spec:
containers:
- image: gcr.io/google_containers/heapster_influxdb:v0.3
name: influxdb
ports:
- containerPort: 8083
hostPort: 8083
- containerPort: 8086
hostPort: 8086
- name: grafana
image: gcr.io/google_containers/heapster_grafana:v0.5
ports:
- containerPort: 80
image: gcr.io/google_containers/heapster_grafana:v0.6
env:
- name: "HTTP_USER"
value: "admin"
- name: "HTTP_PASS"
value: "**None**"
- name: "INFLUXDB_PROTO"
value: "https"
- name: "INFLUXDB_EXTERNAL_URL"
value: '/api/v1beta1/proxy/services/monitoring-grafana/db/'
- name: "INFLUXDB_HOST"
value: '"+window.location.hostname+"/api/v1beta1/proxy/services/monitoring-influxdb'
value: 'monitoring-influxdb'
- name: "INFLUXDB_PORT"
value: ""
- name: "KUBERNETES_API_PORT"
value: ""
value: '80'

0 comments on commit a94ffc8

Please sign in to comment.