github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-20 09:33:52 +00:00
Code Issues Projects Releases Wiki Activity

remove featuregate for sysctl

Browse Source 
Co-authored-by: Skyler Clark <wgahnagl@protonmail.com>
This commit is contained in:
pacoxu
2021-02-22 14:00:17 +08:00
committed by Skyler Clark
parent b1f2960160
commit 3de4dd841f
4 changed files with 10 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/api/pod/util.go
View File

@@ -447,12 +447,6 @@ func dropDisabledFields(
}
}
if !utilfeature.DefaultFeatureGate.Enabled(features.Sysctls) && !sysctlsInUse(oldPodSpec) {
if podSpec.SecurityContext != nil {
podSpec.SecurityContext.Sysctls = nil
}
}
if !utilfeature.DefaultFeatureGate.Enabled(features.LocalStorageCapacityIsolation) && !emptyDirSizeLimitInUse(oldPodSpec) {
for i := range podSpec.Volumes {
if podSpec.Volumes[i].EmptyDir != nil {
@@ -648,16 +642,6 @@ func podPriorityInUse(podSpec *api.PodSpec) bool {
return false
}
func sysctlsInUse(podSpec *api.PodSpec) bool {
if podSpec == nil {
return false
}
if podSpec.SecurityContext != nil && podSpec.SecurityContext.Sysctls != nil {
return true
}
return false
}
// emptyDirSizeLimitInUse returns true if any pod's EmptyDir volumes use SizeLimit.
func emptyDirSizeLimitInUse(podSpec *api.PodSpec) bool {
if podSpec == nil {