Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update heapster version to v0.10.0 #6331

Merged
merged 1 commit into from
Apr 2, 2015
Merged

Update heapster version to v0.10.0 #6331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cluster/addons/cluster-monitoring/grafana-service.yaml
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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"
2 changes: 1 addition & 1 deletion cluster/addons/cluster-monitoring/v1beta3/grafana-service.yaml
View file
Open in desktop
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
2 changes: 1 addition & 1 deletion cluster/addons/cluster-monitoring/v1beta3/heapster-controller.yaml
View file
Open in desktop
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
23 changes: 5 additions & 18 deletions cluster/addons/cluster-monitoring/v1beta3/influxdb-grafana-controller.yaml
View file
Open in desktop
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'