Update k8s dependencies to v1.22.0-rc.0

vendor/k8s.io/client-go/testing/fake.go

@@ -106,11 +106,15 @@ func (c *Fake) PrependReactor(verb, resource string, reaction ReactionFunc) {
 
 // AddWatchReactor appends a reactor to the end of the chain.
 func (c *Fake) AddWatchReactor(resource string, reaction WatchReactionFunc) {
+	c.Lock()
+	defer c.Unlock()
 	c.WatchReactionChain = append(c.WatchReactionChain, &SimpleWatchReactor{resource, reaction})
 }
 
 // PrependWatchReactor adds a reactor to the beginning of the chain.
 func (c *Fake) PrependWatchReactor(resource string, reaction WatchReactionFunc) {
+	c.Lock()
+	defer c.Unlock()
 	c.WatchReactionChain = append([]WatchReactor{&SimpleWatchReactor{resource, reaction}}, c.WatchReactionChain...)
 }
 

vendor/k8s.io/client-go/testing/fixture.go

@@ -20,6 +20,7 @@ import (
 	"fmt"
 	"reflect"
 	"sort"
+	"strings"
 	"sync"
 
 	jsonpatch "github.com/evanphx/json-patch"
@@ -399,7 +400,8 @@ func (t *tracker) add(gvr schema.GroupVersionResource, obj runtime.Object, ns st
 	if _, ok = t.objects[gvr][namespacedName]; ok {
 		if replaceExisting {
 			for _, w := range t.getWatches(gvr, ns) {
-				w.Modify(obj)
+				// To avoid the object from being accidentally modified by watcher
+				w.Modify(obj.DeepCopyObject())
 			}
 			t.objects[gvr][namespacedName] = obj
 			return nil
@@ -415,7 +417,8 @@ func (t *tracker) add(gvr schema.GroupVersionResource, obj runtime.Object, ns st
 	t.objects[gvr][namespacedName] = obj
 
 	for _, w := range t.getWatches(gvr, ns) {
-		w.Add(obj)
+		// To avoid the object from being accidentally modified by watcher
+		w.Add(obj.DeepCopyObject())
 	}
 
 	return nil
@@ -455,7 +458,7 @@ func (t *tracker) Delete(gvr schema.GroupVersionResource, ns, name string) error
 
 	delete(objs, namespacedName)
 	for _, w := range t.getWatches(gvr, ns) {
-		w.Delete(obj)
+		w.Delete(obj.DeepCopyObject())
 	}
 	return nil
 }
@@ -509,12 +512,8 @@ func (r *SimpleReactor) Handles(action Action) bool {
 	if !verbCovers {
 		return false
 	}
-	resourceCovers := r.Resource == "*" || r.Resource == action.GetResource().Resource
-	if !resourceCovers {
-		return false
-	}
 
-	return true
+	return resourceCovers(r.Resource, action)
 }
 
 func (r *SimpleReactor) React(action Action) (bool, runtime.Object, error) {
@@ -530,12 +529,7 @@ type SimpleWatchReactor struct {
 }
 
 func (r *SimpleWatchReactor) Handles(action Action) bool {
-	resourceCovers := r.Resource == "*" || r.Resource == action.GetResource().Resource
-	if !resourceCovers {
-		return false
-	}
-
-	return true
+	return resourceCovers(r.Resource, action)
 }
 
 func (r *SimpleWatchReactor) React(action Action) (bool, watch.Interface, error) {
@@ -551,14 +545,27 @@ type SimpleProxyReactor struct {
 }
 
 func (r *SimpleProxyReactor) Handles(action Action) bool {
-	resourceCovers := r.Resource == "*" || r.Resource == action.GetResource().Resource
-	if !resourceCovers {
-		return false
-	}
-
-	return true
+	return resourceCovers(r.Resource, action)
 }
 
 func (r *SimpleProxyReactor) React(action Action) (bool, restclient.ResponseWrapper, error) {
 	return r.Reaction(action)
 }
+
+func resourceCovers(resource string, action Action) bool {
+	if resource == "*" {
+		return true
+	}
+
+	if resource == action.GetResource().Resource {
+		return true
+	}
+
+	if index := strings.Index(resource, "/"); index != -1 &&
+		resource[:index] == action.GetResource().Resource &&
+		resource[index+1:] == action.GetSubresource() {
+		return true
+	}
+
+	return false
+}

vendor/k8s.io/client-go/testing/interface.go

@@ -0,0 +1,66 @@
+/*
+Copyright 2021 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package testing
+
+import (
+	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/watch"
+	restclient "k8s.io/client-go/rest"
+)
+
+type FakeClient interface {
+	// Tracker gives access to the ObjectTracker internal to the fake client.
+	Tracker() ObjectTracker
+
+	// AddReactor appends a reactor to the end of the chain.
+	AddReactor(verb, resource string, reaction ReactionFunc)
+
+	// PrependReactor adds a reactor to the beginning of the chain.
+	PrependReactor(verb, resource string, reaction ReactionFunc)
+
+	// AddWatchReactor appends a reactor to the end of the chain.
+	AddWatchReactor(resource string, reaction WatchReactionFunc)
+
+	// PrependWatchReactor adds a reactor to the beginning of the chain.
+	PrependWatchReactor(resource string, reaction WatchReactionFunc)
+
+	// AddProxyReactor appends a reactor to the end of the chain.
+	AddProxyReactor(resource string, reaction ProxyReactionFunc)
+
+	// PrependProxyReactor adds a reactor to the beginning of the chain.
+	PrependProxyReactor(resource string, reaction ProxyReactionFunc)
+
+	// Invokes records the provided Action and then invokes the ReactionFunc that
+	// handles the action if one exists. defaultReturnObj is expected to be of the
+	// same type a normal call would return.
+	Invokes(action Action, defaultReturnObj runtime.Object) (runtime.Object, error)
+
+	// InvokesWatch records the provided Action and then invokes the ReactionFunc
+	// that handles the action if one exists.
+	InvokesWatch(action Action) (watch.Interface, error)
+
+	// InvokesProxy records the provided Action and then invokes the ReactionFunc
+	// that handles the action if one exists.
+	InvokesProxy(action Action) restclient.ResponseWrapper
+
+	// ClearActions clears the history of actions called on the fake client.
+	ClearActions()
+
+	// Actions returns a chronologically ordered slice fake actions called on the
+	// fake client.
+	Actions() []Action
+}