diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index 0c27891a..d30a66da 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -460,11 +460,11 @@
 		},
 		{
 			"ImportPath": "k8s.io/api",
-			"Rev": "c873f2e8ab25"
+			"Rev": "9b864a59b88a"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery",
-			"Rev": "460d10991a52"
+			"Rev": "87c8a9682ad2"
 		},
 		{
 			"ImportPath": "k8s.io/gengo",
diff --git a/go.mod b/go.mod
index 646c7aa1..5e6f21a2 100644
--- a/go.mod
+++ b/go.mod
@@ -26,14 +26,14 @@ require (
 	golang.org/x/net v0.0.0-20201110031124-69a78807bb2b
 	golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d
 	golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e
-	k8s.io/api v0.0.0-20210115125903-c873f2e8ab25
-	k8s.io/apimachinery v0.0.0-20210121071119-460d10991a52
+	k8s.io/api v0.0.0-20210127121017-9b864a59b88a
+	k8s.io/apimachinery v0.0.0-20210127114339-87c8a9682ad2
 	k8s.io/klog/v2 v2.4.0
 	k8s.io/utils v0.0.0-20201110183641-67b214c5f920
 	sigs.k8s.io/yaml v1.2.0
 )
 
 replace (
-	k8s.io/api => k8s.io/api v0.0.0-20210115125903-c873f2e8ab25
-	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210121071119-460d10991a52
+	k8s.io/api => k8s.io/api v0.0.0-20210127121017-9b864a59b88a
+	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210127114339-87c8a9682ad2
 )
diff --git a/go.sum b/go.sum
index 0552341f..d01e4b1b 100644
--- a/go.sum
+++ b/go.sum
@@ -427,8 +427,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-20210115125903-c873f2e8ab25/go.mod h1:xpUvIW3IJYnKO2yMuT9r4zCZI1ppqiuEejNFI9eoqWo=
-k8s.io/apimachinery v0.0.0-20210121071119-460d10991a52/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU=
+k8s.io/api v0.0.0-20210127121017-9b864a59b88a/go.mod h1:Xl2Mk6qqDyNSEdMHf68J4XroyUwxOLfYgiq4/1Ii9ac=
+k8s.io/apimachinery v0.0.0-20210127114339-87c8a9682ad2/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU=
 k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
 k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
 k8s.io/klog/v2 v2.4.0 h1:7+X0fUguPyrKEC4WjH8iGDg3laWgMo5tMnRTIGTTxGQ=
diff --git a/util/connrotation/connrotation_test.go b/util/connrotation/connrotation_test.go
index 61616ed0..29a37d58 100644
--- a/util/connrotation/connrotation_test.go
+++ b/util/connrotation/connrotation_test.go
@@ -26,7 +26,7 @@ import (
 )
 
 func TestCloseAll(t *testing.T) {
-	closed := make(chan struct{})
+	closed := make(chan struct{}, 50)
 	dialFn := func(ctx context.Context, network, address string) (net.Conn, error) {
 		return closeOnlyConn{onClose: func() { closed <- struct{}{} }}, nil
 	}
@@ -42,10 +42,11 @@ func TestCloseAll(t *testing.T) {
 			}
 		}
 		dialer.CloseAll()
+		deadline := time.After(time.Second)
 		for j := 0; j < numConns; j++ {
 			select {
 			case <-closed:
-			case <-time.After(time.Second):
+			case <-deadline:
 				t.Fatalf("iteration %d: 1s after CloseAll only %d/%d connections closed", i, j, numConns)
 			}
 		}
@@ -59,48 +60,42 @@ func TestCloseAllRace(t *testing.T) {
 		return closeOnlyConn{onClose: func() { atomic.AddInt64(&conns, -1) }}, nil
 	})
 
-	done := make(chan struct{})
+	const raceCount = 5000
+	begin := &sync.WaitGroup{}
+	begin.Add(1)
+
 	wg := &sync.WaitGroup{}
 
 	// Close all as fast as we can
 	wg.Add(1)
 	go func() {
+		begin.Wait()
 		defer wg.Done()
-		for {
-			select {
-			case <-done:
-				return
-			default:
-				dialer.CloseAll()
-			}
+		for i := 0; i < raceCount; i++ {
+			dialer.CloseAll()
 		}
 	}()
 
 	// Dial as fast as we can
 	wg.Add(1)
 	go func() {
+		begin.Wait()
 		defer wg.Done()
-		for {
-			select {
-			case <-done:
+		for i := 0; i < raceCount; i++ {
+			if _, err := dialer.Dial("", ""); err != nil {
+				t.Error(err)
 				return
-			default:
-				if _, err := dialer.Dial("", ""); err != nil {
-					t.Error(err)
-					return
-				}
-				atomic.AddInt64(&conns, 1)
 			}
+			atomic.AddInt64(&conns, 1)
 		}
 	}()
 
-	// Soak to ensure no races
-	time.Sleep(time.Second)
+	// Trigger both goroutines as close to the same time as possible
+	begin.Done()
 
-	// Signal completion
-	close(done)
 	// Wait for goroutines
 	wg.Wait()
+
 	// Ensure CloseAll ran after all dials
 	dialer.CloseAll()