Fix dependencies to point to kubernetes-1.15.2 tag

Merge remote-tracking branch 'origin/master' into release-1.15
Kubernetes-commit: 6127bfb1bbd447e15fd839f3987abe1b8e5188b3
2026-02-15 00:07:52 +08:00 · 2019-08-05 14:28:25 +00:00 · 2019-06-12 21:16:27 +00:00 · 2019-06-12 10:27:41 +02:00
3 changed files with 21 additions and 23 deletions
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -216,19 +216,19 @@
 		},
 		{
 			"ImportPath": "k8s.io/api",
-			"Rev": "641787b3be95"
+			"Rev": "fdd30b57c827"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery",
-			"Rev": "000fc10c9799"
+			"Rev": "1799e75a0719"
 		},
 		{
 			"ImportPath": "k8s.io/client-go",
-			"Rev": "ffa50d62902a"
+			"Rev": "2fe0317bcee0"
 		},
 		{
 			"ImportPath": "k8s.io/code-generator",
-			"Rev": "68fdaa5b96ab"
+			"Rev": "18da4a14b22b"
 		},
 		{
 			"ImportPath": "k8s.io/gengo",
@@ -236,7 +236,7 @@
 		},
 		{
 			"ImportPath": "k8s.io/klog",
-			"Rev": "v0.3.2"
+			"Rev": "v0.3.1"
 		},
 		{
 			"ImportPath": "k8s.io/kube-openapi",
--- a/go.mod
+++ b/go.mod
@@ -5,21 +5,21 @@ module k8s.io/sample-controller
 go 1.12

 require (
-	k8s.io/api v0.0.0-20190620085001-641787b3be95
-	k8s.io/apimachinery v0.0.0-20190604020035-000fc10c9799
-	k8s.io/client-go v0.0.0-20190620085058-ffa50d62902a
-	k8s.io/code-generator v0.0.0-20190531030430-68fdaa5b96ab
-	k8s.io/klog v0.3.2
+	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/klog v0.3.1
 )

 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-20190620085001-641787b3be95
-	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190604020035-000fc10c9799
-	k8s.io/client-go => k8s.io/client-go v0.0.0-20190620085058-ffa50d62902a
-	k8s.io/code-generator => k8s.io/code-generator v0.0.0-20190531030430-68fdaa5b96ab
+	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
 )

-replace k8s.io/component-base => k8s.io/component-base v0.0.0-20190620085129-18f4831304b9
+replace k8s.io/component-base => k8s.io/component-base v0.0.0-20190612210728-f40f68634749
--- a/go.sum
+++ b/go.sum
@@ -94,16 +94,14 @@ 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-20190620085001-641787b3be95/go.mod h1:7eKIQT9wWvrNprZDctj9nplM6gv7p9en+A6U3604pHw=
-k8s.io/apimachinery v0.0.0-20190604020035-000fc10c9799 h1:1RlD6VTLZGu2+UZdiyiY5hjvw7Gr99IAScyfu1Tu5Wo=
-k8s.io/apimachinery v0.0.0-20190604020035-000fc10c9799/go.mod h1:u/2VL7tgEMV0FFTV9q0JO+7cnTsV44LP8Pmx41R4AQ4=
-k8s.io/client-go v0.0.0-20190620085058-ffa50d62902a/go.mod h1:cgbAp3TKrxO4XnS6TpZC5yC86ntd1sjPeFM551UUY3w=
-k8s.io/code-generator v0.0.0-20190531030430-68fdaa5b96ab h1:/lic1fpJOeSX+G5oP8SA3oPLlMD1MC/hPoXiZe+K2O4=
-k8s.io/code-generator v0.0.0-20190531030430-68fdaa5b96ab/go.mod h1:dCm/84oAC9Wg9UBdX7tHMtJWiyQnfNjyF8k6Pf/FrWU=
+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=
 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.2 h1:qvP/U6CcZ6qyi/qSHlJKdlAboCzo3mT0DAm0XAarpz4=
-k8s.io/klog v0.3.2/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
+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 h1:TRb4wNWoBVrH9plmkp2q86FIDppkbrEXdXlxU3a3BMI=
 k8s.io/kube-openapi v0.0.0-20190228160746-b3a7cee44a30/go.mod h1:BXM9ceUBTj2QnfH2MK1odQs778ajze1RxcmP6S8RVVc=
 k8s.io/utils v0.0.0-20190221042446-c2654d5206da h1:ElyM7RPonbKnQqOcw7dG2IK5uvQQn3b/WPHqD5mBvP4=
Author	SHA1	Message	Date
Kubernetes Publisher	b16fad7862	Fix dependencies to point to kubernetes-1.15.2 tag	2019-08-05 14:28:25 +00:00
Kubernetes Publisher	efb1d42b6e	Merge remote-tracking branch 'origin/master' into release-1.15 Kubernetes-commit: 6127bfb1bbd447e15fd839f3987abe1b8e5188b3	2019-06-12 21:16:27 +00:00
Krzysztof Siedlecki	4d7aa1c825	Revert "Bump klog to v0.3.2" Kubernetes-commit: 7dcec919a2e5e8e23da3d0dd61276d86c9b0e4b6	2019-06-12 10:27:41 +02:00