kubernetes
/
kubectl
mirror of https://github.com/kubernetes/kubectl.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 cf3b13523a
commit b155278f1f
3 changed files with 33 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Godeps/Godeps.json generated
View File

@ -924,35 +924,35 @@
},
{
"ImportPath": "k8s.io/api",
"Rev": "ccdf63aa6ee8"
"Rev": "4a626d306b98"
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "65a627a281ee"
"Rev": "859536f6dc9b"
},
{
"ImportPath": "k8s.io/cli-runtime",
"Rev": "1dd5b70cce55"
"Rev": "bb334014705f"
},
{
"ImportPath": "k8s.io/client-go",
"Rev": "4ab8fb4585a5"
"Rev": "77eda6a9395b"
},
{
"ImportPath": "k8s.io/code-generator",
"Rev": "18d1afbd2833"
"Rev": "0843e0f44fb3"
},
{
"ImportPath": "k8s.io/component-base",
"Rev": "9894bfc661fe"
"Rev": "1e84b325f5ba"
},
{
"ImportPath": "k8s.io/component-helpers",
"Rev": "12ccb9f27b2c"
"Rev": "7cb42b694587"
},
{
"ImportPath": "k8s.io/gengo",
"Rev": "8167cfdcfc14"
"Rev": "83324d819ded"
},
{
"ImportPath": "k8s.io/klog/v2",
@ -960,11 +960,11 @@
},
{
"ImportPath": "k8s.io/kube-openapi",
"Rev": "74b467f3a622"
"Rev": "d219536bb9fd"
},
{
"ImportPath": "k8s.io/metrics",
"Rev": "5165134a210d"
"Rev": "d70c0e0c6aa5"
},
{
"ImportPath": "k8s.io/utils",

31
go.mod
View File

@ -34,28 +34,27 @@ require (
github.com/stretchr/testify v1.6.1
golang.org/x/sys v0.0.0-20201112073958-5cba982894dd
gopkg.in/yaml.v2 v2.2.8
k8s.io/api v0.0.0
k8s.io/apimachinery v0.0.0
k8s.io/cli-runtime v0.0.0
k8s.io/client-go v0.0.0
k8s.io/component-base v0.0.0
k8s.io/component-helpers v0.0.0
k8s.io/api v0.0.0-20201114085527-4a626d306b98
k8s.io/apimachinery v0.0.0-20201114085355-859536f6dc9b
k8s.io/cli-runtime v0.0.0-20201114091436-bb334014705f
k8s.io/client-go v0.0.0-20201114085741-77eda6a9395b
k8s.io/component-base v0.0.0-20201114090208-1e84b325f5ba
k8s.io/component-helpers v0.0.0-20201114090304-7cb42b694587
k8s.io/klog/v2 v2.4.0
k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd
k8s.io/metrics v0.0.0
k8s.io/metrics v0.0.0-20201114091333-d70c0e0c6aa5
k8s.io/utils v0.0.0-20201110183641-67b214c5f920
sigs.k8s.io/kustomize v2.0.3+incompatible
sigs.k8s.io/yaml v1.2.0
)
replace (
k8s.io/api => ../api
k8s.io/apimachinery => ../apimachinery
k8s.io/cli-runtime => ../cli-runtime
k8s.io/client-go => ../client-go
k8s.io/code-generator => ../code-generator
k8s.io/component-base => ../component-base
k8s.io/component-helpers => ../component-helpers
k8s.io/kubectl => ../kubectl
k8s.io/metrics => ../metrics
k8s.io/api => k8s.io/api v0.0.0-20201114085527-4a626d306b98
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20201114085355-859536f6dc9b
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20201114091436-bb334014705f
k8s.io/client-go => k8s.io/client-go v0.0.0-20201114085741-77eda6a9395b
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20201114085218-0843e0f44fb3
k8s.io/component-base => k8s.io/component-base v0.0.0-20201114090208-1e84b325f5ba
k8s.io/component-helpers => k8s.io/component-helpers v0.0.0-20201114090304-7cb42b694587
k8s.io/metrics => k8s.io/metrics v0.0.0-20201114091333-d70c0e0c6aa5
)

8
go.sum
View File

@ -634,6 +634,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.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-20201114085527-4a626d306b98/go.mod h1:Vaqh9qFKpET0Mx+jNQHyAcNFyvwkGvuIKOt2htB36BQ=
k8s.io/apimachinery v0.0.0-20201114085355-859536f6dc9b/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU=
k8s.io/cli-runtime v0.0.0-20201114091436-bb334014705f/go.mod h1:tBt/bdEvlky4pwrXkvcYnl7N6IlY9j7NHTWBUSZZ56c=
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/component-base v0.0.0-20201114090208-1e84b325f5ba/go.mod h1:g6NgUWq2J9mdXytMdP+mNUKEH3kQqHysQcJz3HJEh/U=
k8s.io/component-helpers v0.0.0-20201114090304-7cb42b694587/go.mod h1:Fb+7xcdRsPnQNQnXkqMwptC6LsONZr10ris8YPJw1bk=
k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/gengo v0.0.0-20201113003025-83324d819ded/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
@ -642,6 +649,7 @@ 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-20201113171705-d219536bb9fd h1:sOHNzJIkytDF6qadMNKhhDRpc6ODik8lVC6nOur7B2c=
k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd/go.mod h1:WOJ3KddDSol4tAGcJo0Tvi+dK12EcqSLqcWsryKMpfM=
k8s.io/metrics v0.0.0-20201114091333-d70c0e0c6aa5/go.mod h1:mmFV2auUNVgJaXJsUmjIUzRo1HhMxlNIEi5dwlXCP5A=
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=