From 2b45fb79af22ce5c53139938446cd08080bf9035 Mon Sep 17 00:00:00 2001
From: Kubernetes Publisher <k8s-publishing-bot@users.noreply.github.com>
Date: Fri, 31 Jan 2020 02:37:21 -0800
Subject: [PATCH] Merge pull request #87639 from
 cjcullen/automated-cherry-pick-of-#87467-upstream-release-1.16

Update gopkg.in/yaml.v2 to v2.2.8

Kubernetes-commit: a1e6da402568572f56e7605c0091f3e57009eb20
---
 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 1c6f8340..6cdc1e4c 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -364,7 +364,7 @@
 		},
 		{
 			"ImportPath": "gopkg.in/yaml.v2",
-			"Rev": "v2.2.4"
+			"Rev": "v2.2.8"
 		},
 		{
 			"ImportPath": "honnef.co/go/tools",
@@ -372,19 +372,19 @@
 		},
 		{
 			"ImportPath": "k8s.io/api",
-			"Rev": "17cfeff5d095"
+			"Rev": "d64dbec685a4"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery",
-			"Rev": "f69eda767ee8"
+			"Rev": "0c9ec93240c9"
 		},
 		{
 			"ImportPath": "k8s.io/client-go",
-			"Rev": "23563064f4f1"
+			"Rev": "537443fada71"
 		},
 		{
 			"ImportPath": "k8s.io/code-generator",
-			"Rev": "f86ae06843c6"
+			"Rev": "a3045e5e55c0"
 		},
 		{
 			"ImportPath": "k8s.io/gengo",
diff --git a/go.mod b/go.mod
index 2d3189e6..4aa39166 100644
--- a/go.mod
+++ b/go.mod
@@ -5,18 +5,17 @@ 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-20200131112707-d64dbec685a4
+	k8s.io/apimachinery v0.0.0-20200131112342-0c9ec93240c9
+	k8s.io/client-go v0.0.0-20200131113135-537443fada71
+	k8s.io/code-generator v0.0.0-20200131112027-a3045e5e55c0
 	k8s.io/klog v1.0.0
 )
 
 replace (
 	golang.org/x/tools => golang.org/x/tools v0.0.0-20190821162956-65e3620a7ae7
-	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-20200131112707-d64dbec685a4
+	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200131112342-0c9ec93240c9
+	k8s.io/client-go => k8s.io/client-go v0.0.0-20200131113135-537443fada71
+	k8s.io/code-generator => k8s.io/code-generator v0.0.0-20200131112027-a3045e5e55c0
 )
diff --git a/go.sum b/go.sum
index 9d360830..d71cb751 100644
--- a/go.sum
+++ b/go.sum
@@ -222,6 +222,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-20200131112707-d64dbec685a4/go.mod h1:SGkmWEIoDg63In+t6yMJLEXQSkK5XxTNDcVydoy58dc=
+k8s.io/apimachinery v0.0.0-20200131112342-0c9ec93240c9/go.mod h1:Xk2vD2TRRpuWYLQNM6lT9R7DSFZUYG03SarNkbGrnKE=
+k8s.io/client-go v0.0.0-20200131113135-537443fada71/go.mod h1:u2dO5+oOGXUU6N5RS0nbrk8uLjpRqzLX8n+Te7tppS0=
+k8s.io/code-generator v0.0.0-20200131112027-a3045e5e55c0/go.mod h1:wFdrXdVi/UC+xIfLi+4l9elsTT/uEF61IfcN2wOLULQ=
 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=