From 36233866f1c7c0ad3bdac1fc466cb5de3746cfa2 Mon Sep 17 00:00:00 2001
From: Kubernetes Publisher <k8s-publishing-bot@users.noreply.github.com>
Date: Sun, 26 Jul 2020 00:26:16 -0700
Subject: [PATCH] Merge pull request #93264 from justaugustus/go115

Update Golang to v1.15.0-rc.1

Kubernetes-commit: 9a20f30745477423e8776bb0d05316c00648f49b
---
 Godeps/Godeps.json | 8 ++++----
 go.mod             | 9 ++++-----
 go.sum             | 2 ++
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index 5744a63ca2..2a9ade97e9 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -336,7 +336,7 @@
 		},
 		{
 			"ImportPath": "golang.org/x/crypto",
-			"Rev": "bac4c82f6975"
+			"Rev": "75b288015ac9"
 		},
 		{
 			"ImportPath": "golang.org/x/exp",
@@ -360,7 +360,7 @@
 		},
 		{
 			"ImportPath": "golang.org/x/net",
-			"Rev": "d3edc9973b7e"
+			"Rev": "ab3426394381"
 		},
 		{
 			"ImportPath": "golang.org/x/oauth2",
@@ -440,11 +440,11 @@
 		},
 		{
 			"ImportPath": "k8s.io/api",
-			"Rev": "e4973e079a11"
+			"Rev": "9540e4cac147"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery",
-			"Rev": "b84716e65c7b"
+			"Rev": "945d4ebf362b"
 		},
 		{
 			"ImportPath": "k8s.io/gengo",
diff --git a/go.mod b/go.mod
index 9548f3a972..dddc60d563 100644
--- a/go.mod
+++ b/go.mod
@@ -26,15 +26,14 @@ 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
-	k8s.io/apimachinery v0.0.0
+	k8s.io/api v0.0.0-20200726131424-9540e4cac147
+	k8s.io/apimachinery v0.0.0-20200726131235-945d4ebf362b
 	k8s.io/klog/v2 v2.2.0
 	k8s.io/utils v0.0.0-20200720150651-0bdb4ca86cbc
 	sigs.k8s.io/yaml v1.2.0
 )
 
 replace (
-	k8s.io/api => ../api
-	k8s.io/apimachinery => ../apimachinery
-	k8s.io/client-go => ../client-go
+	k8s.io/api => k8s.io/api v0.0.0-20200726131424-9540e4cac147
+	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200726131235-945d4ebf362b
 )
diff --git a/go.sum b/go.sum
index 8e0bd9ba2c..667f0b2047 100644
--- a/go.sum
+++ b/go.sum
@@ -334,6 +334,8 @@ 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-20200726131424-9540e4cac147/go.mod h1:dWsX+vGcHv9rDhMoQlwkI/sGwaGI1AZERZK/rETJ3Ao=
+k8s.io/apimachinery v0.0.0-20200726131235-945d4ebf362b/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=