Merge pull request #59259 from wojtek-t/configurable_quota_backend_bytes

Automatic merge from submit-queue (batch tested with PRs 55439, 58564, 59028, 59169, 59259). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Configurable etcd quota backend bytes

```release-note
Configurable etcd quota backend bytes in GCE
```
This commit is contained in:
Kubernetes Submit Queue
2018-02-02 17:17:45 -08:00
committed by GitHub
2 changed files with 6 additions and 1 deletions

View File

@@ -736,6 +736,11 @@ EOF
if [ -n "${ETCD_COMPACTION_INTERVAL_SEC:-}" ]; then
cat >>$file <<EOF
ETCD_COMPACTION_INTERVAL_SEC: $(yaml-quote ${ETCD_COMPACTION_INTERVAL_SEC})
EOF
fi
if [ -n "${ETCD_QUOTA_BACKEND_BYTES:-}" ]; then
cat >>$file <<EOF
ETCD_QUOTA_BACKEND_BYTES: $(yaml-quote ${ETCD_QUOTA_BACKEND_BYTES})
EOF
fi
if [ -n "${APISERVER_TEST_ARGS:-}" ]; then