Skip to content

K
k3s
Commit 34f7345d authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

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
parents ca98482d 794074b2
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 7 deletions
cluster/addons/cluster-monitoring/google/heapster-controller.yaml
View file @ 34f7345d
...@@ -85,7 +85,7 @@ spec: ...@@ -85,7 +85,7 @@ spec:
- name: ssl-certs - name: ssl-certs
mountPath: /etc/ssl/certs mountPath: /etc/ssl/certs
readOnly: true readOnly: true
- image: gcr.io/google_containers/addon-resizer:1.5 - image: gcr.io/google_containers/addon-resizer:1.6
name: heapster-nanny name: heapster-nanny
resources: resources:
limits: limits:
...@@ -114,7 +114,7 @@ spec: ...@@ -114,7 +114,7 @@ spec:
- --container=heapster - --container=heapster
- --poll-period=300000 - --poll-period=300000
- --estimator=exponential - --estimator=exponential
- image: gcr.io/google_containers/addon-resizer:1.5 - image: gcr.io/google_containers/addon-resizer:1.6
name: eventer-nanny name: eventer-nanny
resources: resources:
limits: limits:
......
cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml
View file @ 34f7345d
...@@ -86,7 +86,7 @@ spec: ...@@ -86,7 +86,7 @@ spec:
- name: ssl-certs - name: ssl-certs
mountPath: /etc/ssl/certs mountPath: /etc/ssl/certs
readOnly: true readOnly: true
- image: gcr.io/google_containers/addon-resizer:1.5 - image: gcr.io/google_containers/addon-resizer:1.6
name: heapster-nanny name: heapster-nanny
resources: resources:
limits: limits:
...@@ -115,7 +115,7 @@ spec: ...@@ -115,7 +115,7 @@ spec:
- --container=heapster - --container=heapster
- --poll-period=300000 - --poll-period=300000
- --estimator=exponential - --estimator=exponential
- image: gcr.io/google_containers/addon-resizer:1.5 - image: gcr.io/google_containers/addon-resizer:1.6
name: eventer-nanny name: eventer-nanny
resources: resources:
limits: limits:
......
cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml
View file @ 34f7345d
...@@ -77,7 +77,7 @@ spec: ...@@ -77,7 +77,7 @@ spec:
- /eventer - /eventer
- --source=kubernetes:'' - --source=kubernetes:''
- --sink=influxdb:http://monitoring-influxdb:8086 - --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 name: heapster-nanny
resources: resources:
limits: limits:
...@@ -106,7 +106,7 @@ spec: ...@@ -106,7 +106,7 @@ spec:
- --container=heapster - --container=heapster
- --poll-period=300000 - --poll-period=300000
- --estimator=exponential - --estimator=exponential
- image: gcr.io/google_containers/addon-resizer:1.5 - image: gcr.io/google_containers/addon-resizer:1.6
name: eventer-nanny name: eventer-nanny
resources: resources:
limits: limits:
......
cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml
View file @ 34f7345d
...@@ -58,7 +58,7 @@ spec: ...@@ -58,7 +58,7 @@ spec:
command: command:
- /heapster - /heapster
- --source=kubernetes.summary_api:'' - --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 name: heapster-nanny
resources: resources:
limits: limits:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment