From fa0b9c68e85ec58525a11386363fd45aea6100a9 Mon Sep 17 00:00:00 2001
From: Kubernetes Publisher <k8s-publishing-bot@users.noreply.github.com>
Date: Fri, 16 Oct 2020 05:43:26 -0700
Subject: [PATCH] Merge pull request #95618 from
 roycaihw/automated-cherry-pick-of-#95427-upstream-release-1.19

Automated cherry pick of #95427: don't cache transports for incomparable configs

Kubernetes-commit: f88d259a46257141584312c7b38069a982cd90cc
---
 Godeps/Godeps.json | 2 +-
 go.mod             | 4 ++--
 go.sum             | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index 3cded87ed..bf2931c59 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -440,7 +440,7 @@
 		},
 		{
 			"ImportPath": "k8s.io/api",
-			"Rev": "21b59c1ded36"
+			"Rev": "50fcaa748a4b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery",
diff --git a/go.mod b/go.mod
index 29e021187..50621090a 100644
--- a/go.mod
+++ b/go.mod
@@ -26,7 +26,7 @@ require (
 	golang.org/x/net v0.0.0-20200707034311-ab3426394381
 	golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6
 	golang.org/x/time v0.0.0-20191024005414-555d28b269f0
-	k8s.io/api v0.0.0-20200821172135-21b59c1ded36
+	k8s.io/api v0.0.0-20201006170643-50fcaa748a4b
 	k8s.io/apimachinery v0.0.0-20200821171749-b63a0c883fbf
 	k8s.io/klog/v2 v2.2.0
 	k8s.io/utils v0.0.0-20200729134348-d5654de09c73
@@ -34,6 +34,6 @@ require (
 )
 
 replace (
-	k8s.io/api => k8s.io/api v0.0.0-20200821172135-21b59c1ded36
+	k8s.io/api => k8s.io/api v0.0.0-20201006170643-50fcaa748a4b
 	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200821171749-b63a0c883fbf
 )
diff --git a/go.sum b/go.sum
index aeb63fcaa..d1a7570ba 100644
--- a/go.sum
+++ b/go.sum
@@ -333,7 +333,7 @@ honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWh
 honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 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=
-k8s.io/api v0.0.0-20200821172135-21b59c1ded36/go.mod h1:WXzrXjAr+IgCMGkIbOU4i87rvN7UWNGsyNmBEkW9rx8=
+k8s.io/api v0.0.0-20201006170643-50fcaa748a4b/go.mod h1:WXzrXjAr+IgCMGkIbOU4i87rvN7UWNGsyNmBEkW9rx8=
 k8s.io/apimachinery v0.0.0-20200821171749-b63a0c883fbf/go.mod h1:DnPGDnARWFvYa3pMHgSxtbZb7gpzzAZ1pTfaUNDVlmA=
 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=