diff --git a/hosts/k8s/README.md b/hosts/k8s/README.md index 20046ae6..5e5229f8 100644 --- a/hosts/k8s/README.md +++ b/hosts/k8s/README.md @@ -28,11 +28,7 @@ Clusters running as virtual machines on the KubeVirt cluster, for testing and pr 1. `k3s-prod-1-worker-1` 1. `k3s-prod-1-worker-2` 1. `k3s-prod-1-worker-3` -1. For testing:. - 1. `k3s-test-1-master-1` - 2. `k3s-test-1-worker-1` - 3. `k3s-test-1-worker-2` - 4. `k3s-test-1-worker-3` +1. For testing:. 2. `k3s-test-1-master-1` 3. `k3s-test-1-master-2` 4. `k3s-test-1-master-3` ## Kubernetes Resources diff --git a/hosts/k8s/kubevirt-shoryu/default.nix b/hosts/k8s/kubevirt-shoryu/default.nix index 36b1af50..0728620c 100644 --- a/hosts/k8s/kubevirt-shoryu/default.nix +++ b/hosts/k8s/kubevirt-shoryu/default.nix @@ -58,8 +58,8 @@ in { # # pre-allocate hugepages manually(for kubevirt guest vms) # NOTE: the hugepages allocated here can not be used for other purposes! - # so we should left some memory for the host OS + # so we should left some memory for the host OS and other vms that don't use hugepages "hugepagesz=1G" - "hugepages=54" + "hugepages=48" # use 75% of the total memory for hugepages ]; } diff --git a/hosts/k8s/kubevirt-shushou/default.nix b/hosts/k8s/kubevirt-shushou/default.nix index 572afb33..cfd87c96 100644 --- a/hosts/k8s/kubevirt-shushou/default.nix +++ b/hosts/k8s/kubevirt-shushou/default.nix @@ -52,8 +52,8 @@ in { # # pre-allocate hugepages manually(for kubevirt guest vms) # NOTE: the hugepages allocated here can not be used for other purposes! - # so we should left some memory for the host OS + # so we should left some memory for the host OS and other vms that don't use hugepages "hugepagesz=1G" - "hugepages=55" + "hugepages=48" # use 75% of the total memory for hugepages ]; } diff --git a/hosts/k8s/kubevirt-youko/default.nix b/hosts/k8s/kubevirt-youko/default.nix index 08ec2228..fc967d31 100644 --- a/hosts/k8s/kubevirt-youko/default.nix +++ b/hosts/k8s/kubevirt-youko/default.nix @@ -52,9 +52,9 @@ in { # # pre-allocate hugepages manually(for kubevirt guest vms) # NOTE: the hugepages allocated here can not be used for other purposes! - # so we should left some memory for the host OS + # so we should left some memory for the host OS and other vms that don't use hugepages "hugepagesz=1G" - "hugepages=16" + "hugepages=15" # use 15/24 of the total memory for hugepages # https://kubevirt.io/user-guide/compute/host-devices/ #