diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index dc7ddeb81..a4fcac9cc 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -116,7 +116,7 @@ }, { "ImportPath": "github.com/evanphx/json-patch", - "Rev": "162e5629780b" + "Rev": "v4.9.0" }, { "ImportPath": "github.com/fsnotify/fsnotify", @@ -234,10 +234,6 @@ "ImportPath": "github.com/imdario/mergo", "Rev": "v0.3.5" }, - { - "ImportPath": "github.com/jessevdk/go-flags", - "Rev": "v1.4.0" - }, { "ImportPath": "github.com/jonboulle/clockwork", "Rev": "v0.1.0" @@ -492,19 +488,19 @@ }, { "ImportPath": "k8s.io/api", - "Rev": "0f665c80805a" + "Rev": "f197499901bd" }, { "ImportPath": "k8s.io/apimachinery", - "Rev": "79e0efc2a654" + "Rev": "f7929272bda3" }, { "ImportPath": "k8s.io/client-go", - "Rev": "e1f134a72784" + "Rev": "78b06b51d5b4" }, { "ImportPath": "k8s.io/component-base", - "Rev": "ae0dd9a55a47" + "Rev": "231482d3fb08" }, { "ImportPath": "k8s.io/gengo", diff --git a/go.mod b/go.mod index d46384224..83ea58a02 100644 --- a/go.mod +++ b/go.mod @@ -14,7 +14,7 @@ require ( github.com/coreos/pkg v0.0.0-20180108230652-97fdf19511ea github.com/docker/docker v0.7.3-0.20190327010347-be7ac8be2ae0 github.com/emicklei/go-restful v2.9.5+incompatible - github.com/evanphx/json-patch v0.0.0-20200808040245-162e5629780b + github.com/evanphx/json-patch v4.9.0+incompatible github.com/go-openapi/jsonpointer v0.19.3 // indirect github.com/go-openapi/spec v0.19.2 github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d @@ -50,10 +50,10 @@ require ( gopkg.in/square/go-jose.v2 v2.2.2 gopkg.in/yaml.v2 v2.2.8 gotest.tools v2.2.0+incompatible // indirect - k8s.io/api v0.0.0-20200812051914-0f665c80805a - k8s.io/apimachinery v0.0.0-20200812051535-79e0efc2a654 - k8s.io/client-go v0.0.0-20200812052405-e1f134a72784 - k8s.io/component-base v0.0.0-20200812053556-ae0dd9a55a47 + k8s.io/api v0.0.0-20200831051839-f197499901bd + k8s.io/apimachinery v0.0.0-20200831051605-f7929272bda3 + k8s.io/client-go v0.0.0-20200831052244-78b06b51d5b4 + k8s.io/component-base v0.0.0-20200831052829-231482d3fb08 k8s.io/klog v1.0.0 k8s.io/kube-openapi v0.0.0-20200410163147-594e756bea31 // release-1.16 k8s.io/utils v0.0.0-20190801114015-581e00157fb1 @@ -63,8 +63,8 @@ require ( replace ( golang.org/x/tools => golang.org/x/tools v0.0.0-20190821162956-65e3620a7ae7 - k8s.io/api => k8s.io/api v0.0.0-20200812051914-0f665c80805a - k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200812051535-79e0efc2a654 - k8s.io/client-go => k8s.io/client-go v0.0.0-20200812052405-e1f134a72784 - k8s.io/component-base => k8s.io/component-base v0.0.0-20200812053556-ae0dd9a55a47 + k8s.io/api => k8s.io/api v0.0.0-20200831051839-f197499901bd + k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200831051605-f7929272bda3 + k8s.io/client-go => k8s.io/client-go v0.0.0-20200831052244-78b06b51d5b4 + k8s.io/component-base => k8s.io/component-base v0.0.0-20200831052829-231482d3fb08 ) diff --git a/go.sum b/go.sum index 486abece4..7abff4884 100644 --- a/go.sum +++ b/go.sum @@ -50,8 +50,8 @@ github.com/elazarl/goproxy v0.0.0-20170405201442-c4fc26588b6e/go.mod h1:/Zj4wYkg github.com/emicklei/go-restful v0.0.0-20170410110728-ff4f55a20633/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= github.com/emicklei/go-restful v2.9.5+incompatible h1:spTtZBk5DYEvbxMVutUuTyh1Ao2r4iyvLdACqsl/Ljk= github.com/emicklei/go-restful v2.9.5+incompatible/go.mod h1:otzb+WCGbkyDHkqmQmT5YD2WR4BBwUdeQoFo8l/7tVs= -github.com/evanphx/json-patch v0.0.0-20200808040245-162e5629780b h1:vCplRbYcTTeBVLjIU0KvipEeVBSxl6sakUBRmeLBTkw= -github.com/evanphx/json-patch v0.0.0-20200808040245-162e5629780b/go.mod h1:NAJj0yf/KaRKURN6nyi7A9IZydMivZEm9oQLWNjfKDc= +github.com/evanphx/json-patch v4.9.0+incompatible h1:kLcOMZeuLAJvL2BPWLMIj5oaZQobrkAqrL+WFZwQses= +github.com/evanphx/json-patch v4.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk= github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/ghodss/yaml v0.0.0-20150909031657-73d445a93680/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= @@ -120,7 +120,6 @@ github.com/hpcloud/tail v1.0.0 h1:nfCOvKYfkgYP8hkirhJocXT2+zOD8yUNjXaWfTlyFKI= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/imdario/mergo v0.3.5 h1:JboBksRwiiAJWvIYJVo46AfV+IAIKZpfrSzVKj42R4Q= github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= -github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI= github.com/jonboulle/clockwork v0.1.0 h1:VKV+ZcuP6l3yW9doeqz6ziZGgcynBVQO+obU0+0hcPo= github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= github.com/json-iterator/go v0.0.0-20180612202835-f2b4162afba3/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= @@ -305,10 +304,10 @@ 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= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -k8s.io/api v0.0.0-20200812051914-0f665c80805a/go.mod h1:4N2tIwMMV8YqSl9UhAPLbZ2GXJEL0XJnhsJhsn46+Nw= -k8s.io/apimachinery v0.0.0-20200812051535-79e0efc2a654/go.mod h1:AS4lY4M1yKOeMWs98YuccQt7vwqO5ErTPxAXu1jewu0= -k8s.io/client-go v0.0.0-20200812052405-e1f134a72784/go.mod h1:tJI6CNe2DF4XAX4f6owsNAq1OHHoKA2CQQJe/tj3pJA= -k8s.io/component-base v0.0.0-20200812053556-ae0dd9a55a47/go.mod h1:SQRJ3tUxpfb52jJmcxw1YiEo8K7ORgsErR1qSWhTD1I= +k8s.io/api v0.0.0-20200831051839-f197499901bd/go.mod h1:RJgKC7GZjtg05LAZsVM4a8fWhl4Ikvy+3y+sl6Mom+Y= +k8s.io/apimachinery v0.0.0-20200831051605-f7929272bda3/go.mod h1:xAtIC8Gj83Pn2OCs2g57wZpZembRhJhiXIlQIqanwas= +k8s.io/client-go v0.0.0-20200831052244-78b06b51d5b4/go.mod h1:Jfrzv9Y4S7CNnDXAzM8nKXzikKIFycs5NMPL1r1RwIs= +k8s.io/component-base v0.0.0-20200831052829-231482d3fb08/go.mod h1:PpJm1rUQQfNYKotENhyGGBzPfmrA/BDobiANiwVJHf8= k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=