Merge "Fix cpu and memory limits for glance"

This commit is contained in:
Jenkins 2017-06-19 15:11:28 +00:00 committed by Gerrit Code Review
commit 2a06477397

View File

@ -181,51 +181,51 @@ resources:
enabled: false enabled: false
api: api:
limits: limits:
memory: "128Mi" memory: "1024Mi"
cpu: "500m" cpu: "2000m"
requests: requests:
memory: "128Mi" memory: "128Mi"
cpu: "500m" cpu: "500m"
registry: registry:
limits: limits:
memory: "128Mi" memory: "1024Mi"
cpu: "500m" cpu: "2000m"
requests: requests:
memory: "128Mi" memory: "128Mi"
cpu: "500m" cpu: "500m"
jobs: jobs:
db: db:
limits: limits:
memory: "128Mi" memory: "1024Mi"
cpu: "500m" cpu: "2000m"
requests: requests:
memory: "128Mi" memory: "128Mi"
cpu: "500m" cpu: "500m"
init: init:
limits: limits:
memory: "128Mi" memory: "1024Mi"
cpu: "500m" cpu: "2000m"
requests: requests:
memory: "128Mi" memory: "128Mi"
cpu: "500m" cpu: "500m"
post: post:
limits: limits:
memory: "128Mi" memory: "1024Mi"
cpu: "500m" cpu: "2000m"
requests: requests:
memory: "128Mi" memory: "128Mi"
cpu: "500m" cpu: "500m"
bootstrap: bootstrap:
limits: limits:
memory: "128Mi" memory: "1024Mi"
cpu: "500m" cpu: "2000m"
requests: requests:
memory: "128Mi" memory: "128Mi"
cpu: "500m" cpu: "500m"
tests: tests:
limits: limits:
memory: "128Mi" memory: "1024Mi"
cpu: "500m" cpu: "2000m"
requests: requests:
memory: "128Mi" memory: "128Mi"
cpu: "500m" cpu: "500m"