Merge pull request #20920 from mwielgus/heapster-v0.20.0-alpha5

Heapster v0.20.0-alpha5 + gcm-autoscaling sink for googleinfluxdb
This commit is contained in:
Wojciech Tyczynski 2016-02-10 11:34:44 +01:00
commit 9682227649
4 changed files with 8 additions and 7 deletions

View File

@ -26,7 +26,7 @@ spec:
kubernetes.io/cluster-service: "true" kubernetes.io/cluster-service: "true"
spec: spec:
containers: containers:
- image: gcr.io/google_containers/heapster:v0.20.0-alpha4 - image: gcr.io/google_containers/heapster:v0.20.0-alpha5
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
@ -45,7 +45,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/heapster:v0.20.0-alpha4 - image: gcr.io/google_containers/heapster:v0.20.0-alpha5
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

View File

@ -26,7 +26,7 @@ spec:
kubernetes.io/cluster-service: "true" kubernetes.io/cluster-service: "true"
spec: spec:
containers: containers:
- image: gcr.io/google_containers/heapster:v0.20.0-alpha4 - image: gcr.io/google_containers/heapster:v0.20.0-alpha5
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
@ -40,12 +40,13 @@ spec:
- /heapster - /heapster
- --source=kubernetes:'' - --source=kubernetes:''
- --sink=influxdb:http://monitoring-influxdb:8086 - --sink=influxdb:http://monitoring-influxdb:8086
- --sink=gcm:?metrics=autoscaling
- --metric_resolution=60s - --metric_resolution=60s
volumeMounts: volumeMounts:
- name: ssl-certs - name: ssl-certs
mountPath: /etc/ssl/certs mountPath: /etc/ssl/certs
readOnly: true readOnly: true
- image: gcr.io/google_containers/heapster:v0.20.0-alpha4 - image: gcr.io/google_containers/heapster:v0.20.0-alpha5
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

View File

@ -26,7 +26,7 @@ spec:
kubernetes.io/cluster-service: "true" kubernetes.io/cluster-service: "true"
spec: spec:
containers: containers:
- image: gcr.io/google_containers/heapster:v0.20.0-alpha4 - image: gcr.io/google_containers/heapster:v0.20.0-alpha5
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:
- --source=kubernetes:'' - --source=kubernetes:''
- --sink=influxdb:http://monitoring-influxdb:8086 - --sink=influxdb:http://monitoring-influxdb:8086
- --metric_resolution=60s - --metric_resolution=60s
- image: gcr.io/google_containers/heapster:v0.20.0-alpha4 - image: gcr.io/google_containers/heapster:v0.20.0-alpha5
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

View File

@ -26,7 +26,7 @@ spec:
kubernetes.io/cluster-service: "true" kubernetes.io/cluster-service: "true"
spec: spec:
containers: containers:
- image: gcr.io/google_containers/heapster:v0.20.0-alpha4 - image: gcr.io/google_containers/heapster:v0.20.0-alpha5
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