Merge branch 'devel' into use_klog_v2

pkg/fake/conflict_reactor.go

@@ -30,6 +30,9 @@ import (
 )
 
 func ConflictOnUpdateReactor(f *testing.Fake, resource string) {
+	f.Lock()
+	defer f.Unlock()
+
 	reactors := f.ReactionChain[0:]
 	resourceVersion := "100"
 	state := sync.Map{}

pkg/fake/create_reactor.go

@@ -36,6 +36,9 @@ type createReactor struct {
 
 // AddCreateReactor adds a reactor to mimic real K8s create behavior to handle GenerateName, validation et al.
 func AddCreateReactor(f *testing.Fake) {
+	f.Lock()
+	defer f.Unlock()
+
 	r := &createReactor{reactors: f.ReactionChain[0:]}
 	f.PrependReactor("create", "*", r.react)
 }

pkg/fake/delete_colection_reactor.go

@@ -43,8 +43,10 @@ type DeleteCollectionReactor struct {
 }
 
 func AddDeleteCollectionReactor(f *testing.Fake) {
+	f.Lock()
 	r := &DeleteCollectionReactor{gvrToGVK: map[schema.GroupVersionResource]schema.GroupVersionKind{}, reactors: f.ReactionChain[0:]}
 	f.PrependReactor("delete-collection", "*", r.react)
+	f.Unlock()
 
 	for gvk := range scheme.Scheme.AllKnownTypes() {
 		if !strings.HasSuffix(gvk.Kind, "List") {

pkg/fake/delete_reactor.go

@@ -34,6 +34,9 @@ type deleteReactor struct {
 
 // AddDeleteReactor adds a reactor to mimic real K8s delete behavior to handle ResourceVersion, DeletionTimestamp et al.
 func AddDeleteReactor(f *testing.Fake) {
+	f.Lock()
+	defer f.Unlock()
+
 	r := &deleteReactor{reactors: f.ReactionChain[0:]}
 	f.PrependReactor("delete", "*", r.react)
 }

pkg/fake/fail_on_action_reactor.go

@@ -43,22 +43,20 @@ func FailOnAction(f *testing.Fake, resource, verb string, customErr error, autoR
 		retErr = errors.New("fake error")
 	}
 
-	chain := []testing.Reactor{&testing.SimpleReactor{
-		Verb:     verb,
-		Resource: resource,
-		Reaction: func(action testing.Action) (bool, runtime.Object, error) {
-			if r.fail.Load().(bool) {
-				if autoReset {
-					r.fail.Store(false)
-				}
-
-				return true, nil, retErr
+	f.Lock()
+	defer f.Unlock()
+
+	f.PrependReactor(verb, resource, func(action testing.Action) (bool, runtime.Object, error) {
+		if r.fail.Load().(bool) {
+			if autoReset {
+				r.fail.Store(false)
 			}
 
-			return false, nil, nil
-		},
-	}}
-	f.ReactionChain = append(chain, f.ReactionChain...)
+			return true, nil, retErr
+		}
+
+		return false, nil, nil
+	})
 
 	return r
 }

pkg/fake/failing_reactor.go

@@ -41,8 +41,11 @@ func NewFailingReactor(f *testing.Fake) *FailingReactor {
 
 func NewFailingReactorForResource(f *testing.Fake, resource string) *FailingReactor {
 	r := &FailingReactor{}
-	chain := []testing.Reactor{&testing.SimpleReactor{Verb: "*", Resource: resource, Reaction: r.react}}
-	f.ReactionChain = append(chain, f.ReactionChain...)
+
+	f.Lock()
+	defer f.Unlock()
+
+	f.PrependReactor("*", resource, r.react)
 
 	return r
 }

pkg/fake/list_reactor.go

@@ -33,6 +33,9 @@ type filteringListReactor struct {
 }
 
 func AddFilteringListReactor(f *testing.Fake) {
+	f.Lock()
+	defer f.Unlock()
+
 	r := &filteringListReactor{reactors: f.ReactionChain[0:]}
 	f.PrependReactor("list", "*", r.react)
 }

pkg/fake/update_reactor.go

@@ -37,6 +37,9 @@ type updateReactor struct {
 
 // AddUpdateReactor adds a reactor to mimic real K8s update behavior to handle ResourceVersion et al.
 func AddUpdateReactor(f *testing.Fake) {
+	f.Lock()
+	defer f.Unlock()
+
 	r := &updateReactor{reactors: f.ReactionChain[0:]}
 	f.PrependReactor("update", "*", r.react)
 }