diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
index 60218a4d..301e193f 100644
--- a/Godeps/Godeps.json
+++ b/Godeps/Godeps.json
@@ -1,6 +1,6 @@
 {
 	"ImportPath": "k8s.io/client-go",
-	"GoVersion": "go1.10",
+	"GoVersion": "go1.9",
 	"GodepVersion": "v80",
 	"Packages": [
 		"./..."
@@ -392,203 +392,203 @@
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/equality",
-			"Rev": "5f0d8f067e3bc465077d0333e891450326a577a3"
+			"Rev": "9c0d9e23a515298bbe709bccf24fe790ecdd6f72"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/errors",
-			"Rev": "5f0d8f067e3bc465077d0333e891450326a577a3"
+			"Rev": "9c0d9e23a515298bbe709bccf24fe790ecdd6f72"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/meta",
-			"Rev": "5f0d8f067e3bc465077d0333e891450326a577a3"
+			"Rev": "9c0d9e23a515298bbe709bccf24fe790ecdd6f72"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/resource",
-			"Rev": "5f0d8f067e3bc465077d0333e891450326a577a3"
+			"Rev": "9c0d9e23a515298bbe709bccf24fe790ecdd6f72"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/testing",
-			"Rev": "5f0d8f067e3bc465077d0333e891450326a577a3"
+			"Rev": "9c0d9e23a515298bbe709bccf24fe790ecdd6f72"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/testing/fuzzer",
-			"Rev": "5f0d8f067e3bc465077d0333e891450326a577a3"
+			"Rev": "9c0d9e23a515298bbe709bccf24fe790ecdd6f72"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/api/testing/roundtrip",
-			"Rev": "5f0d8f067e3bc465077d0333e891450326a577a3"
+			"Rev": "9c0d9e23a515298bbe709bccf24fe790ecdd6f72"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/fuzzer",
-			"Rev": "5f0d8f067e3bc465077d0333e891450326a577a3"
+			"Rev": "9c0d9e23a515298bbe709bccf24fe790ecdd6f72"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/internalversion",
-			"Rev": "5f0d8f067e3bc465077d0333e891450326a577a3"
+			"Rev": "9c0d9e23a515298bbe709bccf24fe790ecdd6f72"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1",
-			"Rev": "5f0d8f067e3bc465077d0333e891450326a577a3"
+			"Rev": "9c0d9e23a515298bbe709bccf24fe790ecdd6f72"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured",
-			"Rev": "5f0d8f067e3bc465077d0333e891450326a577a3"
+			"Rev": "9c0d9e23a515298bbe709bccf24fe790ecdd6f72"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1beta1",
-			"Rev": "5f0d8f067e3bc465077d0333e891450326a577a3"
+			"Rev": "9c0d9e23a515298bbe709bccf24fe790ecdd6f72"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/conversion",
-			"Rev": "5f0d8f067e3bc465077d0333e891450326a577a3"
+			"Rev": "9c0d9e23a515298bbe709bccf24fe790ecdd6f72"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/conversion/queryparams",
-			"Rev": "5f0d8f067e3bc465077d0333e891450326a577a3"
+			"Rev": "9c0d9e23a515298bbe709bccf24fe790ecdd6f72"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/fields",
-			"Rev": "5f0d8f067e3bc465077d0333e891450326a577a3"
+			"Rev": "9c0d9e23a515298bbe709bccf24fe790ecdd6f72"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/labels",
-			"Rev": "5f0d8f067e3bc465077d0333e891450326a577a3"
+			"Rev": "9c0d9e23a515298bbe709bccf24fe790ecdd6f72"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime",
-			"Rev": "5f0d8f067e3bc465077d0333e891450326a577a3"
+			"Rev": "9c0d9e23a515298bbe709bccf24fe790ecdd6f72"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/schema",
-			"Rev": "5f0d8f067e3bc465077d0333e891450326a577a3"
+			"Rev": "9c0d9e23a515298bbe709bccf24fe790ecdd6f72"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer",
-			"Rev": "5f0d8f067e3bc465077d0333e891450326a577a3"
+			"Rev": "9c0d9e23a515298bbe709bccf24fe790ecdd6f72"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/json",
-			"Rev": "5f0d8f067e3bc465077d0333e891450326a577a3"
+			"Rev": "9c0d9e23a515298bbe709bccf24fe790ecdd6f72"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/protobuf",
-			"Rev": "5f0d8f067e3bc465077d0333e891450326a577a3"
+			"Rev": "9c0d9e23a515298bbe709bccf24fe790ecdd6f72"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/recognizer",
-			"Rev": "5f0d8f067e3bc465077d0333e891450326a577a3"
+			"Rev": "9c0d9e23a515298bbe709bccf24fe790ecdd6f72"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/streaming",
-			"Rev": "5f0d8f067e3bc465077d0333e891450326a577a3"
+			"Rev": "9c0d9e23a515298bbe709bccf24fe790ecdd6f72"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/versioning",
-			"Rev": "5f0d8f067e3bc465077d0333e891450326a577a3"
+			"Rev": "9c0d9e23a515298bbe709bccf24fe790ecdd6f72"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/selection",
-			"Rev": "5f0d8f067e3bc465077d0333e891450326a577a3"
+			"Rev": "9c0d9e23a515298bbe709bccf24fe790ecdd6f72"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/types",
-			"Rev": "5f0d8f067e3bc465077d0333e891450326a577a3"
+			"Rev": "9c0d9e23a515298bbe709bccf24fe790ecdd6f72"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/cache",
-			"Rev": "5f0d8f067e3bc465077d0333e891450326a577a3"
+			"Rev": "9c0d9e23a515298bbe709bccf24fe790ecdd6f72"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/clock",
-			"Rev": "5f0d8f067e3bc465077d0333e891450326a577a3"
+			"Rev": "9c0d9e23a515298bbe709bccf24fe790ecdd6f72"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/diff",
-			"Rev": "5f0d8f067e3bc465077d0333e891450326a577a3"
+			"Rev": "9c0d9e23a515298bbe709bccf24fe790ecdd6f72"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/errors",
-			"Rev": "5f0d8f067e3bc465077d0333e891450326a577a3"
+			"Rev": "9c0d9e23a515298bbe709bccf24fe790ecdd6f72"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/framer",
-			"Rev": "5f0d8f067e3bc465077d0333e891450326a577a3"
+			"Rev": "9c0d9e23a515298bbe709bccf24fe790ecdd6f72"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream",
-			"Rev": "5f0d8f067e3bc465077d0333e891450326a577a3"
+			"Rev": "9c0d9e23a515298bbe709bccf24fe790ecdd6f72"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/httpstream/spdy",
-			"Rev": "5f0d8f067e3bc465077d0333e891450326a577a3"
+			"Rev": "9c0d9e23a515298bbe709bccf24fe790ecdd6f72"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/intstr",
-			"Rev": "5f0d8f067e3bc465077d0333e891450326a577a3"
+			"Rev": "9c0d9e23a515298bbe709bccf24fe790ecdd6f72"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/json",
-			"Rev": "5f0d8f067e3bc465077d0333e891450326a577a3"
+			"Rev": "9c0d9e23a515298bbe709bccf24fe790ecdd6f72"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/mergepatch",
-			"Rev": "5f0d8f067e3bc465077d0333e891450326a577a3"
+			"Rev": "9c0d9e23a515298bbe709bccf24fe790ecdd6f72"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/net",
-			"Rev": "5f0d8f067e3bc465077d0333e891450326a577a3"
+			"Rev": "9c0d9e23a515298bbe709bccf24fe790ecdd6f72"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/remotecommand",
-			"Rev": "5f0d8f067e3bc465077d0333e891450326a577a3"
+			"Rev": "9c0d9e23a515298bbe709bccf24fe790ecdd6f72"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/runtime",
-			"Rev": "5f0d8f067e3bc465077d0333e891450326a577a3"
+			"Rev": "9c0d9e23a515298bbe709bccf24fe790ecdd6f72"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/sets",
-			"Rev": "5f0d8f067e3bc465077d0333e891450326a577a3"
+			"Rev": "9c0d9e23a515298bbe709bccf24fe790ecdd6f72"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/strategicpatch",
-			"Rev": "5f0d8f067e3bc465077d0333e891450326a577a3"
+			"Rev": "9c0d9e23a515298bbe709bccf24fe790ecdd6f72"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/validation",
-			"Rev": "5f0d8f067e3bc465077d0333e891450326a577a3"
+			"Rev": "9c0d9e23a515298bbe709bccf24fe790ecdd6f72"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/validation/field",
-			"Rev": "5f0d8f067e3bc465077d0333e891450326a577a3"
+			"Rev": "9c0d9e23a515298bbe709bccf24fe790ecdd6f72"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/wait",
-			"Rev": "5f0d8f067e3bc465077d0333e891450326a577a3"
+			"Rev": "9c0d9e23a515298bbe709bccf24fe790ecdd6f72"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/util/yaml",
-			"Rev": "5f0d8f067e3bc465077d0333e891450326a577a3"
+			"Rev": "9c0d9e23a515298bbe709bccf24fe790ecdd6f72"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/version",
-			"Rev": "5f0d8f067e3bc465077d0333e891450326a577a3"
+			"Rev": "9c0d9e23a515298bbe709bccf24fe790ecdd6f72"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/pkg/watch",
-			"Rev": "5f0d8f067e3bc465077d0333e891450326a577a3"
+			"Rev": "9c0d9e23a515298bbe709bccf24fe790ecdd6f72"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/json",
-			"Rev": "5f0d8f067e3bc465077d0333e891450326a577a3"
+			"Rev": "9c0d9e23a515298bbe709bccf24fe790ecdd6f72"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/netutil",
-			"Rev": "5f0d8f067e3bc465077d0333e891450326a577a3"
+			"Rev": "9c0d9e23a515298bbe709bccf24fe790ecdd6f72"
 		},
 		{
 			"ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect",
-			"Rev": "5f0d8f067e3bc465077d0333e891450326a577a3"
+			"Rev": "9c0d9e23a515298bbe709bccf24fe790ecdd6f72"
 		},
 		{
 			"ImportPath": "k8s.io/kube-openapi/pkg/util/proto",
diff --git a/discovery/doc.go b/discovery/doc.go
new file mode 100644
index 00000000..76495588
--- /dev/null
+++ b/discovery/doc.go
@@ -0,0 +1,19 @@
+/*
+Copyright 2018 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+// Package discovery provides ways to discover server-supported
+// API groups, versions and resources.
+package discovery
diff --git a/discovery/round_tripper.go b/discovery/round_tripper.go
index 2e352b88..a195d2a2 100644
--- a/discovery/round_tripper.go
+++ b/discovery/round_tripper.go
@@ -14,7 +14,6 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-// Package transport provides a round tripper capable of caching HTTP responses.
 package discovery
 
 import (