Merge pull request #99817 from liggitt/zero-value

Fix zero-value custom resource validation with go1.16

Kubernetes-commit: feab32b220cd39699696d832020f8808a70bb412
This commit is contained in:
Kubernetes Publisher 2021-03-05 06:44:23 -08:00
parent 55d0597e18
commit bff4cfeec0
3 changed files with 25 additions and 19 deletions

16
Godeps/Godeps.json generated
View File

@ -916,31 +916,31 @@
}, },
{ {
"ImportPath": "k8s.io/api", "ImportPath": "k8s.io/api",
"Rev": "9a813edcaca0" "Rev": "3687c906b8c9"
}, },
{ {
"ImportPath": "k8s.io/apimachinery", "ImportPath": "k8s.io/apimachinery",
"Rev": "317ebe7c2dbd" "Rev": "283a3268598b"
}, },
{ {
"ImportPath": "k8s.io/apiserver", "ImportPath": "k8s.io/apiserver",
"Rev": "18dae95515b5" "Rev": "3672f53bd439"
}, },
{ {
"ImportPath": "k8s.io/client-go", "ImportPath": "k8s.io/client-go",
"Rev": "a33729487127" "Rev": "1745c9faaaff"
}, },
{ {
"ImportPath": "k8s.io/cloud-provider", "ImportPath": "k8s.io/cloud-provider",
"Rev": "79a89e1f1f6d" "Rev": "e15b4fa2ef61"
}, },
{ {
"ImportPath": "k8s.io/component-base", "ImportPath": "k8s.io/component-base",
"Rev": "e9a8fc604a43" "Rev": "c5389948b7b3"
}, },
{ {
"ImportPath": "k8s.io/controller-manager", "ImportPath": "k8s.io/controller-manager",
"Rev": "454f7936cbfa" "Rev": "266e908b30a4"
}, },
{ {
"ImportPath": "k8s.io/gengo", "ImportPath": "k8s.io/gengo",
@ -952,7 +952,7 @@
}, },
{ {
"ImportPath": "k8s.io/kube-openapi", "ImportPath": "k8s.io/kube-openapi",
"Rev": "d219536bb9fd" "Rev": "591a79e4bda7"
}, },
{ {
"ImportPath": "k8s.io/utils", "ImportPath": "k8s.io/utils",

21
go.mod
View File

@ -5,18 +5,17 @@ module k8s.io/kube-controller-manager
go 1.16 go 1.16
require ( require (
k8s.io/apimachinery v0.0.0 k8s.io/apimachinery v0.0.0-20210306132128-283a3268598b
k8s.io/cloud-provider v0.0.0 k8s.io/cloud-provider v0.0.0-20210306144020-e15b4fa2ef61
k8s.io/controller-manager v0.0.0 k8s.io/controller-manager v0.0.0-20210306143811-266e908b30a4
) )
replace ( replace (
k8s.io/api => ../api k8s.io/api => k8s.io/api v0.0.0-20210306132658-3687c906b8c9
k8s.io/apimachinery => ../apimachinery k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20210306132128-283a3268598b
k8s.io/apiserver => ../apiserver k8s.io/apiserver => k8s.io/apiserver v0.0.0-20210306135125-3672f53bd439
k8s.io/client-go => ../client-go k8s.io/client-go => k8s.io/client-go v0.0.0-20210306133319-1745c9faaaff
k8s.io/cloud-provider => ../cloud-provider k8s.io/cloud-provider => k8s.io/cloud-provider v0.0.0-20210306144020-e15b4fa2ef61
k8s.io/component-base => ../component-base k8s.io/component-base => k8s.io/component-base v0.0.0-20210306134452-c5389948b7b3
k8s.io/controller-manager => ../controller-manager k8s.io/controller-manager => k8s.io/controller-manager v0.0.0-20210306143811-266e908b30a4
k8s.io/kube-controller-manager => ../kube-controller-manager
) )

7
go.sum
View File

@ -588,6 +588,13 @@ 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.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-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= 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/apiserver v0.0.0-20210306135125-3672f53bd439/go.mod h1:VkJ8FPjq1brPDFIUg2y4+vh8qGx8FrI1osxd/iEWWXw=
k8s.io/client-go v0.0.0-20210306133319-1745c9faaaff/go.mod h1:6sIQTB5ixU8S85LXc02aEOi6MFC7iU6ch0aEcoorij8=
k8s.io/cloud-provider v0.0.0-20210306144020-e15b4fa2ef61/go.mod h1:baBWNloS8vxRmv18t+zSCfr5aHJemtul5IxzT3A40SY=
k8s.io/component-base v0.0.0-20210306134452-c5389948b7b3/go.mod h1:2ya12jDaQJjcaKT8nzcj8NaBD/pVn7wbgKhamPmQJSs=
k8s.io/controller-manager v0.0.0-20210306143811-266e908b30a4/go.mod h1:N+yUmFBs6pwmIJnnNEHkUZjL9uLqKSf2vcelquDC8/4=
k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
k8s.io/klog/v2 v2.5.0 h1:8mOnjf1RmUPW6KRqQCfYSZq/K20Unmp3IhuZUhxl8KI= k8s.io/klog/v2 v2.5.0 h1:8mOnjf1RmUPW6KRqQCfYSZq/K20Unmp3IhuZUhxl8KI=