Parameterize hugepage pod cgroup

Change-Id: I5a52397185610e19ce5861ce3c3b3303006a296b
This commit is contained in:
Anderson, Craig (ca846m) 2019-01-03 14:12:30 -08:00
parent 3819986398
commit ff7985e391
2 changed files with 6 additions and 1 deletions

View File

@ -64,7 +64,10 @@ if [ 0"$hp_count" -gt 0 ]; then
# hugepage byte limit quota to zero out. This workaround sets that pod limit # hugepage byte limit quota to zero out. This workaround sets that pod limit
# back to the total number of hugepage bytes available to the baremetal host. # back to the total number of hugepage bytes available to the baremetal host.
if [ -d /sys/fs/cgroup/hugetlb ]; then if [ -d /sys/fs/cgroup/hugetlb ]; then
for limit in $(ls /sys/fs/cgroup/hugetlb/kubepods/hugetlb.*.limit_in_bytes); do limits="$(ls /sys/fs/cgroup/hugetlb/{{ .Values.conf.kubernetes.cgroup }}/hugetlb.*.limit_in_bytes)" || \
(echo "ERROR: Failed to locate any hugetable limits. Did you set the correct cgroup in your values used for this chart?"
exit 1)
for limit in $limits; do
target="/sys/fs/cgroup/hugetlb/$(dirname $(awk -F: '($2~/hugetlb/){print $3}' /proc/self/cgroup))/$(basename $limit)" target="/sys/fs/cgroup/hugetlb/$(dirname $(awk -F: '($2~/hugetlb/){print $3}' /proc/self/cgroup))/$(basename $limit)"
# Ensure the write target for the hugepage limit for the pod exists # Ensure the write target for the hugepage limit for the pod exists
if [ ! -f "$target" ]; then if [ ! -f "$target" ]; then

View File

@ -87,6 +87,8 @@ conf:
stdio_handler: "file" stdio_handler: "file"
user: "nova" user: "nova"
group: "kvm" group: "kvm"
kubernetes:
cgroup: "kubepods"
pod: pod:
affinity: affinity: