From 21cbf17cc298e0468a67d1b1aed733efccaa4849 Mon Sep 17 00:00:00 2001
From: Kubernetes Publisher <k8s-publishing-bot@users.noreply.github.com>
Date: Fri, 5 Mar 2021 06:44:23 -0800
Subject: [PATCH] Merge pull request #99817 from liggitt/zero-value

Fix zero-value custom resource validation with go1.16

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

diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index c0df7f5e..710eaac0 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -138,10 +138,6 @@
 			"ImportPath": "github.com/fsnotify/fsnotify",
 			"Rev": "v1.4.7"
 		},
-		{
-			"ImportPath": "github.com/ghodss/yaml",
-			"Rev": "73d445a93680"
-		},
 		{
 			"ImportPath": "github.com/go-gl/glfw",
 			"Rev": "e6da0acd62b1"
@@ -472,19 +468,19 @@
 		},
 		{
 			"ImportPath": "k8s.io/api",
-			"Rev": "9a813edcaca0"
+			"Rev": "3687c906b8c9"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery",
-			"Rev": "317ebe7c2dbd"
+			"Rev": "283a3268598b"
 		},
 		{
 			"ImportPath": "k8s.io/client-go",
-			"Rev": "a33729487127"
+			"Rev": "1745c9faaaff"
 		},
 		{
 			"ImportPath": "k8s.io/code-generator",
-			"Rev": "748252d1b6f4"
+			"Rev": "cc2553e427ca"
 		},
 		{
 			"ImportPath": "k8s.io/gengo",
@@ -496,7 +492,7 @@
 		},
 		{
 			"ImportPath": "k8s.io/kube-openapi",
-			"Rev": "d219536bb9fd"
+			"Rev": "591a79e4bda7"
 		},
 		{
 			"ImportPath": "k8s.io/utils",
diff --git a/go.mod b/go.mod
index 3388ee45..606fd3df 100644
--- a/go.mod
+++ b/go.mod
@@ -5,17 +5,16 @@ module k8s.io/sample-controller
 go 1.16
 
 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-20210306132658-3687c906b8c9
+	k8s.io/apimachinery v0.0.0-20210306132128-283a3268598b
+	k8s.io/client-go v0.0.0-20210306133319-1745c9faaaff
+	k8s.io/code-generator v0.0.0-20210306131731-cc2553e427ca
 	k8s.io/klog/v2 v2.5.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-20210306132658-3687c906b8c9
+	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210306132128-283a3268598b
+	k8s.io/client-go => k8s.io/client-go v0.0.0-20210306133319-1745c9faaaff
+	k8s.io/code-generator => k8s.io/code-generator v0.0.0-20210306131731-cc2553e427ca
 )
diff --git a/go.sum b/go.sum
index d843fbb4..bc3e11e3 100644
--- a/go.sum
+++ b/go.sum
@@ -428,6 +428,10 @@ honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWh
 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=
 honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
+k8s.io/api v0.0.0-20210306132658-3687c906b8c9/go.mod h1:oXIlxI7P0Fm+wAl92K966U84hJ8jYH+vvhPMIFggXJQ=
+k8s.io/apimachinery v0.0.0-20210306132128-283a3268598b/go.mod h1:2LERmYT9PI3b4uQt87vnb2UVkblBDzZhucIf8PxvJ2o=
+k8s.io/client-go v0.0.0-20210306133319-1745c9faaaff/go.mod h1:6sIQTB5ixU8S85LXc02aEOi6MFC7iU6ch0aEcoorij8=
+k8s.io/code-generator v0.0.0-20210306131731-cc2553e427ca/go.mod h1:+mcF5UBXubtZGDob4qNax0wjPWZG3wKwQNlGJiVCadA=
 k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
 k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027 h1:Uusb3oh8XcdzDF/ndlI4ToKTYVlkCSJP39SRY2mfRAw=
 k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=