Skip to content
Permalink
Browse files

Fix the name of the feature gate to LocalStorageCapacityIsolationFSQu…

…otaMonitoring
  • Loading branch information...
RobertKrawitz committed Jan 11, 2019
1 parent ee7c0ca commit 9619441006ed49adb1eb333da669d36e72698c67
Showing with 4 additions and 4 deletions.
  1. +2 −2 pkg/features/kube_features.go
  2. +1 −1 pkg/volume/util/quota/quota.go
  3. +1 −1 pkg/volume/util/quota/quota_linux_test.go
@@ -396,7 +396,7 @@ const (
//
// Allow use of filesystems for ephemeral storage monitoring.
// Only applies if LocalStorageCapacityIsolation is set.
FSQuotaForLSCIMonitoring = "FSQuotaForLSCIMonitoring"
LocalStorageCapacityIsolationFSQuotaMonitoring utilfeature.Feature = "LocalStorageCapacityIsolationFSQuotaMonitoring"
)

func init() {
@@ -464,7 +464,7 @@ var defaultKubernetesFeatureGates = map[utilfeature.Feature]utilfeature.FeatureS
ProcMountType: {Default: false, PreRelease: utilfeature.Alpha},
TTLAfterFinished: {Default: false, PreRelease: utilfeature.Alpha},
KubeletPodResources: {Default: false, PreRelease: utilfeature.Alpha},
FSQuotaForLSCIMonitoring: {Default: false, PreRelease: utilfeature.Alpha},
LocalStorageCapacityIsolationFSQuotaMonitoring: {Default: false, PreRelease: utilfeature.Alpha},

// inherited features from generic apiserver, relisted here to get a conflict if it is changed
// unintentionally on either side:
@@ -44,5 +44,5 @@ type Interface interface {
}

func enabledQuotasForMonitoring() bool {
return utilfeature.DefaultFeatureGate.Enabled(features.FSQuotaForLSCIMonitoring)
return utilfeature.DefaultFeatureGate.Enabled(features.LocalStorageCapacityIsolationFSQuotaMonitoring)
}
@@ -598,7 +598,7 @@ func runCaseDisabled(t *testing.T, testcase quotaTestCase, seq int) bool {
}

func testAddRemoveQuotas(t *testing.T, enabled bool) {
defer utilfeaturetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.FSQuotaForLSCIMonitoring, enabled)()
defer utilfeaturetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.LocalStorageCapacityIsolationFSQuotaMonitoring, enabled)()
tmpProjectsFile, err := ioutil.TempFile("", "projects")
if err == nil {
_, err = tmpProjectsFile.WriteString(projectsHeader)

0 comments on commit 9619441

Please sign in to comment.
You can’t perform that action at this time.