From 891ba9100944fde4f017fb747af2035308c41960 Mon Sep 17 00:00:00 2001
From: Kubernetes Publisher <k8s-publishing-bot@users.noreply.github.com>
Date: Sun, 23 Jun 2019 23:03:56 -0700
Subject: [PATCH] Merge pull request #79303 from liggitt/preferred-deps

Use preferred dependency versions

Kubernetes-commit: dc764030c2cef7aced8dd1a9e3b5ca389223b8b6
---
 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 52bca5d8..f2814877 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -68,7 +68,7 @@
 		},
 		{
 			"ImportPath": "github.com/google/uuid",
-			"Rev": "v1.0.0"
+			"Rev": "v1.1.1"
 		},
 		{
 			"ImportPath": "github.com/googleapis/gnostic",
@@ -220,15 +220,15 @@
 		},
 		{
 			"ImportPath": "k8s.io/api",
-			"Rev": "dcce3486da33"
+			"Rev": "95846d7ef82a"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery",
-			"Rev": "d16981aedf33"
+			"Rev": "961b39a1baa0"
 		},
 		{
 			"ImportPath": "k8s.io/client-go",
-			"Rev": "585a16d2e773"
+			"Rev": "2c6e35a5b9cf"
 		},
 		{
 			"ImportPath": "k8s.io/code-generator",
diff --git a/go.mod b/go.mod
index 94994677..6fb089fc 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-20190624085159-95846d7ef82a
+	k8s.io/apimachinery v0.0.0-20190624085041-961b39a1baa0
+	k8s.io/client-go v0.0.0-20190624085356-2c6e35a5b9cf
+	k8s.io/code-generator v0.0.0-20190620073620-d55040311883
 	k8s.io/klog v0.3.1
 )
 
@@ -18,9 +18,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-20190624085159-95846d7ef82a
+	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190624085041-961b39a1baa0
+	k8s.io/client-go => k8s.io/client-go v0.0.0-20190624085356-2c6e35a5b9cf
+	k8s.io/code-generator => k8s.io/code-generator v0.0.0-20190620073620-d55040311883
 )
+
+replace k8s.io/component-base => k8s.io/component-base v0.0.0-20190624085813-dd74dcc4bb91
diff --git a/go.sum b/go.sum
index edd41101..29cae2c5 100644
--- a/go.sum
+++ b/go.sum
@@ -97,6 +97,10 @@ gopkg.in/yaml.v2 v2.2.1 h1:mUhvW9EsL+naU5Q3cakzfE91YhliOondGd6ZrsDBHQE=
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+k8s.io/api v0.0.0-20190624085159-95846d7ef82a/go.mod h1:O6YAz5STgv7S1/c/XtBULGhSltH7yWEHpWvnA1mmFRg=
+k8s.io/apimachinery v0.0.0-20190624085041-961b39a1baa0/go.mod h1:48PVecD7ubRgJmMRGIQfsqYu6OucVH5DzFNtACHZH8k=
+k8s.io/client-go v0.0.0-20190624085356-2c6e35a5b9cf/go.mod h1:rQMvHbaXi4pHSLf91Z1YI3h2Av+T3jsFKEIAWucw7hc=
+k8s.io/code-generator v0.0.0-20190620073620-d55040311883/go.mod h1:+a+9g9W0llgbgvx6qOb+VbeZPH5km1FrVyMQe9/jkQY=
 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.1 h1:RVgyDHY/kFKtLqh67NvEWIgkMneNoIrdkN0CxDSQc68=