Merge pull request #135005 from p0lyn0mial/upstream-watchlist-unsupported-wl-tracker-wrapp

apiserver/pkg/admission/plugin/policy/test: wrap trackers with ToListWatcherWithWatchListSemantics Kubernetes-commit: 3c2e64ec789935bdd8c0d93b14e84826d4aee220

Author: k8s-publishing-bot

pkg/admission/plugin/policy/generic/policy_test_context.go

@@ -159,27 +159,27 @@ func NewPolicyTestContext[P, B runtime.Object, E Evaluator](
 // Make an informer for our policies and bindings
 
 policyInformer := cache.NewSharedIndexInformer(
-&cache.ListWatch{
+cache.ToListWatcherWithWatchListSemantics(&cache.ListWatch{
 ListFunc: func(options metav1.ListOptions) (runtime.Object, error) {
 return policiesAndBindingsTracker.List(fakePolicyGVR, fakePolicyGVK, "")
 },
 WatchFunc: func(options metav1.ListOptions) (watch.Interface, error) {
 return policiesAndBindingsTracker.Watch(fakePolicyGVR, "")
 },
-},
+}, policiesAndBindingsTracker),
 Pexample,
 30*time.Second,
 cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc},
 )
 bindingInformer := cache.NewSharedIndexInformer(
-&cache.ListWatch{
+cache.ToListWatcherWithWatchListSemantics(&cache.ListWatch{
 ListFunc: func(options metav1.ListOptions) (runtime.Object, error) {
 return policiesAndBindingsTracker.List(fakeBindingGVR, fakeBindingGVK, "")
 },
 WatchFunc: func(options metav1.ListOptions) (watch.Interface, error) {
 return policiesAndBindingsTracker.Watch(fakeBindingGVR, "")
 },
-},
+}, policiesAndBindingsTracker),
 Bexample,
 30*time.Second,
 cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc},

pkg/admission/plugin/policy/internal/generic/controller_test.go

@@ -38,7 +38,6 @@ import (
 "k8s.io/apimachinery/pkg/runtime/serializer"
 "k8s.io/apimachinery/pkg/util/wait"
 "k8s.io/apimachinery/pkg/watch"
-
 "k8s.io/apiserver/pkg/admission/plugin/policy/internal/generic"
 
 clienttesting "k8s.io/client-go/testing"
@@ -113,14 +112,14 @@ func setupTest(ctx context.Context, customReconciler func(string, string, runtim
 
 // Set up fake informers that return instances of mock Policy definitoins
 // and mock policy bindings
-informer = &testInformer{SharedIndexInformer: cache.NewSharedIndexInformer(&cache.ListWatch{
+informer = &testInformer{SharedIndexInformer: cache.NewSharedIndexInformer(cache.ToListWatcherWithWatchListSemantics(&cache.ListWatch{
 ListFunc: func(options metav1.ListOptions) (runtime.Object, error) {
 return tracker.List(fakeGVR, fakeGVK, "")
 },
 WatchFunc: func(options metav1.ListOptions) (watch.Interface, error) {
 return tracker.Watch(fakeGVR, "")
 },
-}, &unstructured.Unstructured{}, 30*time.Second, nil)}
+}, tracker), &unstructured.Unstructured{}, 30*time.Second, nil)}
 
 reconciler := func(namespace, name string, newObj *unstructured.Unstructured) error {
 var err error