github/client-go
1
0
Fork 0
mirror of https://github.com/kubernetes/client-go.git synced 2025-08-01 07:20:59 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #102090 from mengjiao-liu/fix-data-race-csi

Browse Source 
Prevent data race condition  in csi unit tests

Kubernetes-commit: 150675b1642e4769f029b4c4054b458e8a6e3700
This commit is contained in:
Kubernetes Publisher 2021-05-19 19:47:04 -07:00
commit 13cd91989c
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Godeps/Godeps.json generated
View File

@ -480,7 +480,7 @@
},
{
"ImportPath": "k8s.io/api",
"Rev": "d5fda5562a2e"
"Rev": "532146f2aa2a"
},
{
"ImportPath": "k8s.io/apimachinery",

4
go.mod
View File

@ -28,7 +28,7 @@ require (
golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d
golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba
google.golang.org/protobuf v1.25.0
k8s.io/api v0.0.0-20210519190848-d5fda5562a2e
k8s.io/api v0.0.0-20210520030843-532146f2aa2a
k8s.io/apimachinery v0.0.0-20210519190646-c7322e849168
k8s.io/klog/v2 v2.8.0
k8s.io/utils v0.0.0-20201110183641-67b214c5f920
@ -37,6 +37,6 @@ require (
)
replace (
k8s.io/api => k8s.io/api v0.0.0-20210519190848-d5fda5562a2e
k8s.io/api => k8s.io/api v0.0.0-20210520030843-532146f2aa2a
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210519190646-c7322e849168
)

4
go.sum
View File

@ -437,8 +437,8 @@ honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWh
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
k8s.io/api v0.0.0-20210519190848-d5fda5562a2e h1:NqV6nJIdQDUI6QvFuT+QDcc2s3kcWYUecGbTc74Y4GU=
k8s.io/api v0.0.0-20210519190848-d5fda5562a2e/go.mod h1:pYZcnMa1kuzJ76ydALsvcwPMSsRcNNkhMonm1K/9Umo=
k8s.io/api v0.0.0-20210520030843-532146f2aa2a h1:yk/O+aWhhXDM4xeO2KvPxpVp358XGaYIgSRmpxbDYak=
k8s.io/api v0.0.0-20210520030843-532146f2aa2a/go.mod h1:pYZcnMa1kuzJ76ydALsvcwPMSsRcNNkhMonm1K/9Umo=
k8s.io/apimachinery v0.0.0-20210519190646-c7322e849168 h1:mkBvQhy9WPz7t0Y3Muea1rVq2TRB91wvC8iE8xpbfl4=
k8s.io/apimachinery v0.0.0-20210519190646-c7322e849168/go.mod h1:4rwBOLnlX0KG0S4eNjF9Aw8Y92JlZQe1fX+e7TeGWQE=
k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=

4
testing/fake.go
View File

@ -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...)
}