Skip to content

Commit 7644cdf

Browse files
Merge pull request #96317 from Jefftree/test-ssa
Integrate defaults marker to defaulter-gen Kubernetes-commit: 05d1b94a701d807666b40665f5728e0cc5f92054
1 parent e43b45b commit 7644cdf

File tree

3 files changed

+18
-15
lines changed

3 files changed

+18
-15
lines changed

Godeps/Godeps.json

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

go.mod

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,17 +5,16 @@ module k8s.io/sample-controller
55
go 1.15
66

77
require (
8-
k8s.io/api v0.0.0
9-
k8s.io/apimachinery v0.0.0
10-
k8s.io/client-go v0.0.0
11-
k8s.io/code-generator v0.0.0
8+
k8s.io/api v0.0.0-20201114085527-4a626d306b98
9+
k8s.io/apimachinery v0.0.0-20201114085355-859536f6dc9b
10+
k8s.io/client-go v0.0.0-20201114085741-77eda6a9395b
11+
k8s.io/code-generator v0.0.0-20201114085218-0843e0f44fb3
1212
k8s.io/klog/v2 v2.4.0
1313
)
1414

1515
replace (
16-
k8s.io/api => ../api
17-
k8s.io/apimachinery => ../apimachinery
18-
k8s.io/client-go => ../client-go
19-
k8s.io/code-generator => ../code-generator
20-
k8s.io/sample-controller => ../sample-controller
16+
k8s.io/api => k8s.io/api v0.0.0-20201114085527-4a626d306b98
17+
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20201114085355-859536f6dc9b
18+
k8s.io/client-go => k8s.io/client-go v0.0.0-20201114085741-77eda6a9395b
19+
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20201114085218-0843e0f44fb3
2120
)

go.sum

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -432,6 +432,10 @@ honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWh
432432
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
433433
honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg=
434434
honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k=
435+
k8s.io/api v0.0.0-20201114085527-4a626d306b98/go.mod h1:Vaqh9qFKpET0Mx+jNQHyAcNFyvwkGvuIKOt2htB36BQ=
436+
k8s.io/apimachinery v0.0.0-20201114085355-859536f6dc9b/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU=
437+
k8s.io/client-go v0.0.0-20201114085741-77eda6a9395b/go.mod h1:R3qihFfcl88JILYbbgUsqpSaJaGXoIO5T/hd87des+k=
438+
k8s.io/code-generator v0.0.0-20201114085218-0843e0f44fb3/go.mod h1:UsqdF+VX4PU2g46NC2JRs4gc+IfrctnwHb76RNbWHJg=
435439
k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
436440
k8s.io/gengo v0.0.0-20201113003025-83324d819ded h1:JApXBKYyB7l9xx+DK7/+mFjC7A9Bt5A93FPvFD0HIFE=
437441
k8s.io/gengo v0.0.0-20201113003025-83324d819ded/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=

0 commit comments

Comments
 (0)