github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #31956 from wojtek-t/bump_pod_nanny 

Automatic merge from submit-queue

Bump pod nany version to fix a bug

Fix #31950
pull/6/head
Kubernetes Submit Queue 2016-09-02 03:04:12 -07:00 committed by GitHub
parent ca98482da9 794074b273
commit 34f7345d27
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

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

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

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

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

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

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

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