Compare commits

...

3 Commits

Author SHA1 Message Date
Kubernetes Publisher
b75b529901 Update dependencies to v0.15.8 tag 2020-01-17 00:07:20 +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
3 changed files with 19 additions and 17 deletions

10
Godeps/Godeps.json generated
View File

@@ -212,23 +212,23 @@
},
{
"ImportPath": "gopkg.in/yaml.v2",
"Rev": "v2.2.1"
"Rev": "v2.2.4"
},
{
"ImportPath": "k8s.io/api",
"Rev": "e14a4b1f5f84"
"Rev": "v0.15.8"
},
{
"ImportPath": "k8s.io/apimachinery",
"Rev": "f2f3a405f61d"
"Rev": "v0.15.8"
},
{
"ImportPath": "k8s.io/client-go",
"Rev": "637fc595d17a"
"Rev": "v0.15.8"
},
{
"ImportPath": "k8s.io/code-generator",
"Rev": "18da4a14b22b"
"Rev": "v0.15.8"
},
{
"ImportPath": "k8s.io/gengo",

16
go.mod
View File

@@ -5,10 +5,10 @@ module k8s.io/sample-controller
go 1.12
require (
k8s.io/api v0.0.0-20190817021128-e14a4b1f5f84
k8s.io/apimachinery v0.0.0-20190817020851-f2f3a405f61d
k8s.io/client-go v0.0.0-20190817021527-637fc595d17a
k8s.io/code-generator v0.0.0-20190612205613-18da4a14b22b
k8s.io/api v0.15.8
k8s.io/apimachinery v0.15.8
k8s.io/client-go v0.15.8
k8s.io/code-generator v0.15.8
k8s.io/klog v0.3.1
)
@@ -16,8 +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-20190817021128-e14a4b1f5f84
k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190817020851-f2f3a405f61d
k8s.io/client-go => k8s.io/client-go v0.0.0-20190817021527-637fc595d17a
k8s.io/code-generator => k8s.io/code-generator v0.0.0-20190612205613-18da4a14b22b
k8s.io/api => k8s.io/api v0.15.8
k8s.io/apimachinery => k8s.io/apimachinery v0.15.8
k8s.io/client-go => k8s.io/client-go v0.15.8
k8s.io/code-generator => k8s.io/code-generator v0.15.8
)

10
go.sum
View File

@@ -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-20190817021128-e14a4b1f5f84/go.mod h1:AOxZTnaXR/xiarlQL0JUfwQPxjmKDvVYoRp58cA7lUo=
k8s.io/apimachinery v0.0.0-20190817020851-f2f3a405f61d/go.mod h1:3jediapYqJ2w1BFw7lAZPCx7scubsTfosqHkhXCWJKw=
k8s.io/client-go v0.0.0-20190817021527-637fc595d17a/go.mod h1:+Ns9AwGRd5TqhqhXZkLSCzO/bpUSWwP93/TE0q2OsLQ=
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/go.mod h1:hpDXsOhY/unVSSzhMol7kihWaNMf2snhF4nejjlzUzk=
k8s.io/apimachinery v0.15.8/go.mod h1:Xc10RHc1U+F/e9GCloJ8QAeCGevSVP5xhOhqlE+e1kM=
k8s.io/client-go v0.15.8/go.mod h1:SEnLUQEOUlhdOrRylv1vS03YStlvx/9zhOPWoCLN/RY=
k8s.io/code-generator v0.15.8/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=