mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-23 11:50:44 +00:00
Fix GCI after #26109 breakage
This commit is contained in:
parent
1ab5fc4392
commit
e515da4545
@ -657,8 +657,10 @@ function start-kube-addons {
|
|||||||
local -r file_dir="cluster-monitoring/${ENABLE_CLUSTER_MONITORING}"
|
local -r file_dir="cluster-monitoring/${ENABLE_CLUSTER_MONITORING}"
|
||||||
setup-addon-manifests "addons" "${file_dir}"
|
setup-addon-manifests "addons" "${file_dir}"
|
||||||
# Replace the salt configurations with variable values.
|
# Replace the salt configurations with variable values.
|
||||||
metrics_memory="200Mi"
|
base_metrics_memory="200Mi"
|
||||||
eventer_memory="200Mi"
|
metrics_memory="$(base_metrics_memory)"
|
||||||
|
base_eventer_memory="200Mi"
|
||||||
|
eventer_memory="$(base_eventer_memory)"
|
||||||
local -r metrics_memory_per_node="4"
|
local -r metrics_memory_per_node="4"
|
||||||
local -r eventer_memory_per_node="500"
|
local -r eventer_memory_per_node="500"
|
||||||
if [[ -n "${NUM_NODES:-}" && "${NUM_NODES}" -ge 1 ]]; then
|
if [[ -n "${NUM_NODES:-}" && "${NUM_NODES}" -ge 1 ]]; then
|
||||||
@ -673,7 +675,9 @@ function start-kube-addons {
|
|||||||
controller_yaml="${controller_yaml}/heapster-controller.yaml"
|
controller_yaml="${controller_yaml}/heapster-controller.yaml"
|
||||||
fi
|
fi
|
||||||
remove-salt-config-comments "${controller_yaml}"
|
remove-salt-config-comments "${controller_yaml}"
|
||||||
|
sed -i -e "s@{{ *base_metrics_memory *}}@${base_metrics_memory}@g" "${controller_yaml}"
|
||||||
sed -i -e "s@{{ *metrics_memory *}}@${metrics_memory}@g" "${controller_yaml}"
|
sed -i -e "s@{{ *metrics_memory *}}@${metrics_memory}@g" "${controller_yaml}"
|
||||||
|
sed -i -e "s@{{ *base_eventer_memory *}}@${base_eventer_memory}@g" "${controller_yaml}"
|
||||||
sed -i -e "s@{{ *eventer_memory *}}@${eventer_memory}@g" "${controller_yaml}"
|
sed -i -e "s@{{ *eventer_memory *}}@${eventer_memory}@g" "${controller_yaml}"
|
||||||
sed -i -e "s@{{ *metrics_memory_per_node *}}@${metrics_memory_per_node}@g" "${controller_yaml}"
|
sed -i -e "s@{{ *metrics_memory_per_node *}}@${metrics_memory_per_node}@g" "${controller_yaml}"
|
||||||
sed -i -e "s@{{ *eventer_memory_per_node *}}@${eventer_memory_per_node}@g" "${controller_yaml}"
|
sed -i -e "s@{{ *eventer_memory_per_node *}}@${eventer_memory_per_node}@g" "${controller_yaml}"
|
||||||
|
Loading…
Reference in New Issue
Block a user