diff --git a/test/e2e/apimachinery/watchlist.go b/test/e2e/apimachinery/watchlist.go index 0e5e131a2cc..041768a64a9 100644 --- a/test/e2e/apimachinery/watchlist.go +++ b/test/e2e/apimachinery/watchlist.go @@ -66,13 +66,7 @@ var _ = SIGDescribe("API Streaming (aka. WatchList)", framework.WithSerial(), fe nil, ) - ginkgo.By(fmt.Sprintf("Adding 5 secrets to %s namespace", f.Namespace.Name)) - var expectedSecrets []v1.Secret - for i := 1; i <= 5; i++ { - secret, err := f.ClientSet.CoreV1().Secrets(f.Namespace.Name).Create(ctx, newSecret(fmt.Sprintf("secret-%d", i)), metav1.CreateOptions{}) - framework.ExpectNoError(err) - expectedSecrets = append(expectedSecrets, *secret) - } + expectedSecrets := addWellKnownSecrets(ctx, f) ginkgo.By("Starting the secret informer") go secretInformer.Run(stopCh) @@ -99,13 +93,7 @@ var _ = SIGDescribe("API Streaming (aka. WatchList)", framework.WithSerial(), fe ginkgo.It("should be requested by client-go's List method when WatchListClient is enabled", func(ctx context.Context) { featuregatetesting.SetFeatureGateDuringTest(ginkgo.GinkgoTB(), utilfeature.DefaultFeatureGate, featuregate.Feature(clientfeatures.WatchListClient), true) - ginkgo.By(fmt.Sprintf("Adding 5 secrets to %s namespace", f.Namespace.Name)) - var expectedSecrets []v1.Secret - for i := 1; i <= 5; i++ { - secret, err := f.ClientSet.CoreV1().Secrets(f.Namespace.Name).Create(ctx, newSecret(fmt.Sprintf("secret-%d", i)), metav1.CreateOptions{}) - framework.ExpectNoError(err) - expectedSecrets = append(expectedSecrets, *secret) - } + expectedSecrets := addWellKnownSecrets(ctx, f) rt, clientConfig := clientConfigWithRoundTripper(f) wrappedKubeClient, err := kubernetes.NewForConfig(clientConfig) @@ -204,6 +192,17 @@ func getExpectedRequestMadeByClientFor(rv string) []string { return expectedRequestMadeByClient } +func addWellKnownSecrets(ctx context.Context, f *framework.Framework) []v1.Secret { + ginkgo.By(fmt.Sprintf("Adding 5 secrets to %s namespace", f.Namespace.Name)) + var secrets []v1.Secret + for i := 1; i <= 5; i++ { + secret, err := f.ClientSet.CoreV1().Secrets(f.Namespace.Name).Create(ctx, newSecret(fmt.Sprintf("secret-%d", i)), metav1.CreateOptions{}) + framework.ExpectNoError(err) + secrets = append(secrets, *secret) + } + return secrets +} + type byName []v1.Secret func (a byName) Len() int { return len(a) }