diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index 14e704c11..b7638a1d2 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -548,27 +548,27 @@ }, { "ImportPath": "k8s.io/api", - "Rev": "fb749d2f1064" + "Rev": "21721929cffa" }, { "ImportPath": "k8s.io/apimachinery", - "Rev": "461753078381" + "Rev": "a891081239f5" }, { "ImportPath": "k8s.io/cli-runtime", - "Rev": "9d670f2021f4" + "Rev": "1f2b8882058b" }, { "ImportPath": "k8s.io/client-go", - "Rev": "26b1e9b52936" + "Rev": "ecd4f6fb8c21" }, { "ImportPath": "k8s.io/code-generator", - "Rev": "732c9ca86353" + "Rev": "ebc0eb3a5c23" }, { "ImportPath": "k8s.io/component-base", - "Rev": "37a093468564" + "Rev": "6003d5402e67" }, { "ImportPath": "k8s.io/gengo", diff --git a/go.mod b/go.mod index d41f735e1..9bb44684c 100644 --- a/go.mod +++ b/go.mod @@ -35,11 +35,11 @@ require ( golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f gopkg.in/yaml.v2 v2.2.2 gotest.tools v2.2.0+incompatible // indirect - k8s.io/api v0.0.0-20190905160310-fb749d2f1064 - k8s.io/apimachinery v0.0.0-20190831074630-461753078381 - k8s.io/cli-runtime v0.0.0-20190831080432-9d670f2021f4 - k8s.io/client-go v0.0.0-20190913080822-26b1e9b52936 - k8s.io/component-base v0.0.0-20190831075413-37a093468564 + k8s.io/api v0.0.0-20190913080256-21721929cffa + k8s.io/apimachinery v0.0.0-20190917163033-a891081239f5 + k8s.io/cli-runtime v0.0.0-20190916161055-1f2b8882058b + k8s.io/client-go v0.0.0-20190917075824-ecd4f6fb8c21 + k8s.io/component-base v0.0.0-20190917035932-6003d5402e67 k8s.io/klog v0.4.0 k8s.io/kube-openapi v0.0.0-20190816220812-743ec37842bf k8s.io/metrics v0.0.0-20190831080339-bd7772846802 @@ -56,11 +56,11 @@ replace ( golang.org/x/sys => golang.org/x/sys v0.0.0-20190209173611-3b5209105503 golang.org/x/text => golang.org/x/text v0.3.1-0.20181227161524-e6919f6577db golang.org/x/time => golang.org/x/time v0.0.0-20161028155119-f51c12702a4d - k8s.io/api => k8s.io/api v0.0.0-20190905160310-fb749d2f1064 - k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190831074630-461753078381 - k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20190831080432-9d670f2021f4 - k8s.io/client-go => k8s.io/client-go v0.0.0-20190913080822-26b1e9b52936 - k8s.io/code-generator => k8s.io/code-generator v0.0.0-20190831074504-732c9ca86353 - k8s.io/component-base => k8s.io/component-base v0.0.0-20190831075413-37a093468564 + k8s.io/api => k8s.io/api v0.0.0-20190913080256-21721929cffa + k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190917163033-a891081239f5 + k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20190916161055-1f2b8882058b + k8s.io/client-go => k8s.io/client-go v0.0.0-20190917075824-ecd4f6fb8c21 + k8s.io/code-generator => k8s.io/code-generator v0.0.0-20190912042602-ebc0eb3a5c23 + k8s.io/component-base => k8s.io/component-base v0.0.0-20190917035932-6003d5402e67 k8s.io/metrics => k8s.io/metrics v0.0.0-20190831080339-bd7772846802 ) diff --git a/go.sum b/go.sum index ade9406d1..b33c11b9f 100644 --- a/go.sum +++ b/go.sum @@ -272,12 +272,12 @@ gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo= gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -k8s.io/api v0.0.0-20190905160310-fb749d2f1064/go.mod h1:u09ZxrpPFcoUNEQM2GsqT/KpglKAtXdEcK+tSMilQ3Q= -k8s.io/apimachinery v0.0.0-20190831074630-461753078381/go.mod h1:nL6pwRT8NgfF8TT68DBI8uEePRt89cSvoXUVqbkWHq4= -k8s.io/cli-runtime v0.0.0-20190831080432-9d670f2021f4/go.mod h1:TtjkdmxYMLASzYbE8E7AUr/ZrXMcmXLnDLRY4sVWspw= -k8s.io/client-go v0.0.0-20190913080822-26b1e9b52936/go.mod h1:xIjk2+YAazaE3BA0+nCwEMFulHzcgsrvtlVWwDkcMhI= -k8s.io/code-generator v0.0.0-20190831074504-732c9ca86353/go.mod h1:V5BD6M4CyaN5m+VthcclXWsVcT1Hu+glwa1bi3MIsyE= -k8s.io/component-base v0.0.0-20190831075413-37a093468564/go.mod h1:pB3zmhcOR5xextKMKdxRr2XUCERS2UNFA/6Tr2WmSJs= +k8s.io/api v0.0.0-20190913080256-21721929cffa/go.mod h1:jESdJL4e7Q+sDnEXOZ1ysc1WBxR4I34RbRh5QqGT9kQ= +k8s.io/apimachinery v0.0.0-20190917163033-a891081239f5/go.mod h1:nL6pwRT8NgfF8TT68DBI8uEePRt89cSvoXUVqbkWHq4= +k8s.io/cli-runtime v0.0.0-20190916161055-1f2b8882058b/go.mod h1:USAoT1MuyLOFXNVO+W1xCilOS4D/auqVg9W5AVGJdsg= +k8s.io/client-go v0.0.0-20190917075824-ecd4f6fb8c21/go.mod h1:ddfKnJLw9jMVEyLoHvuRM6Hf+31OewExnmZ1rlmrTaM= +k8s.io/code-generator v0.0.0-20190912042602-ebc0eb3a5c23/go.mod h1:V5BD6M4CyaN5m+VthcclXWsVcT1Hu+glwa1bi3MIsyE= +k8s.io/component-base v0.0.0-20190917035932-6003d5402e67/go.mod h1:HpN5JDZzg7PKQ1dMrGsCW9/MqYvL/cMtaxJG25EMeFo= k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20190822140433-26a664648505/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= diff --git a/pkg/cmd/diff/diff.go b/pkg/cmd/diff/diff.go index f8f114a07..9c679a002 100644 --- a/pkg/cmd/diff/diff.go +++ b/pkg/cmd/diff/diff.go @@ -56,7 +56,7 @@ var ( KUBECTL_EXTERNAL_DIFF environment variable can be used to select your own diff command. By default, the "diff" command available in your path will be - run with "-u" (unicode) and "-N" (treat new files as empty) options.`)) + run with "-u" (unified diff) and "-N" (treat absent files as empty) options.`)) diffExample = templates.Examples(i18n.T(` # Diff resources included in pod.json. kubectl diff -f pod.json