Merge pull request #50775 from apelisse/fail-gke-failing-test

Automatic merge from submit-queue

client-go: Make conditionalTransport a WrapperRoundTripper

**What this PR does / why we need it**:
Fixes broken GKE test: https://k8s-gubernator.appspot.com/builds/kubernetes-jenkins/logs/ci-kubernetes-e2e-gke/

**Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #

**Special notes for your reviewer**:

**Release note**:
```release-note
NONE
```

Kubernetes-commit: a9cceacdaea72d505d8827521f70123c8c2bbd73

Godeps/Godeps.json

@@ -456,195 +456,195 @@
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/api/equality",
-      "Rev": "31421d9f8c2d6073628a89b4654fe22aced33167"
+      "Rev": "c6151f358fe618fabe3bcbe3738d83ac61ecd70f"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/api/errors",
-      "Rev": "31421d9f8c2d6073628a89b4654fe22aced33167"
+      "Rev": "c6151f358fe618fabe3bcbe3738d83ac61ecd70f"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/api/meta",
-      "Rev": "31421d9f8c2d6073628a89b4654fe22aced33167"
+      "Rev": "c6151f358fe618fabe3bcbe3738d83ac61ecd70f"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/api/resource",
-      "Rev": "31421d9f8c2d6073628a89b4654fe22aced33167"
+      "Rev": "c6151f358fe618fabe3bcbe3738d83ac61ecd70f"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/apimachinery",
-      "Rev": "31421d9f8c2d6073628a89b4654fe22aced33167"
+      "Rev": "c6151f358fe618fabe3bcbe3738d83ac61ecd70f"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/apimachinery/registered",
-      "Rev": "31421d9f8c2d6073628a89b4654fe22aced33167"
+      "Rev": "c6151f358fe618fabe3bcbe3738d83ac61ecd70f"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1",
-      "Rev": "31421d9f8c2d6073628a89b4654fe22aced33167"
+      "Rev": "c6151f358fe618fabe3bcbe3738d83ac61ecd70f"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured",
-      "Rev": "31421d9f8c2d6073628a89b4654fe22aced33167"
+      "Rev": "c6151f358fe618fabe3bcbe3738d83ac61ecd70f"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1alpha1",
-      "Rev": "31421d9f8c2d6073628a89b4654fe22aced33167"
+      "Rev": "c6151f358fe618fabe3bcbe3738d83ac61ecd70f"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/conversion",
-      "Rev": "31421d9f8c2d6073628a89b4654fe22aced33167"
+      "Rev": "c6151f358fe618fabe3bcbe3738d83ac61ecd70f"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/conversion/queryparams",
-      "Rev": "31421d9f8c2d6073628a89b4654fe22aced33167"
+      "Rev": "c6151f358fe618fabe3bcbe3738d83ac61ecd70f"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/conversion/unstructured",
-      "Rev": "31421d9f8c2d6073628a89b4654fe22aced33167"
+      "Rev": "c6151f358fe618fabe3bcbe3738d83ac61ecd70f"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/fields",
-      "Rev": "31421d9f8c2d6073628a89b4654fe22aced33167"
+      "Rev": "c6151f358fe618fabe3bcbe3738d83ac61ecd70f"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/labels",
-      "Rev": "31421d9f8c2d6073628a89b4654fe22aced33167"
+      "Rev": "c6151f358fe618fabe3bcbe3738d83ac61ecd70f"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/runtime",
-      "Rev": "31421d9f8c2d6073628a89b4654fe22aced33167"
+      "Rev": "c6151f358fe618fabe3bcbe3738d83ac61ecd70f"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/runtime/schema",
-      "Rev": "31421d9f8c2d6073628a89b4654fe22aced33167"
+      "Rev": "c6151f358fe618fabe3bcbe3738d83ac61ecd70f"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer",
-      "Rev": "31421d9f8c2d6073628a89b4654fe22aced33167"
+      "Rev": "c6151f358fe618fabe3bcbe3738d83ac61ecd70f"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/json",
-      "Rev": "31421d9f8c2d6073628a89b4654fe22aced33167"
+      "Rev": "c6151f358fe618fabe3bcbe3738d83ac61ecd70f"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/protobuf",
-      "Rev": "31421d9f8c2d6073628a89b4654fe22aced33167"
+      "Rev": "c6151f358fe618fabe3bcbe3738d83ac61ecd70f"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/recognizer",
-      "Rev": "31421d9f8c2d6073628a89b4654fe22aced33167"
+      "Rev": "c6151f358fe618fabe3bcbe3738d83ac61ecd70f"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/streaming",
-      "Rev": "31421d9f8c2d6073628a89b4654fe22aced33167"
+      "Rev": "c6151f358fe618fabe3bcbe3738d83ac61ecd70f"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/versioning",
-      "Rev": "31421d9f8c2d6073628a89b4654fe22aced33167"
+      "Rev": "c6151f358fe618fabe3bcbe3738d83ac61ecd70f"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/selection",
-      "Rev": "31421d9f8c2d6073628a89b4654fe22aced33167"
+      "Rev": "c6151f358fe618fabe3bcbe3738d83ac61ecd70f"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/types",
-      "Rev": "31421d9f8c2d6073628a89b4654fe22aced33167"
+      "Rev": "c6151f358fe618fabe3bcbe3738d83ac61ecd70f"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/util/cache",
-      "Rev": "31421d9f8c2d6073628a89b4654fe22aced33167"
+      "Rev": "c6151f358fe618fabe3bcbe3738d83ac61ecd70f"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/util/clock",
-      "Rev": "31421d9f8c2d6073628a89b4654fe22aced33167"
+      "Rev": "c6151f358fe618fabe3bcbe3738d83ac61ecd70f"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/util/diff",
-      "Rev": "31421d9f8c2d6073628a89b4654fe22aced33167"
+      "Rev": "c6151f358fe618fabe3bcbe3738d83ac61ecd70f"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/util/errors",
-      "Rev": "31421d9f8c2d6073628a89b4654fe22aced33167"
+      "Rev": "c6151f358fe618fabe3bcbe3738d83ac61ecd70f"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/util/framer",
-      "Rev": "31421d9f8c2d6073628a89b4654fe22aced33167"
+      "Rev": "c6151f358fe618fabe3bcbe3738d83ac61ecd70f"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/util/httpstream",
-      "Rev": "31421d9f8c2d6073628a89b4654fe22aced33167"
+      "Rev": "c6151f358fe618fabe3bcbe3738d83ac61ecd70f"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/util/httpstream/spdy",
-      "Rev": "31421d9f8c2d6073628a89b4654fe22aced33167"
+      "Rev": "c6151f358fe618fabe3bcbe3738d83ac61ecd70f"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/util/intstr",
-      "Rev": "31421d9f8c2d6073628a89b4654fe22aced33167"
+      "Rev": "c6151f358fe618fabe3bcbe3738d83ac61ecd70f"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/util/json",
-      "Rev": "31421d9f8c2d6073628a89b4654fe22aced33167"
+      "Rev": "c6151f358fe618fabe3bcbe3738d83ac61ecd70f"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/util/mergepatch",
-      "Rev": "31421d9f8c2d6073628a89b4654fe22aced33167"
+      "Rev": "c6151f358fe618fabe3bcbe3738d83ac61ecd70f"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/util/net",
-      "Rev": "31421d9f8c2d6073628a89b4654fe22aced33167"
+      "Rev": "c6151f358fe618fabe3bcbe3738d83ac61ecd70f"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/util/remotecommand",
-      "Rev": "31421d9f8c2d6073628a89b4654fe22aced33167"
+      "Rev": "c6151f358fe618fabe3bcbe3738d83ac61ecd70f"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/util/runtime",
-      "Rev": "31421d9f8c2d6073628a89b4654fe22aced33167"
+      "Rev": "c6151f358fe618fabe3bcbe3738d83ac61ecd70f"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/util/sets",
-      "Rev": "31421d9f8c2d6073628a89b4654fe22aced33167"
+      "Rev": "c6151f358fe618fabe3bcbe3738d83ac61ecd70f"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/util/strategicpatch",
-      "Rev": "31421d9f8c2d6073628a89b4654fe22aced33167"
+      "Rev": "c6151f358fe618fabe3bcbe3738d83ac61ecd70f"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/util/validation",
-      "Rev": "31421d9f8c2d6073628a89b4654fe22aced33167"
+      "Rev": "c6151f358fe618fabe3bcbe3738d83ac61ecd70f"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/util/validation/field",
-      "Rev": "31421d9f8c2d6073628a89b4654fe22aced33167"
+      "Rev": "c6151f358fe618fabe3bcbe3738d83ac61ecd70f"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/util/wait",
-      "Rev": "31421d9f8c2d6073628a89b4654fe22aced33167"
+      "Rev": "c6151f358fe618fabe3bcbe3738d83ac61ecd70f"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/util/yaml",
-      "Rev": "31421d9f8c2d6073628a89b4654fe22aced33167"
+      "Rev": "c6151f358fe618fabe3bcbe3738d83ac61ecd70f"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/version",
-      "Rev": "31421d9f8c2d6073628a89b4654fe22aced33167"
+      "Rev": "c6151f358fe618fabe3bcbe3738d83ac61ecd70f"
     },
     {
       "ImportPath": "k8s.io/apimachinery/pkg/watch",
-      "Rev": "31421d9f8c2d6073628a89b4654fe22aced33167"
+      "Rev": "c6151f358fe618fabe3bcbe3738d83ac61ecd70f"
     },
     {
       "ImportPath": "k8s.io/apimachinery/third_party/forked/golang/json",
-      "Rev": "31421d9f8c2d6073628a89b4654fe22aced33167"
+      "Rev": "c6151f358fe618fabe3bcbe3738d83ac61ecd70f"
     },
     {
       "ImportPath": "k8s.io/apimachinery/third_party/forked/golang/netutil",
-      "Rev": "31421d9f8c2d6073628a89b4654fe22aced33167"
+      "Rev": "c6151f358fe618fabe3bcbe3738d83ac61ecd70f"
     },
     {
       "ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect",
-      "Rev": "31421d9f8c2d6073628a89b4654fe22aced33167"
+      "Rev": "c6151f358fe618fabe3bcbe3738d83ac61ecd70f"
     },
     {
       "ImportPath": "k8s.io/kube-openapi/pkg/common",

plugin/pkg/client/auth/azure/BUILD

@@ -21,6 +21,7 @@ go_library(
         "//vendor/github.com/Azure/go-autorest/autorest/adal:go_default_library",
         "//vendor/github.com/Azure/go-autorest/autorest/azure:go_default_library",
         "//vendor/github.com/golang/glog:go_default_library",
+        "//vendor/k8s.io/apimachinery/pkg/util/net:go_default_library",
         "//vendor/k8s.io/client-go/rest:go_default_library",
     ],
 )

plugin/pkg/client/auth/azure/azure.go

@@ -28,6 +28,7 @@ import (
 	"github.com/Azure/go-autorest/autorest/azure"
 	"github.com/golang/glog"
 
+	"k8s.io/apimachinery/pkg/util/net"
 	restclient "k8s.io/client-go/rest"
 )
 
@@ -113,6 +114,8 @@ type azureRoundTripper struct {
 	roundTripper http.RoundTripper
 }
 
+var _ net.RoundTripperWrapper = &azureRoundTripper{}
+
 func (r *azureRoundTripper) RoundTrip(req *http.Request) (*http.Response, error) {
 	if len(req.Header.Get(authHeader)) != 0 {
 		return r.roundTripper.RoundTrip(req)
@@ -137,6 +140,8 @@ func (r *azureRoundTripper) RoundTrip(req *http.Request) (*http.Response, error)
 	return r.roundTripper.RoundTrip(req2)
 }
 
+func (r *azureRoundTripper) WrappedRoundTripper() http.RoundTripper { return r.roundTripper }
+
 type azureToken struct {
 	token       adal.Token
 	clientID    string

plugin/pkg/client/auth/gcp/BUILD

@@ -21,6 +21,7 @@ go_library(
         "//vendor/golang.org/x/net/context:go_default_library",
         "//vendor/golang.org/x/oauth2:go_default_library",
         "//vendor/golang.org/x/oauth2/google:go_default_library",
+        "//vendor/k8s.io/apimachinery/pkg/util/net:go_default_library",
         "//vendor/k8s.io/apimachinery/pkg/util/yaml:go_default_library",
         "//vendor/k8s.io/client-go/rest:go_default_library",
         "//vendor/k8s.io/client-go/util/jsonpath:go_default_library",

plugin/pkg/client/auth/gcp/gcp.go

@@ -30,6 +30,7 @@ import (
 	"golang.org/x/net/context"
 	"golang.org/x/oauth2"
 	"golang.org/x/oauth2/google"
+	"k8s.io/apimachinery/pkg/util/net"
 	"k8s.io/apimachinery/pkg/util/yaml"
 	restclient "k8s.io/client-go/rest"
 	"k8s.io/client-go/util/jsonpath"
@@ -287,6 +288,8 @@ type conditionalTransport struct {
 	persister      restclient.AuthProviderConfigPersister
 }
 
+var _ net.RoundTripperWrapper = &conditionalTransport{}
+
 func (t *conditionalTransport) RoundTrip(req *http.Request) (*http.Response, error) {
 	if len(req.Header.Get("Authorization")) != 0 {
 		return t.oauthTransport.Base.RoundTrip(req)
@@ -306,3 +309,5 @@ func (t *conditionalTransport) RoundTrip(req *http.Request) (*http.Response, err
 
 	return res, nil
 }
+
+func (t *conditionalTransport) WrappedRoundTripper() http.RoundTripper { return t.oauthTransport.Base }

plugin/pkg/client/auth/oidc/BUILD

@@ -18,6 +18,7 @@ go_library(
     deps = [
         "//vendor/github.com/golang/glog:go_default_library",
         "//vendor/golang.org/x/oauth2:go_default_library",
+        "//vendor/k8s.io/apimachinery/pkg/util/net:go_default_library",
         "//vendor/k8s.io/client-go/rest:go_default_library",
     ],
 )

plugin/pkg/client/auth/oidc/oidc.go

@@ -30,6 +30,7 @@ import (
 
 	"github.com/golang/glog"
 	"golang.org/x/oauth2"
+	"k8s.io/apimachinery/pkg/util/net"
 	restclient "k8s.io/client-go/rest"
 )
 
@@ -189,6 +190,8 @@ type roundTripper struct {
 	wrapped  http.RoundTripper
 }
 
+var _ net.RoundTripperWrapper = &roundTripper{}
+
 func (r *roundTripper) RoundTrip(req *http.Request) (*http.Response, error) {
 	if len(req.Header.Get("Authorization")) != 0 {
 		return r.wrapped.RoundTrip(req)
@@ -212,6 +215,8 @@ func (r *roundTripper) RoundTrip(req *http.Request) (*http.Response, error) {
 	return r.wrapped.RoundTrip(r2)
 }
 
+func (t *roundTripper) WrappedRoundTripper() http.RoundTripper { return t.wrapped }
+
 func (p *oidcAuthProvider) idToken() (string, error) {
 	p.mu.Lock()
 	defer p.mu.Unlock()

plugin/pkg/client/auth/openstack/BUILD

@@ -18,6 +18,7 @@ go_library(
     deps = [
         "//vendor/github.com/golang/glog:go_default_library",
         "//vendor/github.com/gophercloud/gophercloud/openstack:go_default_library",
+        "//vendor/k8s.io/apimachinery/pkg/util/net:go_default_library",
         "//vendor/k8s.io/client-go/rest:go_default_library",
     ],
 )

plugin/pkg/client/auth/openstack/openstack.go

@@ -25,6 +25,7 @@ import (
 	"github.com/golang/glog"
 	"github.com/gophercloud/gophercloud/openstack"
 
+	"k8s.io/apimachinery/pkg/util/net"
 	restclient "k8s.io/client-go/rest"
 )
 
@@ -102,6 +103,8 @@ type tokenRoundTripper struct {
 	tokenGetter TokenGetter
 }
 
+var _ net.RoundTripperWrapper = &tokenRoundTripper{}
+
 // RoundTrip adds the bearer token into the request.
 func (t *tokenRoundTripper) RoundTrip(req *http.Request) (*http.Response, error) {
 	// if the authorization header already present, use it.
@@ -119,6 +122,8 @@ func (t *tokenRoundTripper) RoundTrip(req *http.Request) (*http.Response, error)
 	return t.RoundTripper.RoundTrip(req)
 }
 
+func (t *tokenRoundTripper) WrappedRoundTripper() http.RoundTripper { return t.RoundTripper }
+
 // newOpenstackAuthProvider creates an auth provider which works with openstack
 // environment.
 func newOpenstackAuthProvider(clusterAddress string, config map[string]string, persister restclient.AuthProviderConfigPersister) (restclient.AuthProvider, error) {