Skip to content

K
k3s
Commit 8f3d7110 authored by k8s-merge-robot's avatar k8s-merge-robot
Browse files
Options

Merge pull request #21466 from mwielgus/heapster-alpha7

Auto commit by PR queue bot
parents d30c709a d9c8f7fa
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 7 deletions
cluster/addons/cluster-monitoring/google/heapster-controller.yaml
View file @ 8f3d7110
...@@ -26,7 +26,7 @@ spec: ...@@ -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-alpha6 - image: gcr.io/google_containers/heapster:v0.20.0-alpha7
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: ...@@ -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-alpha6 - image: gcr.io/google_containers/heapster:v0.20.0-alpha7
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
......
cluster/addons/cluster-monitoring/googleinfluxdb/heapster-controller-combined.yaml
View file @ 8f3d7110
...@@ -26,7 +26,7 @@ spec: ...@@ -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-alpha6 - image: gcr.io/google_containers/heapster:v0.20.0-alpha7
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
...@@ -46,7 +46,7 @@ spec: ...@@ -46,7 +46,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-alpha6 - image: gcr.io/google_containers/heapster:v0.20.0-alpha7
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
......
cluster/addons/cluster-monitoring/influxdb/heapster-controller.yaml
View file @ 8f3d7110
...@@ -26,7 +26,7 @@ spec: ...@@ -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-alpha6 - image: gcr.io/google_containers/heapster:v0.20.0-alpha7
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: ...@@ -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-alpha6 - image: gcr.io/google_containers/heapster:v0.20.0-alpha7
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
......
cluster/addons/cluster-monitoring/standalone/heapster-controller.yaml
View file @ 8f3d7110
...@@ -26,7 +26,7 @@ spec: ...@@ -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-alpha6 - image: gcr.io/google_containers/heapster:v0.20.0-alpha7
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
......
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