From bc98db7fe443244690abef147d4da7bdff956476 Mon Sep 17 00:00:00 2001
From: Kubernetes Publisher <k8s-publishing-bot@users.noreply.github.com>
Date: Sat, 3 Oct 2020 15:53:05 -0700
Subject: [PATCH] Merge pull request #93901 from jpbetz/atomic-structs

Treat LabelSelectors as atomic by Server Side Apply to fix #92913

Kubernetes-commit: 90c9f7b3e198e82a756a68ffeac978a00d606e55
---
 Godeps/Godeps.json | 12 ++++++------
 go.mod             | 17 ++++++++---------
 go.sum             |  4 ++++
 3 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index 3d7bdee3..8ab7d33c 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -448,19 +448,19 @@
 		},
 		{
 			"ImportPath": "k8s.io/api",
-			"Rev": "73d7eb3bb026"
+			"Rev": "18112a7b933b"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery",
-			"Rev": "ba0f2f062330"
+			"Rev": "10b38829b621"
 		},
 		{
 			"ImportPath": "k8s.io/client-go",
-			"Rev": "b643ec487eb7"
+			"Rev": "758467711e07"
 		},
 		{
 			"ImportPath": "k8s.io/code-generator",
-			"Rev": "5a311e69ffcf"
+			"Rev": "f6667ec3dafb"
 		},
 		{
 			"ImportPath": "k8s.io/gengo",
@@ -472,7 +472,7 @@
 		},
 		{
 			"ImportPath": "k8s.io/kube-openapi",
-			"Rev": "6aeccd4b50c6"
+			"Rev": "8b5066479488"
 		},
 		{
 			"ImportPath": "k8s.io/utils",
@@ -484,7 +484,7 @@
 		},
 		{
 			"ImportPath": "sigs.k8s.io/structured-merge-diff/v4",
-			"Rev": "v4.0.1"
+			"Rev": "b3cf1e8ff931"
 		},
 		{
 			"ImportPath": "sigs.k8s.io/yaml",
diff --git a/go.mod b/go.mod
index af42e0da..3a04466c 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-20201003235837-18112a7b933b
+	k8s.io/apimachinery v0.0.0-20201003235655-10b38829b621
+	k8s.io/client-go v0.0.0-20201004000108-758467711e07
+	k8s.io/code-generator v0.0.0-20201003235514-f6667ec3dafb
 	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-20201003235837-18112a7b933b
+	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20201003235655-10b38829b621
+	k8s.io/client-go => k8s.io/client-go v0.0.0-20201004000108-758467711e07
+	k8s.io/code-generator => k8s.io/code-generator v0.0.0-20201003235514-f6667ec3dafb
 )
diff --git a/go.sum b/go.sum
index ece5248b..36a1f72d 100644
--- a/go.sum
+++ b/go.sum
@@ -347,6 +347,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-20201003235837-18112a7b933b/go.mod h1:aE9OxkIvJAf55JfJy/0UlrF0nZT2ZDhmsWnNzhbAySI=
+k8s.io/apimachinery v0.0.0-20201003235655-10b38829b621/go.mod h1:6s3VNb000AUbBIxR7q3WHlbBwfpEGqIJsCG5gIX+0LI=
+k8s.io/client-go v0.0.0-20201004000108-758467711e07/go.mod h1:zltjMDhkwCKG2AvwcACaWC+fwiTEB0qElpbFMvxx+/g=
+k8s.io/code-generator v0.0.0-20201003235514-f6667ec3dafb/go.mod h1:oioc17TXBB973K4R+ytm5k9jY1BktboxJc7qu3i29V0=
 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=