Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion config/v1/types_feature.go
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@ var FeatureSets = map[FeatureSet]*FeatureGateEnabledDisabled{
with("InsightsConfigAPI"). // insights, tremes (#ccx), OCP specific
with("CSIInlineVolumeAdmission"). // sig-storage, jdobson, OCP specific
with("MatchLabelKeysInPodTopologySpread"). // sig-scheduling, ingvagabund (#forum-workloads), Kubernetes feature gate
with("RetroactiveDefaultStorageClass"). // sig-storage, RomanBednar, Kubernetes feature gate
toFeatures(),
LatencySensitive: newDefaultFeatures().
with(
Expand All @@ -134,7 +135,9 @@ var defaultFeatures = &FeatureGateEnabledDisabled{
"DownwardAPIHugePages", // sig-node, rphillips
"OpenShiftPodSecurityAdmission", // bz-auth, stlaz, OCP specific
},
Disabled: []string{},
Disabled: []string{
"RetroactiveDefaultStorageClass", // sig-storage, RomanBednar, Kubernetes feature gate
},
}

type featureSetBuilder struct {
Expand Down
12 changes: 9 additions & 3 deletions config/v1/types_features_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ func TestFeatureBuilder(t *testing.T) {
"OpenShiftPodSecurityAdmission",
},
Disabled: []string{
"RetroactiveDefaultStorageClass",
"APIPriorityAndFairness",
},
},
Expand All @@ -41,7 +42,9 @@ func TestFeatureBuilder(t *testing.T) {
"OpenShiftPodSecurityAdmission",
"CSIMigrationAzureFile",
},
Disabled: []string{},
Disabled: []string{
"RetroactiveDefaultStorageClass",
},
},
},
{
Expand All @@ -54,6 +57,7 @@ func TestFeatureBuilder(t *testing.T) {
"OpenShiftPodSecurityAdmission",
},
Disabled: []string{
"RetroactiveDefaultStorageClass",
"APIPriorityAndFairness",
"other",
},
Expand All @@ -71,15 +75,17 @@ func TestFeatureBuilder(t *testing.T) {
"CSIMigrationAzureFile",
"other",
},
Disabled: []string{},
Disabled: []string{
"RetroactiveDefaultStorageClass",
},
},
},
}

for _, tc := range tests {
t.Run(tc.name, func(t *testing.T) {
if !reflect.DeepEqual(tc.expected, tc.actual) {
t.Error(tc.actual)
t.Errorf("\nExpected feature gates: \n Enabled: %s \n Disabled: %s \nBut got:\n Enabled: %v \n Disabled: %s\n", tc.expected.Enabled, tc.expected.Disabled, tc.actual.Enabled, tc.actual.Disabled)
}
})
}
Expand Down