Compare commits

..

5 Commits

Author SHA1 Message Date
Kubernetes Publisher
cd85bca1f5 Update dependencies to v0.15.8-beta.0 tag 2019-12-11 19:35:29 +00:00
Kubernetes Publisher
f886b06a2e Merge pull request #83434 from liggitt/automated-cherry-pick-of-#83261-upstream-release-1.15
[1.15] Automated cherry pick of #83261: bump gopkg.in/yaml.v2 v2.2.4

Kubernetes-commit: 9a83f46a506124685802559c4a3981f4f415d1de
2019-10-04 12:29:09 +00:00
Jordan Liggitt
5af18f126a bump gopkg.in/yaml.v2 v2.2.4
Kubernetes-commit: 8df7ee083fe4dcb39a871b6086a638401bad98c1
2019-10-02 14:46:08 -04:00
Kubernetes Publisher
98e01ef3bf Merge pull request #81522 from cblecker/1.15-x/net
Update golang/x/net dependency on release-1.15

Kubernetes-commit: 2d3c76f9091b6bec110a5e63777c332469e0cba2
2019-08-17 02:31:57 +00:00
Christoph Blecker
bc95c9709b Update golang/x/net dependency
Kubernetes-commit: 842ee1f5889a4e31a48a5cd9c3cbf1edec7c6848
2019-08-16 11:01:55 -07:00
3 changed files with 22 additions and 22 deletions

12
Godeps/Godeps.json generated
View File

@@ -156,7 +156,7 @@
},
{
"ImportPath": "golang.org/x/net",
"Rev": "65e2d4e15006"
"Rev": "cdfb69ac37fc"
},
{
"ImportPath": "golang.org/x/oauth2",
@@ -212,23 +212,23 @@
},
{
"ImportPath": "gopkg.in/yaml.v2",
"Rev": "v2.2.1"
"Rev": "v2.2.4"
},
{
"ImportPath": "k8s.io/api",
"Rev": "fdd30b57c827"
"Rev": "v0.15.8-beta.0"
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "1799e75a0719"
"Rev": "v0.15.8-beta.0"
},
{
"ImportPath": "k8s.io/client-go",
"Rev": "2fe0317bcee0"
"Rev": "v0.15.8-beta.0"
},
{
"ImportPath": "k8s.io/code-generator",
"Rev": "18da4a14b22b"
"Rev": "v0.15.8-beta.0"
},
{
"ImportPath": "k8s.io/gengo",

18
go.mod
View File

@@ -5,10 +5,10 @@ module k8s.io/sample-controller
go 1.12
require (
k8s.io/api v0.0.0-20190805141119-fdd30b57c827
k8s.io/apimachinery v0.0.0-20190612205821-1799e75a0719
k8s.io/client-go v0.0.0-20190805141520-2fe0317bcee0
k8s.io/code-generator v0.0.0-20190612205613-18da4a14b22b
k8s.io/api v0.15.8-beta.0
k8s.io/apimachinery v0.15.8-beta.0
k8s.io/client-go v0.15.8-beta.0
k8s.io/code-generator v0.15.8-beta.0
k8s.io/klog v0.3.1
)
@@ -16,10 +16,8 @@ replace (
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/api => k8s.io/api v0.0.0-20190805141119-fdd30b57c827
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190612205821-1799e75a0719
k8s.io/client-go => k8s.io/client-go v0.0.0-20190805141520-2fe0317bcee0
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20190612205613-18da4a14b22b
k8s.io/api => k8s.io/api v0.15.8-beta.0
k8s.io/apimachinery => k8s.io/apimachinery v0.15.8-beta.0
k8s.io/client-go => k8s.io/client-go v0.15.8-beta.0
k8s.io/code-generator => k8s.io/code-generator v0.15.8-beta.0
)
replace k8s.io/component-base => k8s.io/component-base v0.0.0-20190612210728-f40f68634749

14
go.sum
View File

@@ -61,8 +61,8 @@ golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU
golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20190206173232-65e2d4e15006 h1:bfLnR+k0tq5Lqt6dflRLcZiz6UaXCMt3vhYJ1l4FQ80=
golang.org/x/net v0.0.0-20190206173232-65e2d4e15006/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20190812203447-cdfb69ac37fc h1:gkKoSkUmnU6bpS/VhkuO27bzQeSA51uaEfbOW5dNb68=
golang.org/x/net v0.0.0-20190812203447-cdfb69ac37fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a h1:tImsplftrFpALCYumobsd0K86vlAs/eXGFms2txfJfA=
golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f h1:Bl/8QSvNqXvPGPGXa2z5xUTmV7VDcZyvRZ+QQXkXTZQ=
@@ -94,10 +94,12 @@ gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkep
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/api v0.0.0-20190805141119-fdd30b57c827/go.mod h1:TBhBqb1AWbBQbW3XRusr7n7E4v2+5ZY8r8sAMnyFC5A=
k8s.io/apimachinery v0.0.0-20190612205821-1799e75a0719/go.mod h1:I4A+glKBHiTgiEjQiCCQfCAIcIMFGt291SmsvcrFzJA=
k8s.io/client-go v0.0.0-20190805141520-2fe0317bcee0/go.mod h1:ayzmabJptoFlxo7SQxN2Oz3a12t9kmpMKADzQmr5Zbc=
k8s.io/code-generator v0.0.0-20190612205613-18da4a14b22b/go.mod h1:G8bQwmHm2eafm5bgtX67XDZQ8CWKSGu9DekI+yN4Y5I=
gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I=
gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
k8s.io/api v0.15.8-beta.0/go.mod h1:GwNIL+0thT8hUXk1bLWqinbqwwInzMiJkVcYBdTZw5c=
k8s.io/apimachinery v0.15.8-beta.0/go.mod h1:Xc10RHc1U+F/e9GCloJ8QAeCGevSVP5xhOhqlE+e1kM=
k8s.io/client-go v0.15.8-beta.0/go.mod h1:TMQ70HOoZNVZIwnME1yE+EBlsERbew5dwgIQgdA301k=
k8s.io/code-generator v0.15.8-beta.0/go.mod h1:G8bQwmHm2eafm5bgtX67XDZQ8CWKSGu9DekI+yN4Y5I=
k8s.io/gengo v0.0.0-20190116091435-f8a0810f38af h1:SwjZbO0u5ZuaV6TRMWOGB40iaycX8sbdMQHtjNZ19dk=
k8s.io/gengo v0.0.0-20190116091435-f8a0810f38af/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
k8s.io/klog v0.3.1 h1:RVgyDHY/kFKtLqh67NvEWIgkMneNoIrdkN0CxDSQc68=