From 0d5581c413c7f21c3cdd0d2f70aa67ab5a361456 Mon Sep 17 00:00:00 2001
From: Kubernetes Publisher <k8s-publishing-bot@users.noreply.github.com>
Date: Fri, 10 May 2019 19:28:48 -0700
Subject: [PATCH] Merge pull request #77753 from liggitt/prune-replace

Prune matching replace directives in staging repos more effectively

Kubernetes-commit: 6f6890b09e2a8ae7eaaea0a5052d45c3960e1c76
---
 Godeps/Godeps.json |  8 ++++----
 go.mod             | 19 ++++++++++---------
 go.sum             |  4 ++++
 3 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index 39da461a..b58b9a8c 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -212,19 +212,19 @@
 		},
 		{
 			"ImportPath": "k8s.io/api",
-			"Rev": "181e1f9c52c1"
+			"Rev": "e63b5755afac"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery",
-			"Rev": "17f84483f500"
+			"Rev": "ad85901afca0"
 		},
 		{
 			"ImportPath": "k8s.io/client-go",
-			"Rev": "65184652c889"
+			"Rev": "c6f3777976ad"
 		},
 		{
 			"ImportPath": "k8s.io/code-generator",
-			"Rev": "ff26e7842f9d"
+			"Rev": "639c964206c2"
 		},
 		{
 			"ImportPath": "k8s.io/gengo",
diff --git a/go.mod b/go.mod
index 71c19564..2572e9de 100644
--- a/go.mod
+++ b/go.mod
@@ -5,10 +5,10 @@ module k8s.io/sample-controller
 go 1.12
 
 require (
-	k8s.io/api v0.0.0
-	k8s.io/apimachinery v0.0.0
-	k8s.io/client-go v0.0.0
-	k8s.io/code-generator v0.0.0
+	k8s.io/api v0.0.0-20190511023547-e63b5755afac
+	k8s.io/apimachinery v0.0.0-20190511023455-ad85901afca0
+	k8s.io/client-go v0.0.0-20190511023711-c6f3777976ad
+	k8s.io/code-generator v0.0.0-20190511023357-639c964206c2
 	k8s.io/klog v0.3.0
 )
 
@@ -16,9 +16,10 @@ replace (
 	golang.org/x/sync => golang.org/x/sync v0.0.0-20181108010431-42b317875d0f
 	golang.org/x/sys => golang.org/x/sys v0.0.0-20190209173611-3b5209105503
 	golang.org/x/tools => golang.org/x/tools v0.0.0-20190313210603-aa82965741a9
-	k8s.io/api => ../api
-	k8s.io/apimachinery => ../apimachinery
-	k8s.io/client-go => ../client-go
-	k8s.io/code-generator => ../code-generator
-	k8s.io/sample-controller => ../sample-controller
+	k8s.io/api => k8s.io/api v0.0.0-20190511023547-e63b5755afac
+	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190511023455-ad85901afca0
+	k8s.io/client-go => k8s.io/client-go v0.0.0-20190511023711-c6f3777976ad
+	k8s.io/code-generator => k8s.io/code-generator v0.0.0-20190511023357-639c964206c2
 )
+
+replace k8s.io/component-base => k8s.io/component-base v0.0.0-20190511024024-91ee9e34fdd1
diff --git a/go.sum b/go.sum
index 75b80670..70a7cc93 100644
--- a/go.sum
+++ b/go.sum
@@ -92,6 +92,10 @@ gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkep
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
 gopkg.in/yaml.v2 v2.2.1 h1:mUhvW9EsL+naU5Q3cakzfE91YhliOondGd6ZrsDBHQE=
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+k8s.io/api v0.0.0-20190511023547-e63b5755afac/go.mod h1:f265Ep4XvHtyggfaaNhtP0AtAFilBaXq2fPjm5kYxwI=
+k8s.io/apimachinery v0.0.0-20190511023455-ad85901afca0/go.mod h1:5CBnzrKYGHzv9ZsSKmQ8wHt4XI4/TUBPDwYM9FlZMyw=
+k8s.io/client-go v0.0.0-20190511023711-c6f3777976ad/go.mod h1:+kqLjErve3/VoGTdnrw4Lu8D315nxEVQs1QEq8/uJ2E=
+k8s.io/code-generator v0.0.0-20190511023357-639c964206c2/go.mod h1:YMQ7Lt97nW/I6nHACDccgS/sPAyrHQNans96RwPaSb8=
 k8s.io/gengo v0.0.0-20190116091435-f8a0810f38af h1:SwjZbO0u5ZuaV6TRMWOGB40iaycX8sbdMQHtjNZ19dk=
 k8s.io/gengo v0.0.0-20190116091435-f8a0810f38af/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
 k8s.io/klog v0.3.0 h1:0VPpR+sizsiivjIfIAQH/rl8tan6jvWkS7lU+0di3lE=