mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-08-02 08:17:26 +00:00
Set quota bytes by default
This commit is contained in:
parent
3255898fba
commit
3828188049
@ -655,12 +655,16 @@ function prepare-etcd-manifest {
|
|||||||
sed -i -e "s@{{ *hostname *}}@$host_name@g" "${temp_file}"
|
sed -i -e "s@{{ *hostname *}}@$host_name@g" "${temp_file}"
|
||||||
sed -i -e "s@{{ *srv_kube_path *}}@/etc/srv/kubernetes@g" "${temp_file}"
|
sed -i -e "s@{{ *srv_kube_path *}}@/etc/srv/kubernetes@g" "${temp_file}"
|
||||||
sed -i -e "s@{{ *etcd_cluster *}}@$etcd_cluster@g" "${temp_file}"
|
sed -i -e "s@{{ *etcd_cluster *}}@$etcd_cluster@g" "${temp_file}"
|
||||||
|
# Get default storage backend from manifest file.
|
||||||
|
local -r default_storage_backend=$(cat "${temp_file}" | \
|
||||||
|
grep -o "{{ *pillar\.get('storage_backend', '\(.*\)') *}}" | \
|
||||||
|
sed -e "s@{{ *pillar\.get('storage_backend', '\(.*\)') *}}@\1@g")
|
||||||
if [[ -n "${STORAGE_BACKEND:-}" ]]; then
|
if [[ -n "${STORAGE_BACKEND:-}" ]]; then
|
||||||
sed -i -e "s@{{ *pillar\.get('storage_backend', '\(.*\)') *}}@${STORAGE_BACKEND}@g" "${temp_file}"
|
sed -i -e "s@{{ *pillar\.get('storage_backend', '\(.*\)') *}}@${STORAGE_BACKEND}@g" "${temp_file}"
|
||||||
else
|
else
|
||||||
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:-}" == "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=4294967296@g" "${temp_file}"
|
||||||
else
|
else
|
||||||
sed -i -e "s@{{ *quota_bytes *}}@@g" "${temp_file}"
|
sed -i -e "s@{{ *quota_bytes *}}@@g" "${temp_file}"
|
||||||
|
@ -721,12 +721,16 @@ function prepare-etcd-manifest {
|
|||||||
sed -i -e "s@{{ *hostname *}}@$host_name@g" "${temp_file}"
|
sed -i -e "s@{{ *hostname *}}@$host_name@g" "${temp_file}"
|
||||||
sed -i -e "s@{{ *srv_kube_path *}}@/etc/srv/kubernetes@g" "${temp_file}"
|
sed -i -e "s@{{ *srv_kube_path *}}@/etc/srv/kubernetes@g" "${temp_file}"
|
||||||
sed -i -e "s@{{ *etcd_cluster *}}@$etcd_cluster@g" "${temp_file}"
|
sed -i -e "s@{{ *etcd_cluster *}}@$etcd_cluster@g" "${temp_file}"
|
||||||
|
# Get default storage backend from manifest file.
|
||||||
|
local -r default_storage_backend=$(cat "${temp_file}" | \
|
||||||
|
grep -o "{{ *pillar\.get('storage_backend', '\(.*\)') *}}" | \
|
||||||
|
sed -e "s@{{ *pillar\.get('storage_backend', '\(.*\)') *}}@\1@g")
|
||||||
if [[ -n "${STORAGE_BACKEND:-}" ]]; then
|
if [[ -n "${STORAGE_BACKEND:-}" ]]; then
|
||||||
sed -i -e "s@{{ *pillar\.get('storage_backend', '\(.*\)') *}}@${STORAGE_BACKEND}@g" "${temp_file}"
|
sed -i -e "s@{{ *pillar\.get('storage_backend', '\(.*\)') *}}@${STORAGE_BACKEND}@g" "${temp_file}"
|
||||||
else
|
else
|
||||||
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:-}" == "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=4294967296@g" "${temp_file}"
|
||||||
else
|
else
|
||||||
sed -i -e "s@{{ *quota_bytes *}}@@g" "${temp_file}"
|
sed -i -e "s@{{ *quota_bytes *}}@@g" "${temp_file}"
|
||||||
|
@ -476,12 +476,16 @@ prepare_etcd_manifest() {
|
|||||||
sed -i -e "s@{{ *srv_kube_path *}}@/etc/srv/kubernetes@g" "${etcd_temp_file}"
|
sed -i -e "s@{{ *srv_kube_path *}}@/etc/srv/kubernetes@g" "${etcd_temp_file}"
|
||||||
sed -i -e "s@{{ *hostname *}}@$host_name@g" "${etcd_temp_file}"
|
sed -i -e "s@{{ *hostname *}}@$host_name@g" "${etcd_temp_file}"
|
||||||
sed -i -e "s@{{ *etcd_cluster *}}@$etcd_cluster@g" "${etcd_temp_file}"
|
sed -i -e "s@{{ *etcd_cluster *}}@$etcd_cluster@g" "${etcd_temp_file}"
|
||||||
|
# Get default storage backend from manifest file.
|
||||||
|
local -r default_storage_backend=$(cat "${temp_file}" | \
|
||||||
|
grep -o "{{ *pillar\.get('storage_backend', '\(.*\)') *}}" | \
|
||||||
|
sed -e "s@{{ *pillar\.get('storage_backend', '\(.*\)') *}}@\1@g")
|
||||||
if [[ -n "${STORAGE_BACKEND:-}" ]]; then
|
if [[ -n "${STORAGE_BACKEND:-}" ]]; then
|
||||||
sed -i -e "s@{{ *pillar\.get('storage_backend', '\(.*\)') *}}@${STORAGE_BACKEND}@g" "${temp_file}"
|
sed -i -e "s@{{ *pillar\.get('storage_backend', '\(.*\)') *}}@${STORAGE_BACKEND}@g" "${temp_file}"
|
||||||
else
|
else
|
||||||
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:-}" == "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=4294967296@g" "${temp_file}"
|
||||||
else
|
else
|
||||||
sed -i -e "s@{{ *quota_bytes *}}@@g" "${temp_file}"
|
sed -i -e "s@{{ *quota_bytes *}}@@g" "${temp_file}"
|
||||||
|
Loading…
Reference in New Issue
Block a user