github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-09-02 01:39:02 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #125723 from p0lyn0mial/upstream-refactor-watch-list-kcm-units

Browse Source 
kube-controller-manager: refactor watchlist unit tests
This commit is contained in:
Kubernetes Prow Robot
2024-06-26 15:15:22 -07:00
committed by GitHub
parent a3a4f9658b cc7063e96d
commit 3084c15dd9
1 changed files with 18 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
cmd/kube-controller-manager/app/options/options_test.go
View File

@@ -1320,35 +1320,26 @@ func TestControllerManagerAliases(t *testing.T) {
} }
func TestWatchListClientFlagUsage(t *testing.T) { func TestWatchListClientFlagUsage(t *testing.T) {
assertWatchListClientFeatureDefaultValue(t)
fs := pflag.NewFlagSet("addflagstest", pflag.ContinueOnError) fs := pflag.NewFlagSet("addflagstest", pflag.ContinueOnError)
s, _ := NewKubeControllerManagerOptions() s, _ := NewKubeControllerManagerOptions()
for _, f := range s.Flags([]string{""}, []string{""}, nil).FlagSets { for _, f := range s.Flags([]string{""}, []string{""}, nil).FlagSets {
fs.AddFlagSet(f) fs.AddFlagSet(f)
} }
fgFlagName := "feature-gates" assertWatchListClientFeatureDefaultValue(t)
fg := fs.Lookup(fgFlagName) assertWatchListCommandLineDefaultValue(t, fs)
if fg == nil {
t.Fatalf("didn't find %q flag", fgFlagName)
}
expectedWatchListClientString := "WatchListClient=true|false (BETA - default=false)"
if !strings.Contains(fg.Usage, expectedWatchListClientString) {
t.Fatalf("%q flag doesn't contain the expected usage for %v feature gate.\nExpected = %v\nUsage = %v", fgFlagName, clientgofeaturegate.WatchListClient, expectedWatchListClientString, fg.Usage)
}
} }
func TestWatchListClientFlagChange(t *testing.T) { func TestWatchListClientFlagChange(t *testing.T) {
assertWatchListClientFeatureDefaultValue(t)
fs := pflag.NewFlagSet("addflagstest", pflag.ContinueOnError) fs := pflag.NewFlagSet("addflagstest", pflag.ContinueOnError)
s, _ := NewKubeControllerManagerOptions() s, _ := NewKubeControllerManagerOptions()
for _, f := range s.Flags([]string{""}, []string{""}, nil).FlagSets { for _, f := range s.Flags([]string{""}, []string{""}, nil).FlagSets {
fs.AddFlagSet(f) fs.AddFlagSet(f)
} }
assertWatchListClientFeatureDefaultValue(t)
assertWatchListCommandLineDefaultValue(t, fs)
args := []string{fmt.Sprintf("--feature-gates=%v=true", clientgofeaturegate.WatchListClient)} args := []string{fmt.Sprintf("--feature-gates=%v=true", clientgofeaturegate.WatchListClient)}
if err := fs.Parse(args); err != nil { if err := fs.Parse(args); err != nil {
t.Fatal(err) t.Fatal(err)
@@ -1367,6 +1358,19 @@ func assertWatchListClientFeatureDefaultValue(t *testing.T) {
} }
} }
func assertWatchListCommandLineDefaultValue(t *testing.T, fs *pflag.FlagSet) {
fgFlagName := "feature-gates"
fg := fs.Lookup(fgFlagName)
if fg == nil {
t.Fatalf("didn't find %q flag", fgFlagName)
}
expectedWatchListClientString := "WatchListClient=true|false (BETA - default=false)"
if !strings.Contains(fg.Usage, expectedWatchListClientString) {
t.Fatalf("%q flag doesn't contain the expected usage for %v feature gate.\nExpected = %v\nUsage = %v", fgFlagName, clientgofeaturegate.WatchListClient, expectedWatchListClientString, fg.Usage)
}
}
type sortedGCIgnoredResources []garbagecollectorconfig.GroupResource type sortedGCIgnoredResources []garbagecollectorconfig.GroupResource
func (r sortedGCIgnoredResources) Len() int { func (r sortedGCIgnoredResources) Len() int {