From 32a90f5f359a6afe84e6d1e9ae64604f7b9c4dbe Mon Sep 17 00:00:00 2001 From: Ryan Phillips Date: Fri, 26 Aug 2022 16:25:00 -0500 Subject: [PATCH] Revert "promote LocalStorageCapacityIsolationFSQuotaMonitoring to beta" --- pkg/features/kube_features.go | 3 +-- test/e2e_node/quota_lsci_test.go | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/pkg/features/kube_features.go b/pkg/features/kube_features.go index d9da0304dd4..ae673a96812 100644 --- a/pkg/features/kube_features.go +++ b/pkg/features/kube_features.go @@ -520,7 +520,6 @@ const ( // owner: @RobertKrawitz // alpha: v1.15 - // beta: v1.25 // // Allow use of filesystems for ephemeral storage monitoring. // 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 - LocalStorageCapacityIsolationFSQuotaMonitoring: {Default: true, PreRelease: featuregate.Beta}, + LocalStorageCapacityIsolationFSQuotaMonitoring: {Default: false, PreRelease: featuregate.Alpha}, LogarithmicScaleDown: {Default: true, PreRelease: featuregate.Beta}, diff --git a/test/e2e_node/quota_lsci_test.go b/test/e2e_node/quota_lsci_test.go index 0bb46b85646..b2e03285f9b 100644 --- a/test/e2e_node/quota_lsci_test.go +++ b/test/e2e_node/quota_lsci_test.go @@ -63,7 +63,7 @@ func runOneQuotaTest(f *framework.Framework, quotasRequested bool) { if quotasRequested && !supportsQuotas("/var/lib/kubelet") { // No point in running this as a positive test if quotas are not // 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) 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 // 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