github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 05:27:21 +00:00
Code Issues Projects Releases Wiki Activity

Containers with hugepage volume mounts with unset hugepage limits

Browse Source
This commit is contained in:
Kevin Torres 2025-02-19 19:40:42 +00:00
parent aa17082a16
commit e3f4c6e62a
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkg/volume/emptydir/empty_dir.go
View File

@ -21,6 +21,7 @@ import (
"os" "os"
"path/filepath" "path/filepath"
"k8s.io/kubernetes/pkg/features"
"k8s.io/kubernetes/pkg/kubelet/util/swap" "k8s.io/kubernetes/pkg/kubelet/util/swap"
"k8s.io/klog/v2" "k8s.io/klog/v2"
@ -32,8 +33,8 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/types"
utilfeature "k8s.io/apiserver/pkg/util/feature" utilfeature "k8s.io/apiserver/pkg/util/feature"
resourcehelper "k8s.io/component-helpers/resource"
v1helper "k8s.io/kubernetes/pkg/apis/core/v1/helper" v1helper "k8s.io/kubernetes/pkg/apis/core/v1/helper"
"k8s.io/kubernetes/pkg/features"
"k8s.io/kubernetes/pkg/kubelet/cm" "k8s.io/kubernetes/pkg/kubelet/cm"
usernamespacefeature "k8s.io/kubernetes/pkg/kubelet/userns" usernamespacefeature "k8s.io/kubernetes/pkg/kubelet/userns"
"k8s.io/kubernetes/pkg/volume" "k8s.io/kubernetes/pkg/volume"
@ -83,7 +84,7 @@ func (plugin *emptyDirPlugin) GetPluginName() string {
func (plugin *emptyDirPlugin) GetVolumeName(spec *volume.Spec) (string, error) { func (plugin *emptyDirPlugin) GetVolumeName(spec *volume.Spec) (string, error) {
volumeSource, _ := getVolumeSource(spec) volumeSource, _ := getVolumeSource(spec)
if volumeSource == nil { if volumeSource == nil {
return "", fmt.Errorf("Spec does not reference an EmptyDir volume type") return "", fmt.Errorf("spec does not reference an emptyDir volume type")
} }
// Return user defined volume name, since this is an ephemeral volume type // Return user defined volume name, since this is an ephemeral volume type
@ -405,10 +406,19 @@ func getPageSizeMountOption(medium v1.StorageMedium, pod *v1.Pod) (string, error
} }
} }
podLevelAndContainerLevelRequests := []v1.ResourceList{}
if utilfeature.DefaultFeatureGate.Enabled(features.PodLevelResources) && resourcehelper.IsPodLevelResourcesSet(pod) {
podLevelAndContainerLevelRequests = append(podLevelAndContainerLevelRequests, pod.Spec.Resources.Requests)
}
// In some rare cases init containers can also consume Huge pages // In some rare cases init containers can also consume Huge pages
for _, container := range append(pod.Spec.Containers, pod.Spec.InitContainers...) { for _, container := range append(pod.Spec.Containers, pod.Spec.InitContainers...) {
podLevelAndContainerLevelRequests = append(podLevelAndContainerLevelRequests, container.Resources.Requests)
}
// We can take request because limit and requests must match. // We can take request because limit and requests must match.
for requestName := range container.Resources.Requests { for _, resourceList := range podLevelAndContainerLevelRequests {
for requestName := range resourceList {
if !v1helper.IsHugePageResourceName(requestName) { if !v1helper.IsHugePageResourceName(requestName) {
continue continue
} }
@ -438,7 +448,6 @@ func getPageSizeMountOption(medium v1.StorageMedium, pod *v1.Pod) (string, error
} }
return fmt.Sprintf("%s=%s", hugePagesPageSizeMountOption, pageSize.String()), nil return fmt.Sprintf("%s=%s", hugePagesPageSizeMountOption, pageSize.String()), nil
} }
// setupDir creates the directory with the default permissions specified by the perm constant. // setupDir creates the directory with the default permissions specified by the perm constant.