From 6d6963fcd9edec95bf79a89780121c1892ce73cd Mon Sep 17 00:00:00 2001
From: Kubernetes Publisher <k8s-publishing-bot@users.noreply.github.com>
Date: Wed, 19 Jun 2019 23:46:48 -0700
Subject: [PATCH] Merge pull request #78187 from
 dims/update-vendored-dependencies-to-released-versions-2

Update vendored dependencies to released version

Kubernetes-commit: 00e13dbc12612bd838bc5b9000a64c08f6f8a828
---
 Godeps/Godeps.json | 24 ++++++++++++++----------
 go.mod             | 11 ++++++-----
 go.sum             |  2 ++
 3 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index 5f9d218..4248d62 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -28,7 +28,7 @@
 		},
 		{
 			"ImportPath": "github.com/evanphx/json-patch",
-			"Rev": "5858425f7550"
+			"Rev": "v4.2.0"
 		},
 		{
 			"ImportPath": "github.com/fsnotify/fsnotify",
@@ -52,7 +52,7 @@
 		},
 		{
 			"ImportPath": "github.com/google/gofuzz",
-			"Rev": "24818f796faf"
+			"Rev": "v1.0.0"
 		},
 		{
 			"ImportPath": "github.com/google/uuid",
@@ -72,7 +72,7 @@
 		},
 		{
 			"ImportPath": "github.com/json-iterator/go",
-			"Rev": "ab8a2e0c74be"
+			"Rev": "v1.1.6"
 		},
 		{
 			"ImportPath": "github.com/matttproud/golang_protobuf_extensions",
@@ -92,11 +92,11 @@
 		},
 		{
 			"ImportPath": "github.com/onsi/ginkgo",
-			"Rev": "v1.6.0"
+			"Rev": "v1.8.0"
 		},
 		{
 			"ImportPath": "github.com/onsi/gomega",
-			"Rev": "5533ce8a0da3"
+			"Rev": "v1.5.0"
 		},
 		{
 			"ImportPath": "github.com/pmezard/go-difflib",
@@ -120,11 +120,15 @@
 		},
 		{
 			"ImportPath": "github.com/spf13/pflag",
-			"Rev": "v1.0.1"
+			"Rev": "v1.0.3"
+		},
+		{
+			"ImportPath": "github.com/stretchr/objx",
+			"Rev": "v0.1.0"
 		},
 		{
 			"ImportPath": "github.com/stretchr/testify",
-			"Rev": "v1.2.2"
+			"Rev": "v1.3.0"
 		},
 		{
 			"ImportPath": "golang.org/x/net",
@@ -164,15 +168,15 @@
 		},
 		{
 			"ImportPath": "gopkg.in/yaml.v2",
-			"Rev": "v2.2.1"
+			"Rev": "v2.2.2"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery",
-			"Rev": "6a5db36e93ad"
+			"Rev": "d16981aedf33"
 		},
 		{
 			"ImportPath": "k8s.io/component-base",
-			"Rev": "4062e14deebe"
+			"Rev": "e5083e713460"
 		},
 		{
 			"ImportPath": "k8s.io/klog",
diff --git a/go.mod b/go.mod
index 7ee5a80..4bf6305 100644
--- a/go.mod
+++ b/go.mod
@@ -5,8 +5,8 @@ module k8s.io/kube-controller-manager
 go 1.12
 
 require (
-	k8s.io/apimachinery v0.0.0
-	k8s.io/component-base v0.0.0
+	k8s.io/apimachinery v0.0.0-20190620073744-d16981aedf33
+	k8s.io/component-base v0.0.0-20190620074451-e5083e713460
 )
 
 replace (
@@ -15,7 +15,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/tools => golang.org/x/tools v0.0.0-20190313210603-aa82965741a9
-	k8s.io/apimachinery => ../apimachinery
-	k8s.io/component-base => ../component-base
-	k8s.io/kube-controller-manager => ../kube-controller-manager
+	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190620073744-d16981aedf33
+	k8s.io/component-base => k8s.io/component-base v0.0.0-20190620074451-e5083e713460
 )
+
+replace k8s.io/apiserver => k8s.io/apiserver v0.0.0-20190620074708-fbed0ffc300f
diff --git a/go.sum b/go.sum
index 2ac5174..1392b4a 100644
--- a/go.sum
+++ b/go.sum
@@ -59,6 +59,8 @@ 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/apimachinery v0.0.0-20190620073744-d16981aedf33/go.mod h1:9q5NW/mMno/nwbRZd/Ks2TECgi2PTZ9cwarf4q+ze6Q=
+k8s.io/component-base v0.0.0-20190620074451-e5083e713460/go.mod h1:E4P2gQj0Nop2uDWb9Fu5hertI+sWLZcifQgNHtkCNc4=
 k8s.io/klog v0.3.1 h1:RVgyDHY/kFKtLqh67NvEWIgkMneNoIrdkN0CxDSQc68=
 k8s.io/klog v0.3.1/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
 k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30/go.mod h1:BXM9ceUBTj2QnfH2MK1odQs778ajze1RxcmP6S8RVVc=