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 ```

Merge pull request #59259 from wojtek-t/configurable_quota_backend_bytes
4edb82f0 · Kubernetes Submit Queue · GitHub · f65f0722 · 333d1969 · 4edb82f0
Unverified Commit 4edb82f0 authored Feb 02, 2018 by Kubernetes Submit Queue Committed by GitHub Feb 02, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 1 deletion

common.sh cluster/common.sh +5 -0

configure-helper.sh cluster/gce/gci/configure-helper.sh +1 -1

No files found.
--- a/cluster/common.sh
+++ b/cluster/common.sh
@@ -738,6 +738,11 @@ 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
      cat >>$file <<EOF
 APISERVER_TEST_ARGS: $(yaml-quote ${APISERVER_TEST_ARGS})

--- a/cluster/gce/gci/configure-helper.sh
+++ b/cluster/gce/gci/configure-helper.sh
@@ -1390,7 +1390,7 @@ function prepare-etcd-manifest {
    sed -i -e "s@{{ *pillar\.get('storage_backend', '\(.*\)') *}}@\1@g" "${temp_file}"
  fi
  if [[ "${STORAGE_BACKEND:-${default_storage_backend}}" == "etcd3" ]]; then
-    sed -i -e "s@{{ *quota_bytes *}}@--quota-backend-bytes=4294967296@g" "${temp_file}"
+    sed -i -e "s@{{ *quota_bytes *}}@--quota-backend-bytes=${ETCD_QUOTA_BACKEND_BYTES:-4294967296}@g" "${temp_file}"
  else
    sed -i -e "s@{{ *quota_bytes *}}@@g" "${temp_file}"
  fi