Merge pull request #96317 from Jefftree/test-ssa

Integrate defaults marker to defaulter-gen

Kubernetes-commit: 05d1b94a701d807666b40665f5728e0cc5f92054
This commit is contained in:
Kubernetes Publisher 2020-11-13 22:35:03 -08:00
parent e43b45bf1b
commit 7644cdf6ad
3 changed files with 18 additions and 15 deletions

12
Godeps/Godeps.json generated
View File

@ -468,23 +468,23 @@
}, },
{ {
"ImportPath": "k8s.io/api", "ImportPath": "k8s.io/api",
"Rev": "ccdf63aa6ee8" "Rev": "4a626d306b98"
}, },
{ {
"ImportPath": "k8s.io/apimachinery", "ImportPath": "k8s.io/apimachinery",
"Rev": "65a627a281ee" "Rev": "859536f6dc9b"
}, },
{ {
"ImportPath": "k8s.io/client-go", "ImportPath": "k8s.io/client-go",
"Rev": "4ab8fb4585a5" "Rev": "77eda6a9395b"
}, },
{ {
"ImportPath": "k8s.io/code-generator", "ImportPath": "k8s.io/code-generator",
"Rev": "18d1afbd2833" "Rev": "0843e0f44fb3"
}, },
{ {
"ImportPath": "k8s.io/gengo", "ImportPath": "k8s.io/gengo",
"Rev": "8167cfdcfc14" "Rev": "83324d819ded"
}, },
{ {
"ImportPath": "k8s.io/klog/v2", "ImportPath": "k8s.io/klog/v2",
@ -492,7 +492,7 @@
}, },
{ {
"ImportPath": "k8s.io/kube-openapi", "ImportPath": "k8s.io/kube-openapi",
"Rev": "74b467f3a622" "Rev": "d219536bb9fd"
}, },
{ {
"ImportPath": "k8s.io/utils", "ImportPath": "k8s.io/utils",

17
go.mod
View File

@ -5,17 +5,16 @@ module k8s.io/sample-controller
go 1.15 go 1.15
require ( require (
k8s.io/api v0.0.0 k8s.io/api v0.0.0-20201114085527-4a626d306b98
k8s.io/apimachinery v0.0.0 k8s.io/apimachinery v0.0.0-20201114085355-859536f6dc9b
k8s.io/client-go v0.0.0 k8s.io/client-go v0.0.0-20201114085741-77eda6a9395b
k8s.io/code-generator v0.0.0 k8s.io/code-generator v0.0.0-20201114085218-0843e0f44fb3
k8s.io/klog/v2 v2.4.0 k8s.io/klog/v2 v2.4.0
) )
replace ( replace (
k8s.io/api => ../api k8s.io/api => k8s.io/api v0.0.0-20201114085527-4a626d306b98
k8s.io/apimachinery => ../apimachinery k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20201114085355-859536f6dc9b
k8s.io/client-go => ../client-go k8s.io/client-go => k8s.io/client-go v0.0.0-20201114085741-77eda6a9395b
k8s.io/code-generator => ../code-generator k8s.io/code-generator => k8s.io/code-generator v0.0.0-20201114085218-0843e0f44fb3
k8s.io/sample-controller => ../sample-controller
) )

4
go.sum
View File

@ -432,6 +432,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.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-20201114085527-4a626d306b98/go.mod h1:Vaqh9qFKpET0Mx+jNQHyAcNFyvwkGvuIKOt2htB36BQ=
k8s.io/apimachinery v0.0.0-20201114085355-859536f6dc9b/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU=
k8s.io/client-go v0.0.0-20201114085741-77eda6a9395b/go.mod h1:R3qihFfcl88JILYbbgUsqpSaJaGXoIO5T/hd87des+k=
k8s.io/code-generator v0.0.0-20201114085218-0843e0f44fb3/go.mod h1:UsqdF+VX4PU2g46NC2JRs4gc+IfrctnwHb76RNbWHJg=
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/gengo v0.0.0-20201113003025-83324d819ded h1:JApXBKYyB7l9xx+DK7/+mFjC7A9Bt5A93FPvFD0HIFE= k8s.io/gengo v0.0.0-20201113003025-83324d819ded h1:JApXBKYyB7l9xx+DK7/+mFjC7A9Bt5A93FPvFD0HIFE=
k8s.io/gengo v0.0.0-20201113003025-83324d819ded/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= k8s.io/gengo v0.0.0-20201113003025-83324d819ded/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=