Skip to content

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

Merge pull request #31114 from wojtek-t/fix_heapster_in_kubemark

Automatic merge from submit-queue Fix heapster in kubemark Fix #31108
parents 7bd8d7d0 56008de8
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
test/kubemark/resources/heapster_template.json
View file @ d6afd304
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
"containers": [ "containers": [
{ {
"name": "heapster", "name": "heapster",
"image": "gcr.io/google_containers/heapster:v1.1.0", "image": "gcr.io/google_containers/heapster:v1.2.0-beta.1",
"resources": { "resources": {
"requests": { "requests": {
"cpu": "100m", "cpu": "100m",
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
}, },
{ {
"name": "eventer", "name": "eventer",
"image": "gcr.io/google_containers/heapster:v1.1.0", "image": "gcr.io/google_containers/heapster:v1.2.0-beta.1",
"resources": { "resources": {
"requests": { "requests": {
"cpu": "100m", "cpu": "100m",
......
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