diff --git a/ansible/install_config/group_vars/rpm_version.yml b/ansible/install_config/group_vars/rpm_version.yml index a93926ea..9516f06b 100644 --- a/ansible/install_config/group_vars/rpm_version.yml +++ b/ansible/install_config/group_vars/rpm_version.yml @@ -68,8 +68,8 @@ sapp_rpm_version: sapp-pr: sapp-pr-4.3.7.93d7d4a tfe_rpm_version: - tfe: tfe-4.8.25.9e75c71 - tfe-pr: tfe-pr-4.8.25.9e75c71 + tfe: tfe-4.8.26.5ad6ef7 + tfe-pr: tfe-pr-4.8.26.5ad6ef7 tsg_app_rpm_version: app_sketch_local: app_sketch_local-5.0.5.221e296 diff --git a/ansible/roles/tsg-os-HAL/files/script/tsg-os-HAL.sh b/ansible/roles/tsg-os-HAL/files/script/tsg-os-HAL.sh index 82918963..6e76f85a 100644 --- a/ansible/roles/tsg-os-HAL/files/script/tsg-os-HAL.sh +++ b/ansible/roles/tsg-os-HAL/files/script/tsg-os-HAL.sh @@ -33,16 +33,16 @@ set_k3s_config() local mem_num="$1" if [ $mem_num -le "32768" ]; then - kube_reserved="512Mi" - system_reserved="512Mi" + kube_reserved="2Gi" + system_reserved="12Gi" eviction_hard="64Mi" elif [ $mem_num -le "65536" ]; then - kube_reserved="1Gi" - system_reserved="1Gi" + kube_reserved="2Gi" + system_reserved="16Gi" eviction_hard="1Gi" else kube_reserved="2Gi" - system_reserved="2Gi" + system_reserved="32Gi" eviction_hard="2Gi" fi