From f1b3566f10efe7621d1890862639237150354f6c Mon Sep 17 00:00:00 2001
From: Kubernetes Publisher <k8s-publishing-bot@users.noreply.github.com>
Date: Mon, 27 Jul 2020 08:49:57 +0000
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into
 release-1.19

Kubernetes-commit: d01fde696783fa58430253dfc3bc375d677c4ba3
---
 Godeps/Godeps.json | 20 ++++++++++++--------
 go.mod             | 17 ++++++++---------
 go.sum             |  4 ++++
 3 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index a0c5b2b8..a72e112a 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -330,13 +330,17 @@
 			"ImportPath": "github.com/stretchr/testify",
 			"Rev": "v1.4.0"
 		},
+		{
+			"ImportPath": "github.com/yuin/goldmark",
+			"Rev": "v1.1.27"
+		},
 		{
 			"ImportPath": "go.opencensus.io",
 			"Rev": "v0.22.2"
 		},
 		{
 			"ImportPath": "golang.org/x/crypto",
-			"Rev": "bac4c82f6975"
+			"Rev": "75b288015ac9"
 		},
 		{
 			"ImportPath": "golang.org/x/exp",
@@ -356,11 +360,11 @@
 		},
 		{
 			"ImportPath": "golang.org/x/mod",
-			"Rev": "c90efee705ee"
+			"Rev": "v0.3.0"
 		},
 		{
 			"ImportPath": "golang.org/x/net",
-			"Rev": "d3edc9973b7e"
+			"Rev": "ab3426394381"
 		},
 		{
 			"ImportPath": "golang.org/x/oauth2",
@@ -384,7 +388,7 @@
 		},
 		{
 			"ImportPath": "golang.org/x/tools",
-			"Rev": "c00d67ef29d0"
+			"Rev": "c1934b75d054"
 		},
 		{
 			"ImportPath": "golang.org/x/xerrors",
@@ -440,19 +444,19 @@
 		},
 		{
 			"ImportPath": "k8s.io/api",
-			"Rev": "0bfda2331c3c"
+			"Rev": "83df1b82c014"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery",
-			"Rev": "a6609cbba4fc"
+			"Rev": "7efdc26a675c"
 		},
 		{
 			"ImportPath": "k8s.io/client-go",
-			"Rev": "970cddeeea0f"
+			"Rev": "7f42acdcbb14"
 		},
 		{
 			"ImportPath": "k8s.io/code-generator",
-			"Rev": "a9daf79fc577"
+			"Rev": "649de32797ee"
 		},
 		{
 			"ImportPath": "k8s.io/gengo",
diff --git a/go.mod b/go.mod
index af42e0da..d0bf5023 100644
--- a/go.mod
+++ b/go.mod
@@ -5,17 +5,16 @@ module k8s.io/sample-controller
 go 1.15
 
 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-20200727091507-83df1b82c014
+	k8s.io/apimachinery v0.0.0-20200727091313-7efdc26a675c
+	k8s.io/client-go v0.0.0-20200727091751-7f42acdcbb14
+	k8s.io/code-generator v0.0.0-20200727091120-649de32797ee
 	k8s.io/klog/v2 v2.2.0
 )
 
 replace (
-	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-20200727091507-83df1b82c014
+	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200727091313-7efdc26a675c
+	k8s.io/client-go => k8s.io/client-go v0.0.0-20200727091751-7f42acdcbb14
+	k8s.io/code-generator => k8s.io/code-generator v0.0.0-20200727091120-649de32797ee
 )
diff --git a/go.sum b/go.sum
index 7c466f6d..dfa193c5 100644
--- a/go.sum
+++ b/go.sum
@@ -353,6 +353,10 @@ honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWh
 honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
+k8s.io/api v0.0.0-20200727091507-83df1b82c014/go.mod h1:6QwFoKNoXWMinlZZwHtDnpsr0l80pKtzo2w7kUsGqZE=
+k8s.io/apimachinery v0.0.0-20200727091313-7efdc26a675c/go.mod h1:oE8UQU9DqIIc9PyIEYxTj/oJECzZLymCEU9dL0H4F+o=
+k8s.io/client-go v0.0.0-20200727091751-7f42acdcbb14/go.mod h1:oCXN+cFsMM7NXTRHhV//bvRZkVsL8uSBpd2EGxUYH4o=
+k8s.io/code-generator v0.0.0-20200727091120-649de32797ee/go.mod h1:l+Q5vASED8GWxNspCbHMV4q9mcQ6DhLzqwoZhvWz7wU=
 k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
 k8s.io/gengo v0.0.0-20200428234225-8167cfdcfc14 h1:t4L10Qfx/p7ASH3gXCdIUtPbbIuegCoUJf3TMSFekjw=
 k8s.io/gengo v0.0.0-20200428234225-8167cfdcfc14/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=