Merge pull request kubernetes#128084 from macsko/fix_panic_when_defining_featuregates_only_on_workload_level_scheduler_perf

k8s-ci-robot · web-flow · commit 558c0b6eaa38 · 2024-10-15T23:05:03.000+01:00
Fix panic when setting feature gates only on workload level in scheduler_perf
diff --git a/test/integration/scheduler_perf/scheduler_perf.go b/test/integration/scheduler_perf/scheduler_perf.go
@@ -1053,6 +1053,9 @@ func setupTestCase(t testing.TB, tc *testCase, featureGates map[featuregate.Feat
 }
 
 func featureGatesMerge(src map[featuregate.Feature]bool, overrides map[featuregate.Feature]bool) map[featuregate.Feature]bool {
+	if len(src) == 0 {
+		return maps.Clone(overrides)
+	}
 	result := maps.Clone(src)
 	for feature, enabled := range overrides {
 		result[feature] = enabled

Original file line number	Diff line number	Diff line change
`@@ -1053,6 +1053,9 @@ func setupTestCase(t testing.TB, tc *testCase, featureGates map[featuregate.Feat`
`1053`	`1053`	`}`
`1054`	`1054`
`1055`	`1055`	`func featureGatesMerge(src map[featuregate.Feature]bool, overrides map[featuregate.Feature]bool) map[featuregate.Feature]bool {`
	`1056`	`+ if len(src) == 0 {`
	`1057`	`+ return maps.Clone(overrides)`
	`1058`	`+ }`
`1056`	`1059`	`result := maps.Clone(src)`
`1057`	`1060`	`for feature, enabled := range overrides {`
`1058`	`1061`	`result[feature] = enabled`