github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 03:41:45 +00:00
Code Issues Projects Releases Wiki Activity

Revert "promote LocalStorageCapacityIsolationFSQuotaMonitoring to beta"

Browse Source
This commit is contained in:
Ryan Phillips 2022-08-26 16:25:00 -05:00 committed by GitHub
parent ce2c5875d8
commit 32a90f5f35
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/features/kube_features.go
View File

@ -520,7 +520,6 @@ const (
// owner: @RobertKrawitz // owner: @RobertKrawitz
// alpha: v1.15 // alpha: v1.15
// beta: v1.25
// //
// Allow use of filesystems for ephemeral storage monitoring. // Allow use of filesystems for ephemeral storage monitoring.
// Only applies if LocalStorageCapacityIsolation is set. // Only applies if LocalStorageCapacityIsolation is set.
@ -1016,7 +1015,7 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS
LocalStorageCapacityIsolation: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // remove in 1.27 LocalStorageCapacityIsolation: {Default: true, PreRelease: featuregate.GA, LockToDefault: true}, // remove in 1.27
LocalStorageCapacityIsolationFSQuotaMonitoring: {Default: true, PreRelease: featuregate.Beta}, LocalStorageCapacityIsolationFSQuotaMonitoring: {Default: false, PreRelease: featuregate.Alpha},
LogarithmicScaleDown: {Default: true, PreRelease: featuregate.Beta}, LogarithmicScaleDown: {Default: true, PreRelease: featuregate.Beta},

4
test/e2e_node/quota_lsci_test.go
View File

@ -63,7 +63,7 @@ func runOneQuotaTest(f *framework.Framework, quotasRequested bool) {
if quotasRequested && !supportsQuotas("/var/lib/kubelet") { if quotasRequested && !supportsQuotas("/var/lib/kubelet") {
// No point in running this as a positive test if quotas are not // No point in running this as a positive test if quotas are not
// enabled on the underlying filesystem. // enabled on the underlying filesystem.
e2eskipper.Skipf("Cannot run LocalStorageCapacityIsolationFSQuotaMonitoring on filesystem without project quota enabled") e2eskipper.Skipf("Cannot run LocalStorageCapacityIsolationQuotaMonitoring on filesystem without project quota enabled")
} }
// setting a threshold to 0% disables; non-empty map overrides default value (necessary due to omitempty) // setting a threshold to 0% disables; non-empty map overrides default value (necessary due to omitempty)
initialConfig.EvictionHard = map[string]string{"memory.available": "0%"} initialConfig.EvictionHard = map[string]string{"memory.available": "0%"}
@ -90,7 +90,7 @@ func runOneQuotaTest(f *framework.Framework, quotasRequested bool) {
}) })
} }
// LocalStorageCapacityIsolationFSQuotaMonitoring tests that quotas are // LocalStorageCapacityIsolationQuotaMonitoring tests that quotas are
// used for monitoring rather than du. The mechanism is to create a // used for monitoring rather than du. The mechanism is to create a
// pod that creates a file, deletes it, and writes data to it. If // pod that creates a file, deletes it, and writes data to it. If
// quotas are used to monitor, it will detect this deleted-but-in-use // quotas are used to monitor, it will detect this deleted-but-in-use