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
commit 77eda6a939
3 changed files with 11 additions and 11 deletions

6
Godeps/Godeps.json generated
View File

@ -464,11 +464,11 @@
},
{
"ImportPath": "k8s.io/api",
"Rev": "ec60fd7207de"
"Rev": "4a626d306b98"
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "65a627a281ee"
"Rev": "859536f6dc9b"
},
{
"ImportPath": "k8s.io/gengo",
@ -480,7 +480,7 @@
},
{
"ImportPath": "k8s.io/kube-openapi",
"Rev": "74b467f3a622"
"Rev": "d219536bb9fd"
},
{
"ImportPath": "k8s.io/utils",

8
go.mod
View File

@ -26,14 +26,14 @@ require (
golang.org/x/net v0.0.0-20201110031124-69a78807bb2b
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d
golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e
k8s.io/api v0.0.0-20201114045528-ec60fd7207de
k8s.io/apimachinery v0.0.0-20201114005404-65a627a281ee
k8s.io/api v0.0.0-20201114085527-4a626d306b98
k8s.io/apimachinery v0.0.0-20201114085355-859536f6dc9b
k8s.io/klog/v2 v2.4.0
k8s.io/utils v0.0.0-20201110183641-67b214c5f920
sigs.k8s.io/yaml v1.2.0
)
replace (
k8s.io/api => k8s.io/api v0.0.0-20201114045528-ec60fd7207de
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20201114005404-65a627a281ee
k8s.io/api => k8s.io/api v0.0.0-20201114085527-4a626d306b98
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20201114085355-859536f6dc9b
)

8
go.sum
View File

@ -433,14 +433,14 @@ 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-20201114045528-ec60fd7207de/go.mod h1:gWbPsp77mlP9ze/MsTGn1keIW3+fq/3AORAT453pf04=
k8s.io/apimachinery v0.0.0-20201114005404-65a627a281ee/go.mod h1:legT3ySyyLFPOHkL8znm+gYpXm5mr3eGzpY2TFuH//M=
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/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.4.0 h1:7+X0fUguPyrKEC4WjH8iGDg3laWgMo5tMnRTIGTTxGQ=
k8s.io/klog/v2 v2.4.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=
k8s.io/kube-openapi v0.0.0-20201107163737-74b467f3a622 h1:CJasJGBT+Atu2XLJHJ90GJBqW23sfBn4vtTlB/+aJJ4=
k8s.io/kube-openapi v0.0.0-20201107163737-74b467f3a622/go.mod h1:WOJ3KddDSol4tAGcJo0Tvi+dK12EcqSLqcWsryKMpfM=
k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd h1:sOHNzJIkytDF6qadMNKhhDRpc6ODik8lVC6nOur7B2c=
k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd/go.mod h1:WOJ3KddDSol4tAGcJo0Tvi+dK12EcqSLqcWsryKMpfM=
k8s.io/utils v0.0.0-20201110183641-67b214c5f920 h1:CbnUZsM497iRC5QMVkHwyl8s2tB3g7yaSHkYPkpgelw=
k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=