diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index def25668f..e3e047cff 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -568,19 +568,19 @@ }, { "ImportPath": "k8s.io/api", - "Rev": "0a52b7486422" + "Rev": "510bcd53e1cf" }, { "ImportPath": "k8s.io/apimachinery", - "Rev": "ac276fc34867" + "Rev": "2b7fa1cb5395" }, { "ImportPath": "k8s.io/cli-runtime", - "Rev": "058578b5f081" + "Rev": "99b536c4b997" }, { "ImportPath": "k8s.io/client-go", - "Rev": "209355739219" + "Rev": "5194bac86967" }, { "ImportPath": "k8s.io/code-generator", @@ -588,7 +588,7 @@ }, { "ImportPath": "k8s.io/component-base", - "Rev": "2cff9454e9d1" + "Rev": "dae26a37dccb" }, { "ImportPath": "k8s.io/gengo", @@ -604,7 +604,7 @@ }, { "ImportPath": "k8s.io/metrics", - "Rev": "4cf3f455bf52" + "Rev": "6bbd5186ca94" }, { "ImportPath": "k8s.io/utils", @@ -616,7 +616,7 @@ }, { "ImportPath": "sigs.k8s.io/structured-merge-diff/v3", - "Rev": "5e70324e7c1c" + "Rev": "v3.0.0" }, { "ImportPath": "sigs.k8s.io/yaml", diff --git a/go.mod b/go.mod index f0062225e..9644e0e28 100644 --- a/go.mod +++ b/go.mod @@ -37,14 +37,14 @@ require ( golang.org/x/sys v0.0.0-20191022100944-742c48ecaeb7 gopkg.in/yaml.v2 v2.2.8 gotest.tools v2.2.0+incompatible // indirect - k8s.io/api v0.0.0-20200306151724-0a52b7486422 - k8s.io/apimachinery v0.0.0-20200306202157-ac276fc34867 - k8s.io/cli-runtime v0.0.0-20200307004336-058578b5f081 - k8s.io/client-go v0.0.0-20200307043534-209355739219 - k8s.io/component-base v0.0.0-20200305122702-2cff9454e9d1 + k8s.io/api v0.0.0-20200307122242-510bcd53e1cf + k8s.io/apimachinery v0.0.0-20200307122051-2b7fa1cb5395 + k8s.io/cli-runtime v0.0.0-20200307124427-99b536c4b997 + k8s.io/client-go v0.0.0-20200307122516-5194bac86967 + k8s.io/component-base v0.0.0-20200307123030-dae26a37dccb k8s.io/klog v1.0.0 k8s.io/kube-openapi v0.0.0-20200121204235-bf4fb3bd569c - k8s.io/metrics v0.0.0-20200304084343-4cf3f455bf52 + k8s.io/metrics v0.0.0-20200307124303-6bbd5186ca94 k8s.io/utils v0.0.0-20200229041039-0a110f9eb7ab sigs.k8s.io/kustomize v2.0.3+incompatible sigs.k8s.io/yaml v1.2.0 @@ -54,11 +54,11 @@ require ( replace ( golang.org/x/sys => golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a // pinned to release-branch.go1.13 golang.org/x/tools => golang.org/x/tools v0.0.0-20190821162956-65e3620a7ae7 // pinned to release-branch.go1.13 - k8s.io/api => k8s.io/api v0.0.0-20200306151724-0a52b7486422 - k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200306202157-ac276fc34867 - k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20200307004336-058578b5f081 - k8s.io/client-go => k8s.io/client-go v0.0.0-20200307043534-209355739219 + k8s.io/api => k8s.io/api v0.0.0-20200307122242-510bcd53e1cf + k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20200307122051-2b7fa1cb5395 + k8s.io/cli-runtime => k8s.io/cli-runtime v0.0.0-20200307124427-99b536c4b997 + k8s.io/client-go => k8s.io/client-go v0.0.0-20200307122516-5194bac86967 k8s.io/code-generator => k8s.io/code-generator v0.0.0-20200306081859-6a048a382944 - k8s.io/component-base => k8s.io/component-base v0.0.0-20200305122702-2cff9454e9d1 - k8s.io/metrics => k8s.io/metrics v0.0.0-20200304084343-4cf3f455bf52 + k8s.io/component-base => k8s.io/component-base v0.0.0-20200307123030-dae26a37dccb + k8s.io/metrics => k8s.io/metrics v0.0.0-20200307124303-6bbd5186ca94 ) diff --git a/go.sum b/go.sum index 9934181fd..aa207940b 100644 --- a/go.sum +++ b/go.sum @@ -306,12 +306,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-20200306151724-0a52b7486422/go.mod h1:4bHpvwcObcdIFmIlnwDdJznMrytQbQCBpJvQgh+FnrA= -k8s.io/apimachinery v0.0.0-20200306202157-ac276fc34867/go.mod h1:5X8oEhnd931nEg6/Nkumo00nT6ZsCLp2h7Xwd7Ym6P4= -k8s.io/cli-runtime v0.0.0-20200307004336-058578b5f081/go.mod h1:IGv1kvgynL+0m4h0lIHl0H4+x9mvhAl0W9rGCuKu2ic= -k8s.io/client-go v0.0.0-20200307043534-209355739219/go.mod h1:9W6NBDAP22mJEhrKYXmPsL6dTQqczIp6+4GZcpWDlKs= +k8s.io/api v0.0.0-20200307122242-510bcd53e1cf/go.mod h1:4LcBtPb1OoMEmTvQLypv2jGrtMEK8ZRCPQyc+uOSi4o= +k8s.io/apimachinery v0.0.0-20200307122051-2b7fa1cb5395/go.mod h1:9SnR/e11v5IbyPCGbvJViimtJ0SwHG4nfZFjU77ftcA= +k8s.io/cli-runtime v0.0.0-20200307124427-99b536c4b997/go.mod h1:/iZjMCD5/3wfEqXl8DAqo58AJtq+BlFyUJOQUw3eeiw= +k8s.io/client-go v0.0.0-20200307122516-5194bac86967/go.mod h1:Ys+cjVY1SiB17qdMz+qc3ItvCfnYLsgVt49tSUmvwTo= k8s.io/code-generator v0.0.0-20200306081859-6a048a382944/go.mod h1:+UHX5rSbxmR8kzS+FAv7um6dtYrZokQvjHpDSYRVkTc= -k8s.io/component-base v0.0.0-20200305122702-2cff9454e9d1/go.mod h1:3RwNWXDYjUOPPeNNQE+7cPPoWAnnL/938q4q+jnBTNk= +k8s.io/component-base v0.0.0-20200307123030-dae26a37dccb/go.mod h1:P8U3GgtuxIyAFY/al0ojd2AP/ifHmYMZBx3HFO3N0es= k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20200114144118-36b2048a9120/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= @@ -320,14 +320,14 @@ k8s.io/klog v1.0.0 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8= k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I= k8s.io/kube-openapi v0.0.0-20200121204235-bf4fb3bd569c h1:/KUFqjjqAcY4Us6luF5RDNZ16KJtb49HfR3ZHB9qYXM= k8s.io/kube-openapi v0.0.0-20200121204235-bf4fb3bd569c/go.mod h1:GRQhZsXIAJ1xR0C9bd8UpWHZ5plfAS9fzPjJuQ6JL3E= -k8s.io/metrics v0.0.0-20200304084343-4cf3f455bf52/go.mod h1:iMdzDlkMmv+0GUq8Fu+nMuIYf7N5WhZ9F+WZ1XEbm4M= +k8s.io/metrics v0.0.0-20200307124303-6bbd5186ca94/go.mod h1:JFabon76np1JeljvfGepiu8cE/yRfBU6lGdjrB7/+cU= k8s.io/utils v0.0.0-20200229041039-0a110f9eb7ab h1:I3f2hcBrepGRXI1z4sukzAb8w1R4eqbsHrAsx06LGYM= k8s.io/utils v0.0.0-20200229041039-0a110f9eb7ab/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew= sigs.k8s.io/kustomize v2.0.3+incompatible h1:JUufWFNlI44MdtnjUqVnvh29rR37PQFzPbLXqhyOyX0= sigs.k8s.io/kustomize v2.0.3+incompatible/go.mod h1:MkjgH3RdOWrievjo6c9T245dYlB5QeXV4WCbnt/PEpU= sigs.k8s.io/structured-merge-diff/v3 v3.0.0-20200116222232-67a7b8c61874/go.mod h1:PlARxl6Hbt/+BC80dRLi1qAmnMqwqDg62YvvVkZjemw= -sigs.k8s.io/structured-merge-diff/v3 v3.0.0-20200207200219-5e70324e7c1c h1:xQP7F7Lntt2dtYmg12WPQHObOrAyPHlMWP1JVSa79GM= -sigs.k8s.io/structured-merge-diff/v3 v3.0.0-20200207200219-5e70324e7c1c/go.mod h1:PlARxl6Hbt/+BC80dRLi1qAmnMqwqDg62YvvVkZjemw= +sigs.k8s.io/structured-merge-diff/v3 v3.0.0 h1:dOmIZBMfhcHS09XZkMyUgkq5trg3/jRyJYFZUiaOp8E= +sigs.k8s.io/structured-merge-diff/v3 v3.0.0/go.mod h1:PlARxl6Hbt/+BC80dRLi1qAmnMqwqDg62YvvVkZjemw= sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q= sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=