Skip to content

Commit 0f933a0

Browse files
committed
test/apimachinery/watchlist: add scenario for metadata client's List method
1 parent 6d25866 commit 0f933a0

File tree

1 file changed

+31
-0
lines changed

1 file changed

+31
-0
lines changed

test/e2e/apimachinery/watchlist.go

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,14 @@ import (
3131
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
3232
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
3333
"k8s.io/apimachinery/pkg/runtime"
34+
"k8s.io/apimachinery/pkg/runtime/schema"
3435
"k8s.io/apimachinery/pkg/util/wait"
3536
"k8s.io/apimachinery/pkg/watch"
3637
utilfeature "k8s.io/apiserver/pkg/util/feature"
3738
"k8s.io/client-go/dynamic"
3839
clientfeatures "k8s.io/client-go/features"
3940
"k8s.io/client-go/kubernetes"
41+
"k8s.io/client-go/metadata"
4042
"k8s.io/client-go/rest"
4143
"k8s.io/client-go/tools/cache"
4244
"k8s.io/client-go/util/consistencydetector"
@@ -140,6 +142,35 @@ var _ = SIGDescribe("API Streaming (aka. WatchList)", framework.WithSerial(), fe
140142
expectedRequestMadeByDynamicClient := getExpectedRequestMadeByClientFor(secretList.GetResourceVersion())
141143
gomega.Expect(rt.actualRequests).To(gomega.Equal(expectedRequestMadeByDynamicClient))
142144
})
145+
ginkgo.It("should be requested by metadata client's List method when WatchListClient is enabled", func(ctx context.Context) {
146+
featuregatetesting.SetFeatureGateDuringTest(ginkgo.GinkgoTB(), utilfeature.DefaultFeatureGate, featuregate.Feature(clientfeatures.WatchListClient), true)
147+
148+
metaClient, err := metadata.NewForConfig(f.ClientConfig())
149+
framework.ExpectNoError(err)
150+
expectedMetaSecrets := []metav1.PartialObjectMetadata{}
151+
for _, addedSecret := range addWellKnownSecrets(ctx, f) {
152+
addedSecretMeta, err := metaClient.Resource(v1.SchemeGroupVersion.WithResource("secrets")).Namespace(f.Namespace.Name).Get(ctx, addedSecret.Name, metav1.GetOptions{})
153+
framework.ExpectNoError(err)
154+
expectedMetaSecrets = append(expectedMetaSecrets, *addedSecretMeta)
155+
}
156+
157+
rt, clientConfig := clientConfigWithRoundTripper(f)
158+
wrappedMetaClient, err := metadata.NewForConfig(clientConfig)
159+
framework.ExpectNoError(err)
160+
161+
ginkgo.By("Streaming secrets metadata from the server")
162+
secretMetaList, err := wrappedMetaClient.Resource(v1.SchemeGroupVersion.WithResource("secrets")).Namespace(f.Namespace.Name).List(ctx, metav1.ListOptions{})
163+
framework.ExpectNoError(err)
164+
165+
ginkgo.By("Verifying if the secret meta list was properly streamed")
166+
streamedMetaSecrets := secretMetaList.Items
167+
gomega.Expect(cmp.Equal(expectedMetaSecrets, streamedMetaSecrets)).To(gomega.BeTrueBecause("data received via watchlist must match the added data"))
168+
gomega.Expect(secretMetaList.GetObjectKind().GroupVersionKind()).To(gomega.Equal(schema.GroupVersion{}.WithKind("PartialObjectMetadataList")))
169+
170+
ginkgo.By("Verifying if expected requests were sent to the server")
171+
expectedRequestMadeByMetaClient := getExpectedRequestMadeByClientFor(secretMetaList.GetResourceVersion())
172+
gomega.Expect(rt.actualRequests).To(gomega.Equal(expectedRequestMadeByMetaClient))
173+
})
143174
})
144175

145176
type roundTripper struct {

0 commit comments

Comments
 (0)