github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-22 11:21:47 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #35510 from Crassirostris/heapster-coreos-upate

Browse Source 
Automatic merge from submit-queue

Update heapster for coreos configuration

Updated heapster in coreos configurations to the latest version

@piosz
This commit is contained in:
Kubernetes Submit Queue 2016-10-25 07:31:30 -07:00 committed by GitHub
commit 0dc983a4c0
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cluster/gce/coreos/kube-manifests/addons/cluster-monitoring/google/heapster-controller.yaml
View File

@ -20,7 +20,7 @@ spec:
version: v1.1.0 version: v1.1.0
spec: spec:
containers: containers:
- image: gcr.io/google_containers/heapster:v1.1.0 - image: gcr.io/google_containers/heapster:v1.2.0
name: heapster name: heapster
resources: resources:
# keep request = limit to keep this container in guaranteed class # keep request = limit to keep this container in guaranteed class
@ -41,7 +41,7 @@ spec:
- name: usrsharecacerts - name: usrsharecacerts
mountPath: /usr/share/ca-certificates mountPath: /usr/share/ca-certificates
readOnly: true readOnly: true
- image: gcr.io/google_containers/heapster:v1.1.0 - image: gcr.io/google_containers/heapster:v1.2.0
name: eventer name: eventer
resources: resources:
# keep request = limit to keep this container in guaranteed class # keep request = limit to keep this container in guaranteed class

4
cluster/gce/coreos/kube-manifests/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml
View File

@ -20,7 +20,7 @@ spec:
version: v1.1.0 version: v1.1.0
spec: spec:
containers: containers:
- image: gcr.io/google_containers/heapster:v1.1.0 - image: gcr.io/google_containers/heapster:v1.2.0
name: heapster name: heapster
resources: resources:
# keep request = limit to keep this container in guaranteed class # keep request = limit to keep this container in guaranteed class
@ -42,7 +42,7 @@ spec:
- name: usrsharecacerts - name: usrsharecacerts
mountPath: /usr/share/ca-certificates mountPath: /usr/share/ca-certificates
readOnly: true readOnly: true
- image: gcr.io/google_containers/heapster:v1.1.0 - image: gcr.io/google_containers/heapster:v1.2.0
name: eventer name: eventer
resources: resources:
# keep request = limit to keep this container in guaranteed class # keep request = limit to keep this container in guaranteed class

4
cluster/gce/coreos/kube-manifests/addons/cluster-monitoring/influxdb/heapster-controller.yaml
View File

@ -20,7 +20,7 @@ spec:
version: v1.1.0 version: v1.1.0
spec: spec:
containers: containers:
- image: gcr.io/google_containers/heapster:v1.1.0 - image: gcr.io/google_containers/heapster:v1.2.0
name: heapster name: heapster
resources: resources:
# keep request = limit to keep this container in guaranteed class # keep request = limit to keep this container in guaranteed class
@ -34,7 +34,7 @@ spec:
- /heapster - /heapster
- --source=kubernetes.summary_api:'' - --source=kubernetes.summary_api:''
- --sink=influxdb:http://monitoring-influxdb:8086 - --sink=influxdb:http://monitoring-influxdb:8086
- image: gcr.io/google_containers/heapster:v1.1.0 - image: gcr.io/google_containers/heapster:v1.2.0
name: eventer name: eventer
resources: resources:
# keep request = limit to keep this container in guaranteed class # keep request = limit to keep this container in guaranteed class

2
cluster/gce/coreos/kube-manifests/addons/cluster-monitoring/standalone/heapster-controller.yaml
View File

@ -20,7 +20,7 @@ spec:
version: v1.1.0 version: v1.1.0
spec: spec:
containers: containers:
- image: gcr.io/google_containers/heapster:v1.1.0 - image: gcr.io/google_containers/heapster:v1.2.0
name: heapster name: heapster
resources: resources:
# keep request = limit to keep this container in guaranteed class # keep request = limit to keep this container in guaranteed class