Fix dependencies to point to kubernetes-1.15.2-beta.0 tag

Merge remote-tracking branch 'origin/master' into release-1.15
Kubernetes-commit: 6127bfb1bbd447e15fd839f3987abe1b8e5188b3
2026-07-01 14:35:35 +00:00 · 2019-07-18 18:36:06 +00:00 · 2019-06-12 21:03:32 +00:00 · 2019-06-12 10:27:41 +02:00
3 changed files with 12 additions and 13 deletions
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -188,15 +188,15 @@
 		},
 		{
 			"ImportPath": "k8s.io/api",
-			"Rev": "641787b3be95"
+			"Rev": "96732b2f9c92"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery",
-			"Rev": "000fc10c9799"
+			"Rev": "1799e75a0719"
 		},
 		{
 			"ImportPath": "k8s.io/klog",
-			"Rev": "v0.3.2"
+			"Rev": "v0.3.1"
 		},
 		{
 			"ImportPath": "k8s.io/kube-openapi",
--- a/go.mod
+++ b/go.mod
@@ -26,9 +26,9 @@ require (
 	golang.org/x/oauth2 v0.0.0-20190402181905-9f3314589c9a
 	golang.org/x/time v0.0.0-20161028155119-f51c12702a4d
 	google.golang.org/appengine v1.5.0 // indirect
-	k8s.io/api v0.0.0-20190620085001-641787b3be95
-	k8s.io/apimachinery v0.0.0-20190604020035-000fc10c9799
-	k8s.io/klog v0.3.2
+	k8s.io/api v0.0.0-20190718183217-96732b2f9c92
+	k8s.io/apimachinery v0.0.0-20190612205821-1799e75a0719
+	k8s.io/klog v0.3.1
 	k8s.io/utils v0.0.0-20190221042446-c2654d5206da
 	sigs.k8s.io/yaml v1.1.0
 )
@@ -37,6 +37,6 @@ 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/api => k8s.io/api v0.0.0-20190718183217-96732b2f9c92
+	k8s.io/apimachinery => k8s.io/apimachinery v0.0.0-20190612205821-1799e75a0719
 )
--- a/go.sum
+++ b/go.sum
@@ -91,11 +91,10 @@ 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/klog v0.3.2 h1:qvP/U6CcZ6qyi/qSHlJKdlAboCzo3mT0DAm0XAarpz4=
-k8s.io/klog v0.3.2/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk=
+k8s.io/api v0.0.0-20190718183217-96732b2f9c92/go.mod h1:TBhBqb1AWbBQbW3XRusr7n7E4v2+5ZY8r8sAMnyFC5A=
+k8s.io/apimachinery v0.0.0-20190612205821-1799e75a0719/go.mod h1:I4A+glKBHiTgiEjQiCCQfCAIcIMFGt291SmsvcrFzJA=
+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	e7110fb801	Fix dependencies to point to kubernetes-1.15.2-beta.0 tag	2019-07-18 18:36:06 +00:00
Kubernetes Publisher	e4cdb82809	Merge remote-tracking branch 'origin/master' into release-1.15 Kubernetes-commit: 6127bfb1bbd447e15fd839f3987abe1b8e5188b3	2019-06-12 21:03:32 +00:00
Krzysztof Siedlecki	3c67f637e2	Revert "Bump klog to v0.3.2" Kubernetes-commit: 7dcec919a2e5e8e23da3d0dd61276d86c9b0e4b6	2019-06-12 10:27:41 +02:00