From b36786e96e8f832a5a261310897a4cc51e4d54a4 Mon Sep 17 00:00:00 2001 From: Paco Xu Date: Fri, 13 May 2022 22:34:09 +0800 Subject: [PATCH 1/2] promote LSCIQuotaFeature to beta --- pkg/features/kube_features.go | 3 ++- test/e2e_node/quota_lsci_test.go | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkg/features/kube_features.go b/pkg/features/kube_features.go index 9cf5058fe2d..9146135953e 100644 --- a/pkg/features/kube_features.go +++ b/pkg/features/kube_features.go @@ -495,6 +495,7 @@ const ( // owner: @RobertKrawitz // alpha: v1.15 + // beta: v1.24 // // Allow use of filesystems for ephemeral storage monitoring. // Only applies if LocalStorageCapacityIsolation is set. @@ -931,7 +932,7 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS LocalStorageCapacityIsolation: {Default: true, PreRelease: featuregate.Beta}, - LocalStorageCapacityIsolationFSQuotaMonitoring: {Default: false, PreRelease: featuregate.Alpha}, + LocalStorageCapacityIsolationFSQuotaMonitoring: {Default: true, PreRelease: featuregate.Beta}, 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 e5441147a53..758381df3a4 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 LocalStorageCapacityIsolationQuotaMonitoring on filesystem without project quota enabled") + e2eskipper.Skipf("Cannot run LocalStorageCapacityIsolationFSQuotaMonitoring 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) { }) } -// LocalStorageCapacityIsolationQuotaMonitoring tests that quotas are +// LocalStorageCapacityIsolationFSQuotaMonitoring 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 From 91ec31b2a853d17c7fdf289d4a8368f7b6647ca3 Mon Sep 17 00:00:00 2001 From: Paco Xu Date: Thu, 23 Jun 2022 10:04:49 +0800 Subject: [PATCH 2/2] Quota Monitoring fg: update promotion version to v1.25 --- pkg/features/kube_features.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/features/kube_features.go b/pkg/features/kube_features.go index 9146135953e..b1a45db9a6c 100644 --- a/pkg/features/kube_features.go +++ b/pkg/features/kube_features.go @@ -495,7 +495,7 @@ const ( // owner: @RobertKrawitz // alpha: v1.15 - // beta: v1.24 + // beta: v1.25 // // Allow use of filesystems for ephemeral storage monitoring. // Only applies if LocalStorageCapacityIsolation is set.