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

Merge pull request #88135 from julianvmodesto/local-dry-run-server-incompatible 

Error if --local and --dry-run=server are passed

Kubernetes-commit: 053d46c3c0a3690b6f9afa1df08b8ef71115b026
This commit is contained in:
Kubernetes Publisher 2020-02-14 23:09:51 -08:00
parent 9c04919f3b
commit d5968870bb
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Godeps/Godeps.json generated
View File

@ -580,7 +580,7 @@
}, },
{ {
"ImportPath": "k8s.io/client-go", "ImportPath": "k8s.io/client-go",
"Rev": "ce0298a60b3c" "Rev": "a1d715839a20"
}, },
{ {
"ImportPath": "k8s.io/code-generator", "ImportPath": "k8s.io/code-generator",

4
go.mod
View File

@ -39,7 +39,7 @@ require (
k8s.io/api v0.0.0-20200214081624-026463abc787 k8s.io/api v0.0.0-20200214081624-026463abc787
k8s.io/apimachinery v0.0.0-20200214081019-7490b3ed6e92 k8s.io/apimachinery v0.0.0-20200214081019-7490b3ed6e92
k8s.io/cli-runtime v0.0.0-20200216063844-1db9c3dcc41c k8s.io/cli-runtime v0.0.0-20200216063844-1db9c3dcc41c
k8s.io/client-go v0.0.0-20200214082308-ce0298a60b3c k8s.io/client-go v0.0.0-20200216054614-a1d715839a20
k8s.io/component-base v0.0.0-20200214083501-52da27f0465b k8s.io/component-base v0.0.0-20200214083501-52da27f0465b
k8s.io/klog v1.0.0 k8s.io/klog v1.0.0
k8s.io/kube-openapi v0.0.0-20200121204235-bf4fb3bd569c k8s.io/kube-openapi v0.0.0-20200121204235-bf4fb3bd569c
@ -56,7 +56,7 @@ replace (
k8s.io/api => k8s.io/api v0.0.0-20200214081624-026463abc787 k8s.io/api => k8s.io/api v0.0.0-20200214081624-026463abc787
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200214081019-2373d029717c k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200214081019-2373d029717c
k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20200216063844-1db9c3dcc41c k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20200216063844-1db9c3dcc41c
k8s.io/client-go => k8s.io/client-go v0.0.0-20200214082308-ce0298a60b3c k8s.io/client-go => k8s.io/client-go v0.0.0-20200216054614-a1d715839a20
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20200214080538-dc8f3adce97c k8s.io/code-generator => k8s.io/code-generator v0.0.0-20200214080538-dc8f3adce97c
k8s.io/component-base => k8s.io/component-base v0.0.0-20200214083501-52da27f0465b k8s.io/component-base => k8s.io/component-base v0.0.0-20200214083501-52da27f0465b
k8s.io/metrics => k8s.io/metrics v0.0.0-20200214091154-f2defd344f43 k8s.io/metrics => k8s.io/metrics v0.0.0-20200214091154-f2defd344f43

2
go.sum
View File

@ -301,7 +301,7 @@ honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWh
k8s.io/api v0.0.0-20200214081624-026463abc787/go.mod h1:brPp6rLV9ZWi2IgXmvCsY7TKw2l27eF4rfCHlyW88ys= k8s.io/api v0.0.0-20200214081624-026463abc787/go.mod h1:brPp6rLV9ZWi2IgXmvCsY7TKw2l27eF4rfCHlyW88ys=
k8s.io/apimachinery v0.0.0-20200214081019-2373d029717c/go.mod h1:5X8oEhnd931nEg6/Nkumo00nT6ZsCLp2h7Xwd7Ym6P4= k8s.io/apimachinery v0.0.0-20200214081019-2373d029717c/go.mod h1:5X8oEhnd931nEg6/Nkumo00nT6ZsCLp2h7Xwd7Ym6P4=
k8s.io/cli-runtime v0.0.0-20200216063844-1db9c3dcc41c/go.mod h1:+TTqQ24tIqxRu8NPEVTJhVb3dhCovNKh3L4bltkU8T8= k8s.io/cli-runtime v0.0.0-20200216063844-1db9c3dcc41c/go.mod h1:+TTqQ24tIqxRu8NPEVTJhVb3dhCovNKh3L4bltkU8T8=
k8s.io/client-go v0.0.0-20200214082308-ce0298a60b3c/go.mod h1:f4hbJ/NSP8X6WcDesvh5DBABUdW+L8lkKvpa1PI+uZw= k8s.io/client-go v0.0.0-20200216054614-a1d715839a20/go.mod h1:yfWaSDuAdNhZoHaBFDJiQMYAxA1D5t9dSar4hHSjrio=
k8s.io/code-generator v0.0.0-20200214080538-dc8f3adce97c/go.mod h1:+UHX5rSbxmR8kzS+FAv7um6dtYrZokQvjHpDSYRVkTc= k8s.io/code-generator v0.0.0-20200214080538-dc8f3adce97c/go.mod h1:+UHX5rSbxmR8kzS+FAv7um6dtYrZokQvjHpDSYRVkTc=
k8s.io/component-base v0.0.0-20200214083501-52da27f0465b/go.mod h1:DOlkobZU6es30zVb1/6ENSbNaUy59R+raahDxro46no= k8s.io/component-base v0.0.0-20200214083501-52da27f0465b/go.mod h1:DOlkobZU6es30zVb1/6ENSbNaUy59R+raahDxro46no=
k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=