diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index 770d0e028..4faff1425 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -552,7 +552,7 @@ }, { "ImportPath": "k8s.io/apimachinery", - "Rev": "a891081239f5" + "Rev": "83fef8059749" }, { "ImportPath": "k8s.io/cli-runtime", diff --git a/docs/book/pages/resource_printing/describe.md b/docs/book/pages/resource_printing/describe.md index 2f7af0db5..13fe6eceb 100644 --- a/docs/book/pages/resource_printing/describe.md +++ b/docs/book/pages/resource_printing/describe.md @@ -64,5 +64,5 @@ When Describing a Resource, it may aggregate information from several other Reso a Node will aggregate Pod Resources to print the Node utilization. When Getting a Resource, it will only print information available from reading that Resource. While Get may aggregate -data from the the *fields* of that Resource, it won't look at fields from other Resources. +data from the *fields* of that Resource, it won't look at fields from other Resources. {% endpanel %} diff --git a/go.mod b/go.mod index 64d76b414..42e179abe 100644 --- a/go.mod +++ b/go.mod @@ -36,7 +36,7 @@ require ( gopkg.in/yaml.v2 v2.2.2 gotest.tools v2.2.0+incompatible // indirect k8s.io/api v0.0.0-20190919035539-41700d9d0c5b - k8s.io/apimachinery v0.0.0-20190917163033-a891081239f5 + k8s.io/apimachinery v0.0.0-20190919161714-83fef8059749 k8s.io/cli-runtime v0.0.0-20190916161055-1f2b8882058b k8s.io/client-go v0.0.0-20190918035823-297c8350f5d7 k8s.io/component-base v0.0.0-20190918040032-61bc4cc48c91 @@ -57,7 +57,7 @@ replace ( 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-20190919035539-41700d9d0c5b - k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190917163033-a891081239f5 + k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190919161714-83fef8059749 k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20190916161055-1f2b8882058b k8s.io/client-go => k8s.io/client-go v0.0.0-20190918035823-297c8350f5d7 k8s.io/code-generator => k8s.io/code-generator v0.0.0-20190912042602-ebc0eb3a5c23 diff --git a/go.sum b/go.sum index 91ceb531d..38dcdb7a4 100644 --- a/go.sum +++ b/go.sum @@ -273,7 +273,7 @@ gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81 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-20190919035539-41700d9d0c5b/go.mod h1:X03jzIKMjfyUMLr+fcPEAbDzf9p/09H/QHidzmjDCVo= -k8s.io/apimachinery v0.0.0-20190917163033-a891081239f5/go.mod h1:nL6pwRT8NgfF8TT68DBI8uEePRt89cSvoXUVqbkWHq4= +k8s.io/apimachinery v0.0.0-20190919161714-83fef8059749/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-20190918035823-297c8350f5d7/go.mod h1:QW96IV7tPD7aQxdSd9AHIjh5/Wv4nygO2PtU2+YJsdc= k8s.io/code-generator v0.0.0-20190912042602-ebc0eb3a5c23/go.mod h1:V5BD6M4CyaN5m+VthcclXWsVcT1Hu+glwa1bi3MIsyE=