From 255b8477561f5140b345ffcab586e524a4fd3a4c Mon Sep 17 00:00:00 2001
From: Kubernetes Publisher <k8s-publishing-bot@users.noreply.github.com>
Date: Mon, 9 Nov 2020 07:18:27 -0800
Subject: [PATCH] Merge pull request #95954 from sttts/sttts-go-openapi

apiextensions: replace go-openapi with kube-openapi fork for validation

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

diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index e35c41c0..eb2e5c86 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -78,6 +78,10 @@
 			"ImportPath": "github.com/PuerkitoBio/urlesc",
 			"Rev": "de5bf2ad4578"
 		},
+		{
+			"ImportPath": "github.com/asaskevich/govalidator",
+			"Rev": "f61b66f89f4a"
+		},
 		{
 			"ImportPath": "github.com/census-instrumentation/opencensus-proto",
 			"Rev": "v0.2.1"
@@ -278,6 +282,10 @@
 			"ImportPath": "github.com/mailru/easyjson",
 			"Rev": "v0.7.0"
 		},
+		{
+			"ImportPath": "github.com/mitchellh/mapstructure",
+			"Rev": "v1.1.2"
+		},
 		{
 			"ImportPath": "github.com/modern-go/concurrent",
 			"Rev": "bacd9c7ef1dd"
@@ -452,19 +460,19 @@
 		},
 		{
 			"ImportPath": "k8s.io/api",
-			"Rev": "3e589e9d21e6"
+			"Rev": "8519c5ea4619"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery",
-			"Rev": "d67967d70958"
+			"Rev": "a787aaf5a782"
 		},
 		{
 			"ImportPath": "k8s.io/client-go",
-			"Rev": "a2cda5636dc9"
+			"Rev": "bef66adadf9a"
 		},
 		{
 			"ImportPath": "k8s.io/code-generator",
-			"Rev": "3609764c976f"
+			"Rev": "ed440de59c89"
 		},
 		{
 			"ImportPath": "k8s.io/gengo",
@@ -476,7 +484,7 @@
 		},
 		{
 			"ImportPath": "k8s.io/kube-openapi",
-			"Rev": "8b5066479488"
+			"Rev": "74b467f3a622"
 		},
 		{
 			"ImportPath": "k8s.io/utils",
@@ -488,7 +496,7 @@
 		},
 		{
 			"ImportPath": "sigs.k8s.io/structured-merge-diff/v4",
-			"Rev": "b3cf1e8ff931"
+			"Rev": "v4.0.2"
 		},
 		{
 			"ImportPath": "sigs.k8s.io/yaml",
diff --git a/go.mod b/go.mod
index 2e60d7a8..79c4e23b 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-20201109162247-8519c5ea4619
+	k8s.io/apimachinery v0.0.0-20201109162103-a787aaf5a782
+	k8s.io/client-go v0.0.0-20201109162515-bef66adadf9a
+	k8s.io/code-generator v0.0.0-20201109161924-ed440de59c89
 	k8s.io/klog/v2 v2.4.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-20201109162247-8519c5ea4619
+	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20201109162103-a787aaf5a782
+	k8s.io/client-go => k8s.io/client-go v0.0.0-20201109162515-bef66adadf9a
+	k8s.io/code-generator => k8s.io/code-generator v0.0.0-20201109161924-ed440de59c89
 )
diff --git a/go.sum b/go.sum
index 66569164..fb2356f2 100644
--- a/go.sum
+++ b/go.sum
@@ -346,6 +346,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-20201109162247-8519c5ea4619/go.mod h1:AiM5F9qdfCDp1n0rr9MoS0bqFKMZzQIlbuUQUK5WcU4=
+k8s.io/apimachinery v0.0.0-20201109162103-a787aaf5a782/go.mod h1:C4HVOTZCaKwcNDaxwQoXe3Zk6BLT5jNivqfdcniEtuY=
+k8s.io/client-go v0.0.0-20201109162515-bef66adadf9a/go.mod h1:9VsPQPe2J8dbpOmXX5TunLm7OmOxj+v+YY3F0EHC2yw=
+k8s.io/code-generator v0.0.0-20201109161924-ed440de59c89/go.mod h1:wUyo2szs8ByJHpQTch9zvCFzf2nVOWUqIgaJeNbKmv4=
 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=