From c1d144c6bf83cd479fc2288245874b0cea8aa502 Mon Sep 17 00:00:00 2001
From: Kubernetes Publisher <k8s-publishing-bot@users.noreply.github.com>
Date: Sat, 7 Mar 2020 01:13:34 -0800
Subject: [PATCH] Merge pull request #88875 from apelisse/apply-no-op

SSA: Applying same object twice should be a no-op the second time

Kubernetes-commit: 71ad0a90205c12e8ebbe6872db30097026916659
---
 Godeps/Godeps.json | 10 +++++-----
 go.mod             | 13 ++++++-------
 go.sum             |  4 ++++
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index 1768f23..75aa8f1 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -424,19 +424,19 @@
 		},
 		{
 			"ImportPath": "k8s.io/api",
-			"Rev": "0b68d4126df6"
+			"Rev": "510bcd53e1cf"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery",
-			"Rev": "6584f51ae935"
+			"Rev": "2b7fa1cb5395"
 		},
 		{
 			"ImportPath": "k8s.io/client-go",
-			"Rev": "83e04303df20"
+			"Rev": "5194bac86967"
 		},
 		{
 			"ImportPath": "k8s.io/component-base",
-			"Rev": "fa4920973679"
+			"Rev": "dae26a37dccb"
 		},
 		{
 			"ImportPath": "k8s.io/gengo",
@@ -456,7 +456,7 @@
 		},
 		{
 			"ImportPath": "sigs.k8s.io/structured-merge-diff/v3",
-			"Rev": "5e70324e7c1c"
+			"Rev": "v3.0.0"
 		},
 		{
 			"ImportPath": "sigs.k8s.io/yaml",
diff --git a/go.mod b/go.mod
index 3df9cca..4fabb83 100644
--- a/go.mod
+++ b/go.mod
@@ -5,16 +5,15 @@ module k8s.io/kube-controller-manager
 go 1.13
 
 require (
-	k8s.io/apimachinery v0.0.0
-	k8s.io/component-base v0.0.0
+	k8s.io/apimachinery v0.0.0-20200307122051-2b7fa1cb5395
+	k8s.io/component-base v0.0.0-20200307123030-dae26a37dccb
 )
 
 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/component-base => ../component-base
-	k8s.io/kube-controller-manager => ../kube-controller-manager
+	k8s.io/api => k8s.io/api v0.0.0-20200307122242-510bcd53e1cf
+	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200307122051-2b7fa1cb5395
+	k8s.io/client-go => k8s.io/client-go v0.0.0-20200307122516-5194bac86967
+	k8s.io/component-base => k8s.io/component-base v0.0.0-20200307123030-dae26a37dccb
 )
diff --git a/go.sum b/go.sum
index 8c44593..5692c53 100644
--- a/go.sum
+++ b/go.sum
@@ -181,6 +181,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-20200307122242-510bcd53e1cf/go.mod h1:4LcBtPb1OoMEmTvQLypv2jGrtMEK8ZRCPQyc+uOSi4o=
+k8s.io/apimachinery v0.0.0-20200307122051-2b7fa1cb5395/go.mod h1:9SnR/e11v5IbyPCGbvJViimtJ0SwHG4nfZFjU77ftcA=
+k8s.io/client-go v0.0.0-20200307122516-5194bac86967/go.mod h1:Ys+cjVY1SiB17qdMz+qc3ItvCfnYLsgVt49tSUmvwTo=
+k8s.io/component-base v0.0.0-20200307123030-dae26a37dccb/go.mod h1:P8U3GgtuxIyAFY/al0ojd2AP/ifHmYMZBx3HFO3N0es=
 k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
 k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
 k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=