mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-24 20:24:09 +00:00
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:
commit
4edb82f0e8
@ -736,6 +736,11 @@ EOF
|
|||||||
if [ -n "${ETCD_COMPACTION_INTERVAL_SEC:-}" ]; then
|
if [ -n "${ETCD_COMPACTION_INTERVAL_SEC:-}" ]; then
|
||||||
cat >>$file <<EOF
|
cat >>$file <<EOF
|
||||||
ETCD_COMPACTION_INTERVAL_SEC: $(yaml-quote ${ETCD_COMPACTION_INTERVAL_SEC})
|
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
|
EOF
|
||||||
fi
|
fi
|
||||||
if [ -n "${APISERVER_TEST_ARGS:-}" ]; then
|
if [ -n "${APISERVER_TEST_ARGS:-}" ]; then
|
||||||
|
@ -1390,7 +1390,7 @@ function prepare-etcd-manifest {
|
|||||||
sed -i -e "s@{{ *pillar\.get('storage_backend', '\(.*\)') *}}@\1@g" "${temp_file}"
|
sed -i -e "s@{{ *pillar\.get('storage_backend', '\(.*\)') *}}@\1@g" "${temp_file}"
|
||||||
fi
|
fi
|
||||||
if [[ "${STORAGE_BACKEND:-${default_storage_backend}}" == "etcd3" ]]; then
|
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
|
else
|
||||||
sed -i -e "s@{{ *quota_bytes *}}@@g" "${temp_file}"
|
sed -i -e "s@{{ *quota_bytes *}}@@g" "${temp_file}"
|
||||||
fi
|
fi
|
||||||
|
Loading…
Reference in New Issue
Block a user