From 21b900fa86a12440607163d5662f4d78a5c65446 Mon Sep 17 00:00:00 2001
From: Kubernetes Publisher <k8s-publishing-bot@users.noreply.github.com>
Date: Fri, 21 Feb 2020 13:41:40 +0000
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into
 release-1.18

Kubernetes-commit: 490f4bacd293561bd0b5b785f30c666d99ecaeec
---
 Godeps/Godeps.json | 12 ++++++------
 go.mod             | 17 ++++++++---------
 go.sum             |  4 ++++
 3 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index 02db8133..f38abb19 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -264,7 +264,7 @@
 		},
 		{
 			"ImportPath": "golang.org/x/crypto",
-			"Rev": "60c769a6c586"
+			"Rev": "bac4c82f6975"
 		},
 		{
 			"ImportPath": "golang.org/x/exp",
@@ -348,19 +348,19 @@
 		},
 		{
 			"ImportPath": "k8s.io/api",
-			"Rev": "d5ab0ddd8b73"
+			"Rev": "026463abc787"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery",
-			"Rev": "fb45917aae8b"
+			"Rev": "2373d029717c"
 		},
 		{
 			"ImportPath": "k8s.io/client-go",
-			"Rev": "af50d22222d3"
+			"Rev": "39a9bc1d5a52"
 		},
 		{
 			"ImportPath": "k8s.io/code-generator",
-			"Rev": "396603da40fa"
+			"Rev": "f7c31974df11"
 		},
 		{
 			"ImportPath": "k8s.io/gengo",
@@ -376,7 +376,7 @@
 		},
 		{
 			"ImportPath": "k8s.io/utils",
-			"Rev": "9e5e9d854fcc"
+			"Rev": "5f6fbceb4c31"
 		},
 		{
 			"ImportPath": "sigs.k8s.io/structured-merge-diff/v3",
diff --git a/go.mod b/go.mod
index 28bfe5d9..7d224f2f 100644
--- a/go.mod
+++ b/go.mod
@@ -5,19 +5,18 @@ module k8s.io/sample-controller
 go 1.13
 
 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-20200214081624-026463abc787
+	k8s.io/apimachinery v0.0.0-20200214081019-2373d029717c
+	k8s.io/client-go v0.0.0-20200221134140-39a9bc1d5a52
+	k8s.io/code-generator v0.0.0-20200223121935-f7c31974df11
 	k8s.io/klog v1.0.0
 )
 
 replace (
 	golang.org/x/sys => golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a // pinned to release-branch.go1.13
 	golang.org/x/tools => golang.org/x/tools v0.0.0-20190821162956-65e3620a7ae7 // pinned to release-branch.go1.13
-	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-20200214081624-026463abc787
+	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200214081019-2373d029717c
+	k8s.io/client-go => k8s.io/client-go v0.0.0-20200221134140-39a9bc1d5a52
+	k8s.io/code-generator => k8s.io/code-generator v0.0.0-20200223121935-f7c31974df11
 )
diff --git a/go.sum b/go.sum
index 1a147421..9e55da82 100644
--- a/go.sum
+++ b/go.sum
@@ -195,6 +195,10 @@ gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
 gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
+k8s.io/api v0.0.0-20200214081624-026463abc787/go.mod h1:brPp6rLV9ZWi2IgXmvCsY7TKw2l27eF4rfCHlyW88ys=
+k8s.io/apimachinery v0.0.0-20200214081019-2373d029717c/go.mod h1:5X8oEhnd931nEg6/Nkumo00nT6ZsCLp2h7Xwd7Ym6P4=
+k8s.io/client-go v0.0.0-20200221134140-39a9bc1d5a52/go.mod h1:UmUmKsm/QPFM6PX++FkaGSN2sbquEn4rxsBMAvnX+58=
+k8s.io/code-generator v0.0.0-20200223121935-f7c31974df11/go.mod h1:+UHX5rSbxmR8kzS+FAv7um6dtYrZokQvjHpDSYRVkTc=
 k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
 k8s.io/gengo v0.0.0-20200114144118-36b2048a9120 h1:RPscN6KhmG54S33L+lr3GS+oD1jmchIU0ll519K6FA4=
 k8s.io/gengo v0.0.0-20200114144118-36b2048a9120/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=