Update dependencies to v0.20.0-beta.2 tag

Godeps/Godeps.json

@@ -464,11 +464,11 @@
 		},
 		{
 			"ImportPath": "k8s.io/api",
-			"Rev": "v0.20.1-rc.1"
+			"Rev": "v0.20.0-beta.2"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery",
-			"Rev": "v0.20.1-rc.1"
+			"Rev": "v0.20.0-beta.2"
 		},
 		{
 			"ImportPath": "k8s.io/gengo",

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.20.1-rc.1
-	k8s.io/apimachinery v0.20.1-rc.1
+	k8s.io/api v0.20.0-beta.2
+	k8s.io/apimachinery v0.20.0-beta.2
 	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.20.1-rc.1
-	k8s.io/apimachinery => k8s.io/apimachinery v0.20.1-rc.1
+	k8s.io/api => k8s.io/api v0.20.0-beta.2
+	k8s.io/apimachinery => k8s.io/apimachinery v0.20.0-beta.2
 )

go.sum

@@ -433,8 +433,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.20.1-rc.1/go.mod h1:N9jIfHHP1QaO5ntclKoWcajZPeWjJVjAvHXzmlglUyo=
-k8s.io/apimachinery v0.20.1-rc.1/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU=
+k8s.io/api v0.20.0-beta.2/go.mod h1:GYLMpsvdRvB+u1feyZEqein68bklcyxaFnDYCvdHeJI=
+k8s.io/apimachinery v0.20.0-beta.2/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=

rest/connection_test.go

@@ -1,164 +0,0 @@
-/*
-Copyright 2019 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 rest
-
-import (
-	"context"
-	"fmt"
-	"io"
-	"net"
-	"net/http"
-	"net/http/httptest"
-	"net/url"
-	"os"
-	"strconv"
-	"sync/atomic"
-	"testing"
-	"time"
-
-	"k8s.io/apimachinery/pkg/runtime/schema"
-	"k8s.io/apimachinery/pkg/runtime/serializer"
-	utilnet "k8s.io/apimachinery/pkg/util/net"
-)
-
-type tcpLB struct {
-	t         *testing.T
-	ln        net.Listener
-	serverURL string
-	dials     int32
-}
-
-func (lb *tcpLB) handleConnection(in net.Conn, stopCh chan struct{}) {
-	out, err := net.Dial("tcp", lb.serverURL)
-	if err != nil {
-		lb.t.Log(err)
-		return
-	}
-	go io.Copy(out, in)
-	go io.Copy(in, out)
-	<-stopCh
-	if err := out.Close(); err != nil {
-		lb.t.Fatalf("failed to close connection: %v", err)
-	}
-}
-
-func (lb *tcpLB) serve(stopCh chan struct{}) {
-	conn, err := lb.ln.Accept()
-	if err != nil {
-		lb.t.Fatalf("failed to accept: %v", err)
-	}
-	atomic.AddInt32(&lb.dials, 1)
-	go lb.handleConnection(conn, stopCh)
-}
-
-func newLB(t *testing.T, serverURL string) *tcpLB {
-	ln, err := net.Listen("tcp", "127.0.0.1:0")
-	if err != nil {
-		t.Fatalf("failed to bind: %v", err)
-	}
-	lb := tcpLB{
-		serverURL: serverURL,
-		ln:        ln,
-		t:         t,
-	}
-	return &lb
-}
-
-func setEnv(key, value string) func() {
-	originalValue := os.Getenv(key)
-	os.Setenv(key, value)
-	return func() {
-		os.Setenv(key, originalValue)
-	}
-}
-
-const (
-	readIdleTimeout int = 1
-	pingTimeout     int = 1
-)
-
-func TestReconnectBrokenTCP(t *testing.T) {
-	defer setEnv("HTTP2_READ_IDLE_TIMEOUT_SECONDS", strconv.Itoa(readIdleTimeout))()
-	defer setEnv("HTTP2_PING_TIMEOUT_SECONDS", strconv.Itoa(pingTimeout))()
-	defer setEnv("DISABLE_HTTP2", "")()
-	ts := httptest.NewUnstartedServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		fmt.Fprintf(w, "Hello, %s", r.Proto)
-	}))
-	ts.EnableHTTP2 = true
-	ts.StartTLS()
-	defer ts.Close()
-
-	u, err := url.Parse(ts.URL)
-	if err != nil {
-		t.Fatalf("failed to parse URL from %q: %v", ts.URL, err)
-	}
-	lb := newLB(t, u.Host)
-	defer lb.ln.Close()
-	stopCh := make(chan struct{})
-	go lb.serve(stopCh)
-	transport, ok := ts.Client().Transport.(*http.Transport)
-	if !ok {
-		t.Fatalf("failed to assert *http.Transport")
-	}
-	config := &Config{
-		Host:      "https://" + lb.ln.Addr().String(),
-		Transport: utilnet.SetTransportDefaults(transport),
-		Timeout:   1 * time.Second,
-		// These fields are required to create a REST client.
-		ContentConfig: ContentConfig{
-			GroupVersion:         &schema.GroupVersion{},
-			NegotiatedSerializer: &serializer.CodecFactory{},
-		},
-	}
-	client, err := RESTClientFor(config)
-	if err != nil {
-		t.Fatalf("failed to create REST client: %v", err)
-	}
-	data, err := client.Get().AbsPath("/").DoRaw(context.TODO())
-	if err != nil {
-		t.Fatalf("unexpected err: %s: %v", data, err)
-	}
-	if string(data) != "Hello, HTTP/2.0" {
-		t.Fatalf("unexpected response: %s", data)
-	}
-
-	// Deliberately let the LB stop proxying traffic for the current
-	// connection. This mimics a broken TCP connection that's not properly
-	// closed.
-	close(stopCh)
-
-	stopCh = make(chan struct{})
-	go lb.serve(stopCh)
-	// Sleep enough time for the HTTP/2 health check to detect and close
-	// the broken TCP connection.
-	time.Sleep(time.Duration(1+readIdleTimeout+pingTimeout) * time.Second)
-	// If the HTTP/2 health check were disabled, the broken connection
-	// would still be in the connection pool, the following request would
-	// then reuse the broken connection instead of creating a new one, and
-	// thus would fail.
-	data, err = client.Get().AbsPath("/").DoRaw(context.TODO())
-	if err != nil {
-		t.Fatalf("unexpected err: %v", err)
-	}
-	if string(data) != "Hello, HTTP/2.0" {
-		t.Fatalf("unexpected response: %s", data)
-	}
-	dials := atomic.LoadInt32(&lb.dials)
-	if dials != 2 {
-		t.Fatalf("expected %d dials, got %d", 2, dials)
-	}
-}

rest/request_test.go

@@ -2228,18 +2228,14 @@ func TestRequestPreflightCheck(t *testing.T) {
 
 func TestThrottledLogger(t *testing.T) {
 	now := time.Now()
-	oldClock := globalThrottledLogger.clock
-	defer func() {
-		globalThrottledLogger.clock = oldClock
-	}()
 	clock := clock.NewFakeClock(now)
 	globalThrottledLogger.clock = clock
 
 	logMessages := 0
-	for i := 0; i < 1000; i++ {
+	for i := 0; i < 10000; i++ {
 		var wg sync.WaitGroup
-		wg.Add(10)
-		for j := 0; j < 10; j++ {
+		wg.Add(100)
+		for j := 0; j < 100; j++ {
 			go func() {
 				if _, ok := globalThrottledLogger.attemptToLog(); ok {
 					logMessages++
@@ -2252,7 +2248,7 @@ func TestThrottledLogger(t *testing.T) {
 		clock.SetTime(now)
 	}
 
-	if a, e := logMessages, 100; a != e {
+	if a, e := logMessages, 1000; a != e {
 		t.Fatalf("expected %v log messages, but got %v", e, a)
 	}
 }