github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 22:46:12 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #31114 from wojtek-t/fix_heapster_in_kubemark

Browse Source 
Automatic merge from submit-queue

Fix heapster in kubemark

Fix #31108
This commit is contained in:
Kubernetes Submit Queue 2016-08-22 13:33:30 -07:00 committed by GitHub
commit d6afd304b7
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/kubemark/resources/heapster_template.json
View File

@ -33,7 +33,7 @@
"containers": [
{
"name": "heapster",
"image": "gcr.io/google_containers/heapster:v1.1.0",
"image": "gcr.io/google_containers/heapster:v1.2.0-beta.1",
"resources": {
"requests": {
"cpu": "100m",
@ -55,7 +55,7 @@
},
{
"name": "eventer",
"image": "gcr.io/google_containers/heapster:v1.1.0",
"image": "gcr.io/google_containers/heapster:v1.2.0-beta.1",
"resources": {
"requests": {
"cpu": "100m",