Compare commits

...

10 Commits

Author SHA1 Message Date
Kubernetes Publisher 52018c8ce3 Fix dependencies to point to kubernetes-1.15.1-beta.0 tag 2019-06-20 08:59:43 +00:00
Kubernetes Publisher c247e1cf50 Merge remote-tracking branch 'origin/master' into release-1.15
Kubernetes-commit: 6127bfb1bbd447e15fd839f3987abe1b8e5188b3
2019-06-12 21:25:20 +00:00
Krzysztof Siedlecki cfcf4aa9a1 Revert "Bump klog to v0.3.2"
Kubernetes-commit: 7dcec919a2e5e8e23da3d0dd61276d86c9b0e4b6
2019-06-12 10:27:41 +02:00
Kubernetes Publisher f70ab2663d Merge remote-tracking branch 'origin/master' into release-1.15
Kubernetes-commit: 6be12759ea726aa785ba3a5937bbc75e479c1efd
2019-05-31 14:06:15 +00:00
yuwenma 3cfeaf02cb Bump klog to v0.3.2
Kubernetes-commit: 5cef37433e55827226f20981598ddfa2c6511809
2019-05-28 22:45:19 -07:00
Kubernetes Publisher b25652fca0 Merge remote-tracking branch 'origin/master' into release-1.15. Deleting CHANGELOG-1.14.md
Kubernetes-commit: 5991262b24f5e834654716148c939624536cce3a
2019-05-28 16:14:51 +00:00
Michael Taufen 6cad102251 Update klog to v0.3.1
Includes recent fixes, notably https://github.com/kubernetes/klog/pull/66

Kubernetes-commit: ee7bcc53a206f669b057e38a477b51b3477aab23
2019-05-22 10:51:33 -07:00
Kubernetes Publisher 673e26c639 Merge remote-tracking branch 'origin/master' into release-1.15
Kubernetes-commit: 5d5e3fbd84b30d8bf59bfdf4c14d01196869b92f
2019-05-28 16:14:51 +00:00
Mike Danese de05f4fe0c vendor github.com/google/go-cmp
Kubernetes-commit: 76f683a8f3dc2977846e16b2ea14208a51c2cb6b
2019-04-22 21:41:46 -07:00
Jordan Liggitt a41ac3d158 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973
bump dependency to version preferred by our version of prometheus

Kubernetes-commit: 867fa61f0cfcbf1875d58d50afc56f71a5031256
2019-05-14 19:00:29 +00:00
3 changed files with 20 additions and 15 deletions

12
Godeps/Godeps.json generated
View File

@ -8,7 +8,7 @@
"Deps": [
{
"ImportPath": "github.com/beorn7/perks",
"Rev": "4c0e84591b9a"
"Rev": "3a771d992973"
},
{
"ImportPath": "github.com/blang/semver",
@ -46,6 +46,10 @@
"ImportPath": "github.com/golang/protobuf",
"Rev": "v1.2.0"
},
{
"ImportPath": "github.com/google/go-cmp",
"Rev": "v0.3.0"
},
{
"ImportPath": "github.com/google/gofuzz",
"Rev": "24818f796faf"
@ -164,15 +168,15 @@
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "ad85901afca0"
"Rev": "1799e75a0719"
},
{
"ImportPath": "k8s.io/component-base",
"Rev": "91ee9e34fdd1"
"Rev": "4cd66be69262"
},
{
"ImportPath": "k8s.io/klog",
"Rev": "v0.3.0"
"Rev": "v0.3.1"
},
{
"ImportPath": "k8s.io/kube-openapi",

11
go.mod
View File

@ -5,17 +5,16 @@ module k8s.io/kube-controller-manager
go 1.12
require (
k8s.io/apimachinery v0.0.0-20190511023455-ad85901afca0
k8s.io/component-base v0.0.0-20190511024024-91ee9e34fdd1
k8s.io/apimachinery v0.0.0-20190612205821-1799e75a0719
k8s.io/component-base v0.0.0-20190620085131-4cd66be69262
)
replace (
github.com/beorn7/perks => github.com/beorn7/perks v0.0.0-20160804104726-4c0e84591b9a
golang.org/x/sync => golang.org/x/sync v0.0.0-20181108010431-42b317875d0f
golang.org/x/sys => golang.org/x/sys v0.0.0-20190209173611-3b5209105503
golang.org/x/tools => golang.org/x/tools v0.0.0-20190313210603-aa82965741a9
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190511023455-ad85901afca0
k8s.io/component-base => k8s.io/component-base v0.0.0-20190511024024-91ee9e34fdd1
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190612205821-1799e75a0719
k8s.io/component-base => k8s.io/component-base v0.0.0-20190620085131-4cd66be69262
)
replace k8s.io/apiserver => k8s.io/apiserver v0.0.0-20190511024206-d49804050482
replace k8s.io/apiserver => k8s.io/apiserver v0.0.0-20190620085203-5d32fb3b42f4

12
go.sum
View File

@ -1,4 +1,4 @@
github.com/beorn7/perks v0.0.0-20160804104726-4c0e84591b9a/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
github.com/blang/semver v3.5.0+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@ -10,6 +10,8 @@ github.com/gogo/protobuf v0.0.0-20171007142547-342cbe0a0415 h1:WSBJMqJbLxsn+bTCP
github.com/gogo/protobuf v0.0.0-20171007142547-342cbe0a0415/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
github.com/golang/groupcache v0.0.0-20160516000752-02826c3e7903/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
github.com/google/go-cmp v0.3.0 h1:crn/baboCvb5fXaQ0IJ1SGTsTVrWpDsCWC8EGETZijY=
github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf h1:+RRA9JqSOZFfKrOeqr2z77+8R2RKyh8PG66dcu1V0ck=
github.com/google/gofuzz v0.0.0-20170612174753-24818f796faf/go.mod h1:HP5RmnzzSNb993RKQDq4+1A4ia9nllfqcQFTQJedwGI=
github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
@ -54,10 +56,10 @@ gopkg.in/inf.v0 v0.9.0/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
gopkg.in/yaml.v2 v2.2.1 h1:mUhvW9EsL+naU5Q3cakzfE91YhliOondGd6ZrsDBHQE=
gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
k8s.io/apimachinery v0.0.0-20190511023455-ad85901afca0/go.mod h1:5CBnzrKYGHzv9ZsSKmQ8wHt4XI4/TUBPDwYM9FlZMyw=
k8s.io/component-base v0.0.0-20190511024024-91ee9e34fdd1/go.mod h1:hlLSedoHFjaibpkg18jYZ0v6lpuhbLAVfenuqtu3Hrk=
k8s.io/klog v0.3.0 h1:0VPpR+sizsiivjIfIAQH/rl8tan6jvWkS7lU+0di3lE=
k8s.io/klog v0.3.0/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
k8s.io/apimachinery v0.0.0-20190612205821-1799e75a0719/go.mod h1:I4A+glKBHiTgiEjQiCCQfCAIcIMFGt291SmsvcrFzJA=
k8s.io/component-base v0.0.0-20190620085131-4cd66be69262/go.mod h1:VLedAFwENz2swOjm0zmUXpAP2mV55c49xgaOzPBI/QQ=
k8s.io/klog v0.3.1 h1:RVgyDHY/kFKtLqh67NvEWIgkMneNoIrdkN0CxDSQc68=
k8s.io/klog v0.3.1/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30/go.mod h1:BXM9ceUBTj2QnfH2MK1odQs778ajze1RxcmP6S8RVVc=
k8s.io/utils v0.0.0-20190221042446-c2654d5206da h1:ElyM7RPonbKnQqOcw7dG2IK5uvQQn3b/WPHqD5mBvP4=
k8s.io/utils v0.0.0-20190221042446-c2654d5206da/go.mod h1:8k8uAuAQ0rXslZKaEWd0c3oVhZz7sSzSiPnVZayjIX0=