Skip to content

Commit 05d1b94

Browse files
authored
Merge pull request kubernetes#96317 from Jefftree/test-ssa
Integrate defaults marker to defaulter-gen
2 parents afb2342 + 50e7aa4 commit 05d1b94

File tree

76 files changed

+2070
-639
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+2070
-639
lines changed

go.mod

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -125,12 +125,12 @@ require (
125125
k8s.io/controller-manager v0.0.0
126126
k8s.io/cri-api v0.0.0
127127
k8s.io/csi-translation-lib v0.0.0
128-
k8s.io/gengo v0.0.0-20200428234225-8167cfdcfc14
128+
k8s.io/gengo v0.0.0-20201113003025-83324d819ded
129129
k8s.io/heapster v1.2.0-beta.1
130130
k8s.io/klog/v2 v2.4.0
131131
k8s.io/kube-aggregator v0.0.0
132132
k8s.io/kube-controller-manager v0.0.0
133-
k8s.io/kube-openapi v0.0.0-20201107163737-74b467f3a622
133+
k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd
134134
k8s.io/kube-proxy v0.0.0
135135
k8s.io/kube-scheduler v0.0.0
136136
k8s.io/kubectl v0.0.0
@@ -505,12 +505,12 @@ replace (
505505
k8s.io/controller-manager => ./staging/src/k8s.io/controller-manager
506506
k8s.io/cri-api => ./staging/src/k8s.io/cri-api
507507
k8s.io/csi-translation-lib => ./staging/src/k8s.io/csi-translation-lib
508-
k8s.io/gengo => k8s.io/gengo v0.0.0-20200428234225-8167cfdcfc14
508+
k8s.io/gengo => k8s.io/gengo v0.0.0-20201113003025-83324d819ded
509509
k8s.io/heapster => k8s.io/heapster v1.2.0-beta.1
510510
k8s.io/klog/v2 => k8s.io/klog/v2 v2.4.0
511511
k8s.io/kube-aggregator => ./staging/src/k8s.io/kube-aggregator
512512
k8s.io/kube-controller-manager => ./staging/src/k8s.io/kube-controller-manager
513-
k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20201107163737-74b467f3a622
513+
k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd
514514
k8s.io/kube-proxy => ./staging/src/k8s.io/kube-proxy
515515
k8s.io/kube-scheduler => ./staging/src/k8s.io/kube-scheduler
516516
k8s.io/kubectl => ./staging/src/k8s.io/kubectl

go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -589,14 +589,14 @@ gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81
589589
gotest.tools/v3 v3.0.2 h1:kG1BFyqVHuQoVQiR1bWGnfz/fmHvvuiSPIV7rvl360E=
590590
gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk=
591591
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
592-
k8s.io/gengo v0.0.0-20200428234225-8167cfdcfc14 h1:t4L10Qfx/p7ASH3gXCdIUtPbbIuegCoUJf3TMSFekjw=
593-
k8s.io/gengo v0.0.0-20200428234225-8167cfdcfc14/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
592+
k8s.io/gengo v0.0.0-20201113003025-83324d819ded h1:JApXBKYyB7l9xx+DK7/+mFjC7A9Bt5A93FPvFD0HIFE=
593+
k8s.io/gengo v0.0.0-20201113003025-83324d819ded/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
594594
k8s.io/heapster v1.2.0-beta.1 h1:lUsE/AHOMHpi3MLlBEkaU8Esxm5QhdyCrv1o7ot0s84=
595595
k8s.io/heapster v1.2.0-beta.1/go.mod h1:h1uhptVXMwC8xtZBYsPXKVi8fpdlYkTs6k949KozGrM=
596596
k8s.io/klog/v2 v2.4.0 h1:7+X0fUguPyrKEC4WjH8iGDg3laWgMo5tMnRTIGTTxGQ=
597597
k8s.io/klog/v2 v2.4.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=
598-
k8s.io/kube-openapi v0.0.0-20201107163737-74b467f3a622 h1:CJasJGBT+Atu2XLJHJ90GJBqW23sfBn4vtTlB/+aJJ4=
599-
k8s.io/kube-openapi v0.0.0-20201107163737-74b467f3a622/go.mod h1:WOJ3KddDSol4tAGcJo0Tvi+dK12EcqSLqcWsryKMpfM=
598+
k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd h1:sOHNzJIkytDF6qadMNKhhDRpc6ODik8lVC6nOur7B2c=
599+
k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd/go.mod h1:WOJ3KddDSol4tAGcJo0Tvi+dK12EcqSLqcWsryKMpfM=
600600
k8s.io/system-validators v1.2.0 h1:D8clGm3PIsgX0bHoQWQXC8W/rTi6jRKejQGk7z/yuDY=
601601
k8s.io/system-validators v1.2.0/go.mod h1:bPldcLgkIUK22ALflnsXk8pvkTEndYdNuaHH6gRrl0Q=
602602
k8s.io/utils v0.0.0-20201110183641-67b214c5f920 h1:CbnUZsM497iRC5QMVkHwyl8s2tB3g7yaSHkYPkpgelw=

pkg/apis/apps/v1/zz_generated.defaults.go

Lines changed: 38 additions & 12 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/apis/apps/v1beta1/zz_generated.defaults.go

Lines changed: 20 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)