From 7719b71fbe5a0df4d37ccf9294a892135a23e3e4 Mon Sep 17 00:00:00 2001
From: Kubernetes Publisher <k8s-publishing-bot@users.noreply.github.com>
Date: Fri, 3 Apr 2020 19:31:46 -0700
Subject: [PATCH] Merge pull request #89165 from apelisse/tag-smd-properly

Tag smd properly for kubernetes 1.17

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

diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index 568c58d2..6f34dc33 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -372,19 +372,19 @@
 		},
 		{
 			"ImportPath": "k8s.io/api",
-			"Rev": "d9adff57e763"
+			"Rev": "2a93acf49b83"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery",
-			"Rev": "731dcecc2054"
+			"Rev": "491fc9063aba"
 		},
 		{
 			"ImportPath": "k8s.io/client-go",
-			"Rev": "2a689211e542"
+			"Rev": "9ffc32955335"
 		},
 		{
 			"ImportPath": "k8s.io/code-generator",
-			"Rev": "4ae19cfe9b46"
+			"Rev": "f15a378f7704"
 		},
 		{
 			"ImportPath": "k8s.io/gengo",
@@ -396,7 +396,7 @@
 		},
 		{
 			"ImportPath": "k8s.io/kube-openapi",
-			"Rev": "30be4d16710a"
+			"Rev": "82d701f24f9d"
 		},
 		{
 			"ImportPath": "k8s.io/utils",
@@ -423,8 +423,8 @@
 			"Rev": "v1.0.0"
 		},
 		{
-			"ImportPath": "sigs.k8s.io/structured-merge-diff",
-			"Rev": "15d366b2352e"
+			"ImportPath": "sigs.k8s.io/structured-merge-diff/v2",
+			"Rev": "v2.0.1"
 		},
 		{
 			"ImportPath": "sigs.k8s.io/yaml",
diff --git a/go.mod b/go.mod
index f5594471..8dfca8e4 100644
--- a/go.mod
+++ b/go.mod
@@ -5,19 +5,18 @@ 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-20200404061942-2a93acf49b83
+	k8s.io/apimachinery v0.0.0-20200404061537-491fc9063aba
+	k8s.io/client-go v0.0.0-20200404062653-9ffc32955335
+	k8s.io/code-generator v0.0.0-20200404061114-f15a378f7704
 	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-20200404061942-2a93acf49b83
+	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200404061537-491fc9063aba
+	k8s.io/client-go => k8s.io/client-go v0.0.0-20200404062653-9ffc32955335
+	k8s.io/code-generator => k8s.io/code-generator v0.0.0-20200404061114-f15a378f7704
 )
diff --git a/go.sum b/go.sum
index 2906a205..845d10ca 100644
--- a/go.sum
+++ b/go.sum
@@ -215,6 +215,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-20200404061942-2a93acf49b83/go.mod h1:9kJrdiqYr6QQVO1OhJlqhEFfJnC0bdfwa8VwazjeL+U=
+k8s.io/apimachinery v0.0.0-20200404061537-491fc9063aba/go.mod h1:ioIo1G/a+uONV7Tv+ZmCbMG1/a3kVw5YcDdncd8ugQ0=
+k8s.io/client-go v0.0.0-20200404062653-9ffc32955335/go.mod h1:UG7NBipoSMMuA1rcEV7pMkkhEGi9kKtvH7H2/ZHto2w=
+k8s.io/code-generator v0.0.0-20200404061114-f15a378f7704/go.mod h1:qdiSCSTKtS+3WtPelj2h57fylSQcPUlhMVm+TD9Dvqc=
 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=