github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 09:22:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #31770 from kubernetes/revert-31614-bump_pod_nanny_version

Browse Source 
Revert "Bump addon-resizer version in heapster"
This commit is contained in:
Marek Grabowski 2016-08-31 08:53:44 +02:00 committed by GitHub
commit ebe733e469
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/addons/cluster-monitoring/google/heapster-controller.yaml
View File

@ -78,7 +78,7 @@ spec:
- name: ssl-certs
mountPath: /etc/ssl/certs
readOnly: true
- image: gcr.io/google_containers/addon-resizer:1.4
- image: gcr.io/google_containers/addon-resizer:1.3
name: heapster-nanny
resources:
limits:
@ -107,7 +107,7 @@ spec:
- --container=heapster
- --poll-period=300000
- --estimator=exponential
- image: gcr.io/google_containers/addon-resizer:1.4
- image: gcr.io/google_containers/addon-resizer:1.3
name: eventer-nanny
resources:
limits:

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

@ -79,7 +79,7 @@ spec:
- name: ssl-certs
mountPath: /etc/ssl/certs
readOnly: true
- image: gcr.io/google_containers/addon-resizer:1.4
- image: gcr.io/google_containers/addon-resizer:1.3
name: heapster-nanny
resources:
limits:
@ -108,7 +108,7 @@ spec:
- --container=heapster
- --poll-period=300000
- --estimator=exponential
- image: gcr.io/google_containers/addon-resizer:1.4
- image: gcr.io/google_containers/addon-resizer:1.3
name: eventer-nanny
resources:
limits:

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

@ -70,7 +70,7 @@ spec:
- /eventer
- --source=kubernetes:''
- --sink=influxdb:http://monitoring-influxdb:8086
- image: gcr.io/google_containers/addon-resizer:1.4
- image: gcr.io/google_containers/addon-resizer:1.3
name: heapster-nanny
resources:
limits:
@ -99,7 +99,7 @@ spec:
- --container=heapster
- --poll-period=300000
- --estimator=exponential
- image: gcr.io/google_containers/addon-resizer:1.4
- image: gcr.io/google_containers/addon-resizer:1.3
name: eventer-nanny
resources:
limits:

2
cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml
View File

@ -51,7 +51,7 @@ spec:
command:
- /heapster
- --source=kubernetes.summary_api:''
- image: gcr.io/google_containers/addon-resizer:1.4
- image: gcr.io/google_containers/addon-resizer:1.3
name: heapster-nanny
resources:
limits: