From 11a3c5a78f691d71a0f21f505285423dd5b50f4c Mon Sep 17 00:00:00 2001
From: Kubernetes Publisher <k8s-publishing-bot@users.noreply.github.com>
Date: Fri, 7 Aug 2020 18:11:56 -0700
Subject: [PATCH] Merge pull request #93797 from liggitt/unwrap-net-errors

[go1.15] Use errors.As to unwrap net errors

Kubernetes-commit: ce662e1621f6ca46de5ffba27d1bf0f4102e1cc1
---
 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 952309b5..16ffb139 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -444,7 +444,7 @@
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery",
-			"Rev": "945d4ebf362b"
+			"Rev": "c3261aa1a7dd"
 		},
 		{
 			"ImportPath": "k8s.io/gengo",
diff --git a/go.mod b/go.mod
index fb57d5e1..d12ee1d1 100644
--- a/go.mod
+++ b/go.mod
@@ -27,7 +27,7 @@ require (
 	golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6
 	golang.org/x/time v0.0.0-20191024005414-555d28b269f0
 	k8s.io/api v0.0.0-20200731065412-4859c9473977
-	k8s.io/apimachinery v0.0.0-20200726131235-945d4ebf362b
+	k8s.io/apimachinery v0.0.0-20200808011156-c3261aa1a7dd
 	k8s.io/klog/v2 v2.2.0
 	k8s.io/utils v0.0.0-20200729134348-d5654de09c73
 	sigs.k8s.io/yaml v1.2.0
@@ -35,5 +35,5 @@ require (
 
 replace (
 	k8s.io/api => k8s.io/api v0.0.0-20200731065412-4859c9473977
-	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200726131235-945d4ebf362b
+	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200808011156-c3261aa1a7dd
 )
diff --git a/go.sum b/go.sum
index fb7dc9ea..f345c30f 100644
--- a/go.sum
+++ b/go.sum
@@ -335,7 +335,7 @@ 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=
 k8s.io/api v0.0.0-20200731065412-4859c9473977/go.mod h1:dWsX+vGcHv9rDhMoQlwkI/sGwaGI1AZERZK/rETJ3Ao=
-k8s.io/apimachinery v0.0.0-20200726131235-945d4ebf362b/go.mod h1:oE8UQU9DqIIc9PyIEYxTj/oJECzZLymCEU9dL0H4F+o=
+k8s.io/apimachinery v0.0.0-20200808011156-c3261aa1a7dd/go.mod h1:oE8UQU9DqIIc9PyIEYxTj/oJECzZLymCEU9dL0H4F+o=
 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.2.0 h1:XRvcwJozkgZ1UQJmfMGpvRthQHOvihEhYtDfAaxMz/A=