Update dependencies to v0.15.11 tag

Merge pull request #87640 from cjcullen/automated-cherry-pick-of-#87467-upstream-release-1.15
update gopkg.in/yaml.v2 to v2.2.8 Kubernetes-commit: f0df81892db55b76406c40dec4c4528e4b3cdc80
2026-02-15 00:07:52 +08:00 · 2020-03-13 01:04:59 +00:00 · 2020-01-31 23:44:15 +00:00 · 2020-01-22 11:32:39 -08:00 · 2019-10-04 12:29:09 +00:00 · 2019-10-02 14:46:08 -04:00
3 changed files with 19 additions and 17 deletions
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -212,23 +212,23 @@
 		},
 		{
 			"ImportPath": "gopkg.in/yaml.v2",
-			"Rev": "v2.2.1"
+			"Rev": "v2.2.8"
 		},
 		{
 			"ImportPath": "k8s.io/api",
-			"Rev": "3544db3b9e44"
+			"Rev": "v0.15.11"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery",
-			"Rev": "f2f3a405f61d"
+			"Rev": "v0.15.11"
 		},
 		{
 			"ImportPath": "k8s.io/client-go",
-			"Rev": "e14f31a72a77"
+			"Rev": "v0.15.11"
 		},
 		{
 			"ImportPath": "k8s.io/code-generator",
-			"Rev": "18da4a14b22b"
+			"Rev": "v0.15.11"
 		},
 		{
 			"ImportPath": "k8s.io/gengo",
--- a/go.mod
+++ b/go.mod
@@ -5,10 +5,10 @@ module k8s.io/sample-controller
 go 1.12

 require (
-	k8s.io/api v0.0.0-20190819141258-3544db3b9e44
-	k8s.io/apimachinery v0.0.0-20190817020851-f2f3a405f61d
-	k8s.io/client-go v0.0.0-20190819141724-e14f31a72a77
-	k8s.io/code-generator v0.0.0-20190612205613-18da4a14b22b
+	k8s.io/api v0.15.11
+	k8s.io/apimachinery v0.15.11
+	k8s.io/client-go v0.15.11
+	k8s.io/code-generator v0.15.11
 	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-20190819141258-3544db3b9e44
-	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190817020851-f2f3a405f61d
-	k8s.io/client-go => k8s.io/client-go v0.0.0-20190819141724-e14f31a72a77
-	k8s.io/code-generator => k8s.io/code-generator v0.0.0-20190612205613-18da4a14b22b
+	k8s.io/api => k8s.io/api v0.15.11
+	k8s.io/apimachinery => k8s.io/apimachinery v0.15.11
+	k8s.io/client-go => k8s.io/client-go v0.15.11
+	k8s.io/code-generator => k8s.io/code-generator v0.15.11
 )
--- a/go.sum
+++ b/go.sum
@@ -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-20190819141258-3544db3b9e44/go.mod h1:AOxZTnaXR/xiarlQL0JUfwQPxjmKDvVYoRp58cA7lUo=
-k8s.io/apimachinery v0.0.0-20190817020851-f2f3a405f61d/go.mod h1:3jediapYqJ2w1BFw7lAZPCx7scubsTfosqHkhXCWJKw=
-k8s.io/client-go v0.0.0-20190819141724-e14f31a72a77/go.mod h1:DmkJD5UDP87MVqUQ5VJ6Tj9Oen8WzXPhk3la4qpyG4g=
-k8s.io/code-generator v0.0.0-20190612205613-18da4a14b22b/go.mod h1:G8bQwmHm2eafm5bgtX67XDZQ8CWKSGu9DekI+yN4Y5I=
+gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
+gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+k8s.io/api v0.15.11/go.mod h1:DI3kWWWBG0byhZ4druNYQvleDRhbocPrm+Glq4xVpkM=
+k8s.io/apimachinery v0.15.11/go.mod h1:ZRw+v83FjgEqlzqaBkxL3XB21MSLYdzjsY9Bgxclhdw=
+k8s.io/client-go v0.15.11/go.mod h1:gkprEfouvgHvzeCvwwz2T8MTlfNuZn8vluW8orojRKI=
+k8s.io/code-generator v0.15.11/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=
Author	SHA1	Message	Date
Kubernetes Publisher	f76ab298b3	Update dependencies to v0.15.11 tag	2020-03-13 01:04:59 +00:00
Kubernetes Publisher	56a5941a3d	Merge pull request #87640 from cjcullen/automated-cherry-pick-of-#87467-upstream-release-1.15 update gopkg.in/yaml.v2 to v2.2.8 Kubernetes-commit: f0df81892db55b76406c40dec4c4528e4b3cdc80	2020-01-31 23:44:15 +00:00
CJ Cullen	03779fa10c	update gopkg.in/yaml.v2 to v2.2.8 Kubernetes-commit: f22f9c2ce994edbbd1b1a91cae0ffeebe273ea76	2020-01-22 11:32:39 -08: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