Revert "Update addon-resizer version"

This reverts commit 63ccedcfa7.
This commit is contained in:
Aleksandra Malinowska 2017-09-15 14:30:47 +02:00
parent 87a1b5f6d7
commit 68d3a9db2a
5 changed files with 24 additions and 8 deletions

View File

@ -78,7 +78,7 @@ spec:
- name: usr-ca-certs - name: usr-ca-certs
mountPath: /usr/share/ca-certificates mountPath: /usr/share/ca-certificates
readOnly: true readOnly: true
- image: gcr.io/google_containers/addon-resizer:2.0 - image: gcr.io/google_containers/addon-resizer:1.7
name: heapster-nanny name: heapster-nanny
resources: resources:
limits: limits:
@ -102,10 +102,12 @@ spec:
- --extra-cpu={{ metrics_cpu_per_node }}m - --extra-cpu={{ metrics_cpu_per_node }}m
- --memory={{ base_metrics_memory }} - --memory={{ base_metrics_memory }}
- --extra-memory={{metrics_memory_per_node}}Mi - --extra-memory={{metrics_memory_per_node}}Mi
- --threshold=5
- --deployment=heapster-v1.5.0-beta.0 - --deployment=heapster-v1.5.0-beta.0
- --container=heapster - --container=heapster
- --poll-period=300000 - --poll-period=300000
- image: gcr.io/google_containers/addon-resizer:2.0 - --estimator=exponential
- image: gcr.io/google_containers/addon-resizer:1.7
name: eventer-nanny name: eventer-nanny
resources: resources:
limits: limits:
@ -129,9 +131,11 @@ spec:
- --extra-cpu=0m - --extra-cpu=0m
- --memory={{base_eventer_memory}} - --memory={{base_eventer_memory}}
- --extra-memory={{eventer_memory_per_node}}Ki - --extra-memory={{eventer_memory_per_node}}Ki
- --threshold=5
- --deployment=heapster-v1.5.0-beta.0 - --deployment=heapster-v1.5.0-beta.0
- --container=eventer - --container=eventer
- --poll-period=300000 - --poll-period=300000
- --estimator=exponential
volumes: volumes:
- name: ssl-certs - name: ssl-certs
hostPath: hostPath:

View File

@ -79,7 +79,7 @@ spec:
- name: usr-ca-certs - name: usr-ca-certs
mountPath: /usr/share/ca-certificates mountPath: /usr/share/ca-certificates
readOnly: true readOnly: true
- image: gcr.io/google_containers/addon-resizer:2.0 - image: gcr.io/google_containers/addon-resizer:1.7
name: heapster-nanny name: heapster-nanny
resources: resources:
limits: limits:
@ -103,10 +103,12 @@ spec:
- --extra-cpu={{ metrics_cpu_per_node }}m - --extra-cpu={{ metrics_cpu_per_node }}m
- --memory={{ base_metrics_memory }} - --memory={{ base_metrics_memory }}
- --extra-memory={{ metrics_memory_per_node }}Mi - --extra-memory={{ metrics_memory_per_node }}Mi
- --threshold=5
- --deployment=heapster-v1.5.0-beta.0 - --deployment=heapster-v1.5.0-beta.0
- --container=heapster - --container=heapster
- --poll-period=300000 - --poll-period=300000
- image: gcr.io/google_containers/addon-resizer:2.0 - --estimator=exponential
- image: gcr.io/google_containers/addon-resizer:1.7
name: eventer-nanny name: eventer-nanny
resources: resources:
limits: limits:
@ -130,9 +132,11 @@ spec:
- --extra-cpu=0m - --extra-cpu=0m
- --memory={{ base_eventer_memory }} - --memory={{ base_eventer_memory }}
- --extra-memory={{ eventer_memory_per_node }}Ki - --extra-memory={{ eventer_memory_per_node }}Ki
- --threshold=5
- --deployment=heapster-v1.5.0-beta.0 - --deployment=heapster-v1.5.0-beta.0
- --container=eventer - --container=eventer
- --poll-period=300000 - --poll-period=300000
- --estimator=exponential
volumes: volumes:
- name: ssl-certs - name: ssl-certs
hostPath: hostPath:

View File

@ -64,7 +64,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:2.0 - image: gcr.io/google_containers/addon-resizer:1.7
name: heapster-nanny name: heapster-nanny
resources: resources:
limits: limits:
@ -88,10 +88,12 @@ spec:
- --extra-cpu={{ metrics_cpu_per_node }}m - --extra-cpu={{ metrics_cpu_per_node }}m
- --memory={{ base_metrics_memory }} - --memory={{ base_metrics_memory }}
- --extra-memory={{ metrics_memory_per_node }}Mi - --extra-memory={{ metrics_memory_per_node }}Mi
- --threshold=5
- --deployment=heapster-v1.5.0-beta.0 - --deployment=heapster-v1.5.0-beta.0
- --container=heapster - --container=heapster
- --poll-period=300000 - --poll-period=300000
- image: gcr.io/google_containers/addon-resizer:2.0 - --estimator=exponential
- image: gcr.io/google_containers/addon-resizer:1.7
name: eventer-nanny name: eventer-nanny
resources: resources:
limits: limits:
@ -115,9 +117,11 @@ spec:
- --extra-cpu=0m - --extra-cpu=0m
- --memory={{ base_eventer_memory }} - --memory={{ base_eventer_memory }}
- --extra-memory={{ eventer_memory_per_node }}Ki - --extra-memory={{ eventer_memory_per_node }}Ki
- --threshold=5
- --deployment=heapster-v1.5.0-beta.0 - --deployment=heapster-v1.5.0-beta.0
- --container=eventer - --container=eventer
- --poll-period=300000 - --poll-period=300000
- --estimator=exponential
serviceAccountName: heapster serviceAccountName: heapster
tolerations: tolerations:
- key: "CriticalAddonsOnly" - key: "CriticalAddonsOnly"

View File

@ -86,7 +86,7 @@ spec:
fieldRef: fieldRef:
fieldPath: metadata.namespace fieldPath: metadata.namespace
# END_PROMETHEUS_TO_SD # END_PROMETHEUS_TO_SD
- image: gcr.io/google_containers/addon-resizer:2.0 - image: gcr.io/google_containers/addon-resizer:1.7
name: heapster-nanny name: heapster-nanny
resources: resources:
limits: limits:
@ -110,9 +110,11 @@ spec:
- --extra-cpu={{ metrics_cpu_per_node }}m - --extra-cpu={{ metrics_cpu_per_node }}m
- --memory={{ base_metrics_memory }} - --memory={{ base_metrics_memory }}
- --extra-memory={{metrics_memory_per_node}}Mi - --extra-memory={{metrics_memory_per_node}}Mi
- --threshold=5
- --deployment=heapster-v1.5.0-beta.0 - --deployment=heapster-v1.5.0-beta.0
- --container=heapster - --container=heapster
- --poll-period=300000 - --poll-period=300000
- --estimator=exponential
volumes: volumes:
- name: ssl-certs - name: ssl-certs
hostPath: hostPath:

View File

@ -55,7 +55,7 @@ spec:
command: command:
- /heapster - /heapster
- --source=kubernetes.summary_api:'' - --source=kubernetes.summary_api:''
- image: gcr.io/google_containers/addon-resizer:2.0 - image: gcr.io/google_containers/addon-resizer:1.7
name: heapster-nanny name: heapster-nanny
resources: resources:
limits: limits:
@ -79,9 +79,11 @@ spec:
- --extra-cpu={{ metrics_cpu_per_node }}m - --extra-cpu={{ metrics_cpu_per_node }}m
- --memory={{ base_metrics_memory }} - --memory={{ base_metrics_memory }}
- --extra-memory={{ metrics_memory_per_node }}Mi - --extra-memory={{ metrics_memory_per_node }}Mi
- --threshold=5
- --deployment=heapster-v1.5.0-beta.0 - --deployment=heapster-v1.5.0-beta.0
- --container=heapster - --container=heapster
- --poll-period=300000 - --poll-period=300000
- --estimator=exponential
serviceAccountName: heapster serviceAccountName: heapster
tolerations: tolerations:
- key: "CriticalAddonsOnly" - key: "CriticalAddonsOnly"