diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index b8182901..1398542b 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -1,7 +1,7 @@
 {
 	"ImportPath": "k8s.io/client-go",
 	"GoVersion": "go1.11",
-	"GodepVersion": "v80-k8s-r1",
+	"GodepVersion": "v80",
 	"Packages": [
 		"./..."
 	],
@@ -404,207 +404,207 @@
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/apitesting",
-			"Rev": "d04500c8c3dda9c980b668c57abc2ca61efcf5c4"
+			"Rev": "4d029f0333996cf231080e108e0bd1ece2a94d9f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/apitesting/fuzzer",
-			"Rev": "d04500c8c3dda9c980b668c57abc2ca61efcf5c4"
+			"Rev": "4d029f0333996cf231080e108e0bd1ece2a94d9f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/apitesting/roundtrip",
-			"Rev": "d04500c8c3dda9c980b668c57abc2ca61efcf5c4"
+			"Rev": "4d029f0333996cf231080e108e0bd1ece2a94d9f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/equality",
-			"Rev": "d04500c8c3dda9c980b668c57abc2ca61efcf5c4"
+			"Rev": "4d029f0333996cf231080e108e0bd1ece2a94d9f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/errors",
-			"Rev": "d04500c8c3dda9c980b668c57abc2ca61efcf5c4"
+			"Rev": "4d029f0333996cf231080e108e0bd1ece2a94d9f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/meta",
-			"Rev": "d04500c8c3dda9c980b668c57abc2ca61efcf5c4"
+			"Rev": "4d029f0333996cf231080e108e0bd1ece2a94d9f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/resource",
-			"Rev": "d04500c8c3dda9c980b668c57abc2ca61efcf5c4"
+			"Rev": "4d029f0333996cf231080e108e0bd1ece2a94d9f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/fuzzer",
-			"Rev": "d04500c8c3dda9c980b668c57abc2ca61efcf5c4"
+			"Rev": "4d029f0333996cf231080e108e0bd1ece2a94d9f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/internalversion",
-			"Rev": "d04500c8c3dda9c980b668c57abc2ca61efcf5c4"
+			"Rev": "4d029f0333996cf231080e108e0bd1ece2a94d9f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1",
-			"Rev": "d04500c8c3dda9c980b668c57abc2ca61efcf5c4"
+			"Rev": "4d029f0333996cf231080e108e0bd1ece2a94d9f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured",
-			"Rev": "d04500c8c3dda9c980b668c57abc2ca61efcf5c4"
+			"Rev": "4d029f0333996cf231080e108e0bd1ece2a94d9f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1beta1",
-			"Rev": "d04500c8c3dda9c980b668c57abc2ca61efcf5c4"
+			"Rev": "4d029f0333996cf231080e108e0bd1ece2a94d9f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/conversion",
-			"Rev": "d04500c8c3dda9c980b668c57abc2ca61efcf5c4"
+			"Rev": "4d029f0333996cf231080e108e0bd1ece2a94d9f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/conversion/queryparams",
-			"Rev": "d04500c8c3dda9c980b668c57abc2ca61efcf5c4"
+			"Rev": "4d029f0333996cf231080e108e0bd1ece2a94d9f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/fields",
-			"Rev": "d04500c8c3dda9c980b668c57abc2ca61efcf5c4"
+			"Rev": "4d029f0333996cf231080e108e0bd1ece2a94d9f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/labels",
-			"Rev": "d04500c8c3dda9c980b668c57abc2ca61efcf5c4"
+			"Rev": "4d029f0333996cf231080e108e0bd1ece2a94d9f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime",
-			"Rev": "d04500c8c3dda9c980b668c57abc2ca61efcf5c4"
+			"Rev": "4d029f0333996cf231080e108e0bd1ece2a94d9f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/schema",
-			"Rev": "d04500c8c3dda9c980b668c57abc2ca61efcf5c4"
+			"Rev": "4d029f0333996cf231080e108e0bd1ece2a94d9f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer",
-			"Rev": "d04500c8c3dda9c980b668c57abc2ca61efcf5c4"
+			"Rev": "4d029f0333996cf231080e108e0bd1ece2a94d9f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/json",
-			"Rev": "d04500c8c3dda9c980b668c57abc2ca61efcf5c4"
+			"Rev": "4d029f0333996cf231080e108e0bd1ece2a94d9f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/protobuf",
-			"Rev": "d04500c8c3dda9c980b668c57abc2ca61efcf5c4"
+			"Rev": "4d029f0333996cf231080e108e0bd1ece2a94d9f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/recognizer",
-			"Rev": "d04500c8c3dda9c980b668c57abc2ca61efcf5c4"
+			"Rev": "4d029f0333996cf231080e108e0bd1ece2a94d9f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/streaming",
-			"Rev": "d04500c8c3dda9c980b668c57abc2ca61efcf5c4"
+			"Rev": "4d029f0333996cf231080e108e0bd1ece2a94d9f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/versioning",
-			"Rev": "d04500c8c3dda9c980b668c57abc2ca61efcf5c4"
+			"Rev": "4d029f0333996cf231080e108e0bd1ece2a94d9f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/selection",
-			"Rev": "d04500c8c3dda9c980b668c57abc2ca61efcf5c4"
+			"Rev": "4d029f0333996cf231080e108e0bd1ece2a94d9f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/types",
-			"Rev": "d04500c8c3dda9c980b668c57abc2ca61efcf5c4"
+			"Rev": "4d029f0333996cf231080e108e0bd1ece2a94d9f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/cache",
-			"Rev": "d04500c8c3dda9c980b668c57abc2ca61efcf5c4"
+			"Rev": "4d029f0333996cf231080e108e0bd1ece2a94d9f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/clock",
-			"Rev": "d04500c8c3dda9c980b668c57abc2ca61efcf5c4"
+			"Rev": "4d029f0333996cf231080e108e0bd1ece2a94d9f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/diff",
-			"Rev": "d04500c8c3dda9c980b668c57abc2ca61efcf5c4"
+			"Rev": "4d029f0333996cf231080e108e0bd1ece2a94d9f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/errors",
-			"Rev": "d04500c8c3dda9c980b668c57abc2ca61efcf5c4"
+			"Rev": "4d029f0333996cf231080e108e0bd1ece2a94d9f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/framer",
-			"Rev": "d04500c8c3dda9c980b668c57abc2ca61efcf5c4"
+			"Rev": "4d029f0333996cf231080e108e0bd1ece2a94d9f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream",
-			"Rev": "d04500c8c3dda9c980b668c57abc2ca61efcf5c4"
+			"Rev": "4d029f0333996cf231080e108e0bd1ece2a94d9f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream/spdy",
-			"Rev": "d04500c8c3dda9c980b668c57abc2ca61efcf5c4"
+			"Rev": "4d029f0333996cf231080e108e0bd1ece2a94d9f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/intstr",
-			"Rev": "d04500c8c3dda9c980b668c57abc2ca61efcf5c4"
+			"Rev": "4d029f0333996cf231080e108e0bd1ece2a94d9f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/json",
-			"Rev": "d04500c8c3dda9c980b668c57abc2ca61efcf5c4"
+			"Rev": "4d029f0333996cf231080e108e0bd1ece2a94d9f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/mergepatch",
-			"Rev": "d04500c8c3dda9c980b668c57abc2ca61efcf5c4"
+			"Rev": "4d029f0333996cf231080e108e0bd1ece2a94d9f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/naming",
-			"Rev": "d04500c8c3dda9c980b668c57abc2ca61efcf5c4"
+			"Rev": "4d029f0333996cf231080e108e0bd1ece2a94d9f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/net",
-			"Rev": "d04500c8c3dda9c980b668c57abc2ca61efcf5c4"
+			"Rev": "4d029f0333996cf231080e108e0bd1ece2a94d9f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/remotecommand",
-			"Rev": "d04500c8c3dda9c980b668c57abc2ca61efcf5c4"
+			"Rev": "4d029f0333996cf231080e108e0bd1ece2a94d9f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/runtime",
-			"Rev": "d04500c8c3dda9c980b668c57abc2ca61efcf5c4"
+			"Rev": "4d029f0333996cf231080e108e0bd1ece2a94d9f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/sets",
-			"Rev": "d04500c8c3dda9c980b668c57abc2ca61efcf5c4"
+			"Rev": "4d029f0333996cf231080e108e0bd1ece2a94d9f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/strategicpatch",
-			"Rev": "d04500c8c3dda9c980b668c57abc2ca61efcf5c4"
+			"Rev": "4d029f0333996cf231080e108e0bd1ece2a94d9f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/validation",
-			"Rev": "d04500c8c3dda9c980b668c57abc2ca61efcf5c4"
+			"Rev": "4d029f0333996cf231080e108e0bd1ece2a94d9f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/validation/field",
-			"Rev": "d04500c8c3dda9c980b668c57abc2ca61efcf5c4"
+			"Rev": "4d029f0333996cf231080e108e0bd1ece2a94d9f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/wait",
-			"Rev": "d04500c8c3dda9c980b668c57abc2ca61efcf5c4"
+			"Rev": "4d029f0333996cf231080e108e0bd1ece2a94d9f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/yaml",
-			"Rev": "d04500c8c3dda9c980b668c57abc2ca61efcf5c4"
+			"Rev": "4d029f0333996cf231080e108e0bd1ece2a94d9f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/version",
-			"Rev": "d04500c8c3dda9c980b668c57abc2ca61efcf5c4"
+			"Rev": "4d029f0333996cf231080e108e0bd1ece2a94d9f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/watch",
-			"Rev": "d04500c8c3dda9c980b668c57abc2ca61efcf5c4"
+			"Rev": "4d029f0333996cf231080e108e0bd1ece2a94d9f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/json",
-			"Rev": "d04500c8c3dda9c980b668c57abc2ca61efcf5c4"
+			"Rev": "4d029f0333996cf231080e108e0bd1ece2a94d9f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/netutil",
-			"Rev": "d04500c8c3dda9c980b668c57abc2ca61efcf5c4"
+			"Rev": "4d029f0333996cf231080e108e0bd1ece2a94d9f"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect",
-			"Rev": "d04500c8c3dda9c980b668c57abc2ca61efcf5c4"
+			"Rev": "4d029f0333996cf231080e108e0bd1ece2a94d9f"
 		},
 		{
 			"ImportPath": "k8s.io/klog",
diff --git a/tools/cache/OWNERS b/tools/cache/OWNERS
index 727377f9..917ca8af 100755
--- a/tools/cache/OWNERS
+++ b/tools/cache/OWNERS
@@ -22,7 +22,6 @@ reviewers:
 - erictune
 - davidopp
 - pmorie
-- kargakis
 - janetkuo
 - justinsb
 - eparis