Skip to content

Commit 1691457

Browse files
committed
Reset default system reserved resources to previous defaults.
1 parent 6646db4 commit 1691457

File tree

3 files changed

+36
-0
lines changed

3 files changed

+36
-0
lines changed

changelog/2.27.0.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,3 +42,6 @@ Released 2025-03-24
4242
- [#420](https://github.com/elastisys/compliantkubernetes-kubespray/pull/420) - documentation: Update Ubuntu 24.04 migration guide to include instructions for UpCloud @Ajarmar
4343
- [#424](https://github.com/elastisys/compliantkubernetes-kubespray/pull/424) - documentation: Fix LICENSE @cristiklein
4444
- [#427](https://github.com/elastisys/compliantkubernetes-kubespray/pull/427) - Kept previous Calico version `v3.27` due to newer versions being incompatible with Calico-Accountant
45+
- [#427](https://github.com/elastisys/compliantkubernetes-kubespray/pull/427) - Reset default system reserved resources to previous defaults.
46+
- Increased kube reserved memory on worker nodes from `256Mi` to `512Mi`.
47+
- Decreased kube reserved cpu on control plane nodes from `200m` to `100m`.

config/common/group_vars/k8s_cluster/ck8s-k8s-cluster.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,11 @@ local_volume_provisioner_storage_classes: # Installation via kubespray has no su
123123
host_dir: /mnt/disks/
124124
mount_dir: /mnt/disks/
125125

126+
kube_memory_reserved: "512Mi"
127+
kube_cpu_reserved: "100m"
128+
system_cpu_reserved: "0m"
129+
system_memory_reserved: "0Mi"
130+
126131
audit_policy_custom_rules: |-
127132
# The following requests were manually identified as high-volume and low-risk,
128133
# so drop them.
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
#!/usr/bin/env bash
2+
3+
HERE="$(dirname "$(readlink -f "${0}")")"
4+
ROOT="$(readlink -f "${HERE}/../../../")"
5+
6+
# shellcheck source=scripts/migration/lib.sh
7+
source "${ROOT}/scripts/migration/lib.sh"
8+
9+
# Usage: update_reserved_resources <sc|wc>
10+
function update_reserved_resources() {
11+
cluster="${1}"
12+
13+
log_info "Updating reserved resources for ${cluster}"
14+
15+
kubespray_config_path="${CK8S_CONFIG_PATH}/${cluster}-config/group_vars/k8s_cluster/ck8s-k8s-cluster.yaml"
16+
17+
yq4 -i '.kube_memory_reserved = "512Mi"' "${kubespray_config_path}"
18+
yq4 -i '.kube_cpu_reserved = "100m"' "${kubespray_config_path}"
19+
yq4 -i '.system_cpu_reserved = "0m"' "${kubespray_config_path}"
20+
yq4 -i '.system_memory_reserved = "0Mi"' "${kubespray_config_path}"
21+
}
22+
23+
if [[ "${CK8S_CLUSTER}" =~ ^(sc|both)$ ]]; then
24+
update_reserved_resources sc
25+
fi
26+
if [[ "${CK8S_CLUSTER}" =~ ^(wc|both)$ ]]; then
27+
update_reserved_resources wc
28+
fi

0 commit comments

Comments
 (0)