From eed36b4378d1db9c2a6b36b0719ebd7242130e09 Mon Sep 17 00:00:00 2001
From: Kubernetes Publisher <k8s-publishing-bot@users.noreply.github.com>
Date: Mon, 26 Aug 2019 04:48:06 +0000
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into
 release-1.16

Kubernetes-commit: ecd7e4cab747770f5c362ace9bd3487bdb97c66b
---
 Godeps/Godeps.json | 10 +++++-----
 go.mod             | 17 ++++++++---------
 go.sum             |  4 ++++
 3 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index bb95eaa7..593479c6 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -312,23 +312,23 @@
 		},
 		{
 			"ImportPath": "k8s.io/api",
-			"Rev": "3efd428ce51b"
+			"Rev": "8408f7c78273"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery",
-			"Rev": "31b1e1ea64dc"
+			"Rev": "2323990d016a"
 		},
 		{
 			"ImportPath": "k8s.io/client-go",
-			"Rev": "2597db3f9d08"
+			"Rev": "66eec82cbac1"
 		},
 		{
 			"ImportPath": "k8s.io/code-generator",
-			"Rev": "060a3d12ce80"
+			"Rev": "bdcfe8d36feb"
 		},
 		{
 			"ImportPath": "k8s.io/gengo",
-			"Rev": "955ffa8fcfc9"
+			"Rev": "26a664648505"
 		},
 		{
 			"ImportPath": "k8s.io/klog",
diff --git a/go.mod b/go.mod
index 22689c06..b56ca207 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-20190826115149-8408f7c78273
+	k8s.io/apimachinery v0.0.0-20190826044806-2323990d016a
+	k8s.io/client-go v0.0.0-20190826044806-66eec82cbac1
+	k8s.io/code-generator v0.0.0-20190826044806-bdcfe8d36feb
 	k8s.io/klog v0.4.0
 )
 
@@ -17,9 +17,8 @@ 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/text => golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db
-	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-20190826115149-8408f7c78273
+	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190826044806-2323990d016a
+	k8s.io/client-go => k8s.io/client-go v0.0.0-20190826044806-66eec82cbac1
+	k8s.io/code-generator => k8s.io/code-generator v0.0.0-20190826044806-bdcfe8d36feb
 )
diff --git a/go.sum b/go.sum
index cd07a27e..b53ed06f 100644
--- a/go.sum
+++ b/go.sum
@@ -167,6 +167,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-20190826115149-8408f7c78273/go.mod h1:ZNwoT/ogX6bcdTg8XDtv0StOXIR5sBUUpioofTAUsPM=
+k8s.io/apimachinery v0.0.0-20190826044806-2323990d016a/go.mod h1:EZoIMuAgG/4v58YL+bz0kqnivqupk28fKYxFCa5e6X8=
+k8s.io/client-go v0.0.0-20190826044806-66eec82cbac1/go.mod h1:HYc0oU7brmrUSG6wwGhK1fQASWPlA9iPYmM1l0yA+94=
+k8s.io/code-generator v0.0.0-20190826044806-bdcfe8d36feb/go.mod h1:DcZnH9wu/rlc2W9W82F8WPyJRR2mJVZGNE1cA/Qn6zQ=
 k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6 h1:4s3/R4+OYYYUKptXPhZKjQ04WJ6EhQQVFdjOFvCazDk=
 k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
 k8s.io/gengo v0.0.0-20190822140433-26a664648505 h1:ZY6yclUKVbZ+SdWnkfY+Je5vrMpKOxmGeKRbsXVmqYM=