diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index 30c8e1dcd0..badde7e8a9 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -248,331 +248,331 @@ }, { "ImportPath": "k8s.io/api/admissionregistration/v1alpha1", - "Rev": "3bbb4958938a3d0be5eeffcefa72bc9c2ed4c42d" + "Rev": "5c47ba7bba38a261409b1bed080e0cc1c2dd6cc8" }, { "ImportPath": "k8s.io/api/admissionregistration/v1beta1", - "Rev": "3bbb4958938a3d0be5eeffcefa72bc9c2ed4c42d" + "Rev": "5c47ba7bba38a261409b1bed080e0cc1c2dd6cc8" }, { "ImportPath": "k8s.io/api/apps/v1", - "Rev": "3bbb4958938a3d0be5eeffcefa72bc9c2ed4c42d" + "Rev": "5c47ba7bba38a261409b1bed080e0cc1c2dd6cc8" }, { "ImportPath": "k8s.io/api/apps/v1beta1", - "Rev": "3bbb4958938a3d0be5eeffcefa72bc9c2ed4c42d" + "Rev": "5c47ba7bba38a261409b1bed080e0cc1c2dd6cc8" }, { "ImportPath": "k8s.io/api/apps/v1beta2", - "Rev": "3bbb4958938a3d0be5eeffcefa72bc9c2ed4c42d" + "Rev": "5c47ba7bba38a261409b1bed080e0cc1c2dd6cc8" }, { "ImportPath": "k8s.io/api/authentication/v1", - "Rev": "3bbb4958938a3d0be5eeffcefa72bc9c2ed4c42d" + "Rev": "5c47ba7bba38a261409b1bed080e0cc1c2dd6cc8" }, { "ImportPath": "k8s.io/api/authentication/v1beta1", - "Rev": "3bbb4958938a3d0be5eeffcefa72bc9c2ed4c42d" + "Rev": "5c47ba7bba38a261409b1bed080e0cc1c2dd6cc8" }, { "ImportPath": "k8s.io/api/authorization/v1", - "Rev": "3bbb4958938a3d0be5eeffcefa72bc9c2ed4c42d" + "Rev": "5c47ba7bba38a261409b1bed080e0cc1c2dd6cc8" }, { "ImportPath": "k8s.io/api/authorization/v1beta1", - "Rev": "3bbb4958938a3d0be5eeffcefa72bc9c2ed4c42d" + "Rev": "5c47ba7bba38a261409b1bed080e0cc1c2dd6cc8" }, { "ImportPath": "k8s.io/api/autoscaling/v1", - "Rev": "3bbb4958938a3d0be5eeffcefa72bc9c2ed4c42d" + "Rev": "5c47ba7bba38a261409b1bed080e0cc1c2dd6cc8" }, { "ImportPath": "k8s.io/api/autoscaling/v2beta1", - "Rev": "3bbb4958938a3d0be5eeffcefa72bc9c2ed4c42d" + "Rev": "5c47ba7bba38a261409b1bed080e0cc1c2dd6cc8" }, { "ImportPath": "k8s.io/api/batch/v1", - "Rev": "3bbb4958938a3d0be5eeffcefa72bc9c2ed4c42d" + "Rev": "5c47ba7bba38a261409b1bed080e0cc1c2dd6cc8" }, { "ImportPath": "k8s.io/api/batch/v1beta1", - "Rev": "3bbb4958938a3d0be5eeffcefa72bc9c2ed4c42d" + "Rev": "5c47ba7bba38a261409b1bed080e0cc1c2dd6cc8" }, { "ImportPath": "k8s.io/api/batch/v2alpha1", - "Rev": "3bbb4958938a3d0be5eeffcefa72bc9c2ed4c42d" + "Rev": "5c47ba7bba38a261409b1bed080e0cc1c2dd6cc8" }, { "ImportPath": "k8s.io/api/certificates/v1beta1", - "Rev": "3bbb4958938a3d0be5eeffcefa72bc9c2ed4c42d" + "Rev": "5c47ba7bba38a261409b1bed080e0cc1c2dd6cc8" }, { "ImportPath": "k8s.io/api/core/v1", - "Rev": "3bbb4958938a3d0be5eeffcefa72bc9c2ed4c42d" + "Rev": "5c47ba7bba38a261409b1bed080e0cc1c2dd6cc8" }, { "ImportPath": "k8s.io/api/events/v1beta1", - "Rev": "3bbb4958938a3d0be5eeffcefa72bc9c2ed4c42d" + "Rev": "5c47ba7bba38a261409b1bed080e0cc1c2dd6cc8" }, { "ImportPath": "k8s.io/api/extensions/v1beta1", - "Rev": "3bbb4958938a3d0be5eeffcefa72bc9c2ed4c42d" + "Rev": "5c47ba7bba38a261409b1bed080e0cc1c2dd6cc8" }, { "ImportPath": "k8s.io/api/imagepolicy/v1alpha1", - "Rev": "3bbb4958938a3d0be5eeffcefa72bc9c2ed4c42d" + "Rev": "5c47ba7bba38a261409b1bed080e0cc1c2dd6cc8" }, { "ImportPath": "k8s.io/api/networking/v1", - "Rev": "3bbb4958938a3d0be5eeffcefa72bc9c2ed4c42d" + "Rev": "5c47ba7bba38a261409b1bed080e0cc1c2dd6cc8" }, { "ImportPath": "k8s.io/api/policy/v1beta1", - "Rev": "3bbb4958938a3d0be5eeffcefa72bc9c2ed4c42d" + "Rev": "5c47ba7bba38a261409b1bed080e0cc1c2dd6cc8" }, { "ImportPath": "k8s.io/api/rbac/v1", - "Rev": "3bbb4958938a3d0be5eeffcefa72bc9c2ed4c42d" + "Rev": "5c47ba7bba38a261409b1bed080e0cc1c2dd6cc8" }, { "ImportPath": "k8s.io/api/rbac/v1alpha1", - "Rev": "3bbb4958938a3d0be5eeffcefa72bc9c2ed4c42d" + "Rev": "5c47ba7bba38a261409b1bed080e0cc1c2dd6cc8" }, { "ImportPath": "k8s.io/api/rbac/v1beta1", - "Rev": "3bbb4958938a3d0be5eeffcefa72bc9c2ed4c42d" + "Rev": "5c47ba7bba38a261409b1bed080e0cc1c2dd6cc8" }, { "ImportPath": "k8s.io/api/scheduling/v1alpha1", - "Rev": "3bbb4958938a3d0be5eeffcefa72bc9c2ed4c42d" + "Rev": "5c47ba7bba38a261409b1bed080e0cc1c2dd6cc8" }, { "ImportPath": "k8s.io/api/settings/v1alpha1", - "Rev": "3bbb4958938a3d0be5eeffcefa72bc9c2ed4c42d" + "Rev": "5c47ba7bba38a261409b1bed080e0cc1c2dd6cc8" }, { "ImportPath": "k8s.io/api/storage/v1", - "Rev": "3bbb4958938a3d0be5eeffcefa72bc9c2ed4c42d" + "Rev": "5c47ba7bba38a261409b1bed080e0cc1c2dd6cc8" }, { "ImportPath": "k8s.io/api/storage/v1alpha1", - "Rev": "3bbb4958938a3d0be5eeffcefa72bc9c2ed4c42d" + "Rev": "5c47ba7bba38a261409b1bed080e0cc1c2dd6cc8" }, { "ImportPath": "k8s.io/api/storage/v1beta1", - "Rev": "3bbb4958938a3d0be5eeffcefa72bc9c2ed4c42d" + "Rev": "5c47ba7bba38a261409b1bed080e0cc1c2dd6cc8" }, { "ImportPath": "k8s.io/apimachinery/pkg/api/equality", - "Rev": "3bbb4958938a3d0be5eeffcefa72bc9c2ed4c42d" + "Rev": "5c47ba7bba38a261409b1bed080e0cc1c2dd6cc8" }, { "ImportPath": "k8s.io/apimachinery/pkg/api/errors", - "Rev": "3bbb4958938a3d0be5eeffcefa72bc9c2ed4c42d" + "Rev": "5c47ba7bba38a261409b1bed080e0cc1c2dd6cc8" }, { "ImportPath": "k8s.io/apimachinery/pkg/api/meta", - "Rev": "3bbb4958938a3d0be5eeffcefa72bc9c2ed4c42d" + "Rev": "5c47ba7bba38a261409b1bed080e0cc1c2dd6cc8" }, { "ImportPath": "k8s.io/apimachinery/pkg/api/resource", - "Rev": "3bbb4958938a3d0be5eeffcefa72bc9c2ed4c42d" + "Rev": "5c47ba7bba38a261409b1bed080e0cc1c2dd6cc8" }, { "ImportPath": "k8s.io/apimachinery/pkg/api/testing", - "Rev": "3bbb4958938a3d0be5eeffcefa72bc9c2ed4c42d" + "Rev": "5c47ba7bba38a261409b1bed080e0cc1c2dd6cc8" }, { "ImportPath": "k8s.io/apimachinery/pkg/api/testing/fuzzer", - "Rev": "3bbb4958938a3d0be5eeffcefa72bc9c2ed4c42d" + "Rev": "5c47ba7bba38a261409b1bed080e0cc1c2dd6cc8" }, { "ImportPath": "k8s.io/apimachinery/pkg/api/testing/roundtrip", - "Rev": "3bbb4958938a3d0be5eeffcefa72bc9c2ed4c42d" + "Rev": "5c47ba7bba38a261409b1bed080e0cc1c2dd6cc8" }, { "ImportPath": "k8s.io/apimachinery/pkg/apimachinery", - "Rev": "3bbb4958938a3d0be5eeffcefa72bc9c2ed4c42d" + "Rev": "5c47ba7bba38a261409b1bed080e0cc1c2dd6cc8" }, { "ImportPath": "k8s.io/apimachinery/pkg/apimachinery/announced", - "Rev": "3bbb4958938a3d0be5eeffcefa72bc9c2ed4c42d" + "Rev": "5c47ba7bba38a261409b1bed080e0cc1c2dd6cc8" }, { "ImportPath": "k8s.io/apimachinery/pkg/apimachinery/registered", - "Rev": "3bbb4958938a3d0be5eeffcefa72bc9c2ed4c42d" + "Rev": "5c47ba7bba38a261409b1bed080e0cc1c2dd6cc8" }, { "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/fuzzer", - "Rev": "3bbb4958938a3d0be5eeffcefa72bc9c2ed4c42d" + "Rev": "5c47ba7bba38a261409b1bed080e0cc1c2dd6cc8" }, { "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/internalversion", - "Rev": "3bbb4958938a3d0be5eeffcefa72bc9c2ed4c42d" + "Rev": "5c47ba7bba38a261409b1bed080e0cc1c2dd6cc8" }, { "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1", - "Rev": "3bbb4958938a3d0be5eeffcefa72bc9c2ed4c42d" + "Rev": "5c47ba7bba38a261409b1bed080e0cc1c2dd6cc8" }, { "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured", - "Rev": "3bbb4958938a3d0be5eeffcefa72bc9c2ed4c42d" + "Rev": "5c47ba7bba38a261409b1bed080e0cc1c2dd6cc8" }, { "ImportPath": "k8s.io/apimachinery/pkg/apis/meta/v1beta1", - "Rev": "3bbb4958938a3d0be5eeffcefa72bc9c2ed4c42d" + "Rev": "5c47ba7bba38a261409b1bed080e0cc1c2dd6cc8" }, { "ImportPath": "k8s.io/apimachinery/pkg/conversion", - "Rev": "3bbb4958938a3d0be5eeffcefa72bc9c2ed4c42d" + "Rev": "5c47ba7bba38a261409b1bed080e0cc1c2dd6cc8" }, { "ImportPath": "k8s.io/apimachinery/pkg/conversion/queryparams", - "Rev": "3bbb4958938a3d0be5eeffcefa72bc9c2ed4c42d" + "Rev": "5c47ba7bba38a261409b1bed080e0cc1c2dd6cc8" }, { "ImportPath": "k8s.io/apimachinery/pkg/fields", - "Rev": "3bbb4958938a3d0be5eeffcefa72bc9c2ed4c42d" + "Rev": "5c47ba7bba38a261409b1bed080e0cc1c2dd6cc8" }, { "ImportPath": "k8s.io/apimachinery/pkg/labels", - "Rev": "3bbb4958938a3d0be5eeffcefa72bc9c2ed4c42d" + "Rev": "5c47ba7bba38a261409b1bed080e0cc1c2dd6cc8" }, { "ImportPath": "k8s.io/apimachinery/pkg/runtime", - "Rev": "3bbb4958938a3d0be5eeffcefa72bc9c2ed4c42d" + "Rev": "5c47ba7bba38a261409b1bed080e0cc1c2dd6cc8" }, { "ImportPath": "k8s.io/apimachinery/pkg/runtime/schema", - "Rev": "3bbb4958938a3d0be5eeffcefa72bc9c2ed4c42d" + "Rev": "5c47ba7bba38a261409b1bed080e0cc1c2dd6cc8" }, { "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer", - "Rev": "3bbb4958938a3d0be5eeffcefa72bc9c2ed4c42d" + "Rev": "5c47ba7bba38a261409b1bed080e0cc1c2dd6cc8" }, { "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/json", - "Rev": "3bbb4958938a3d0be5eeffcefa72bc9c2ed4c42d" + "Rev": "5c47ba7bba38a261409b1bed080e0cc1c2dd6cc8" }, { "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/protobuf", - "Rev": "3bbb4958938a3d0be5eeffcefa72bc9c2ed4c42d" + "Rev": "5c47ba7bba38a261409b1bed080e0cc1c2dd6cc8" }, { "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/recognizer", - "Rev": "3bbb4958938a3d0be5eeffcefa72bc9c2ed4c42d" + "Rev": "5c47ba7bba38a261409b1bed080e0cc1c2dd6cc8" }, { "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/streaming", - "Rev": "3bbb4958938a3d0be5eeffcefa72bc9c2ed4c42d" + "Rev": "5c47ba7bba38a261409b1bed080e0cc1c2dd6cc8" }, { "ImportPath": "k8s.io/apimachinery/pkg/runtime/serializer/versioning", - "Rev": "3bbb4958938a3d0be5eeffcefa72bc9c2ed4c42d" + "Rev": "5c47ba7bba38a261409b1bed080e0cc1c2dd6cc8" }, { "ImportPath": "k8s.io/apimachinery/pkg/selection", - "Rev": "3bbb4958938a3d0be5eeffcefa72bc9c2ed4c42d" + "Rev": "5c47ba7bba38a261409b1bed080e0cc1c2dd6cc8" }, { "ImportPath": "k8s.io/apimachinery/pkg/types", - "Rev": "3bbb4958938a3d0be5eeffcefa72bc9c2ed4c42d" + "Rev": "5c47ba7bba38a261409b1bed080e0cc1c2dd6cc8" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/cache", - "Rev": "3bbb4958938a3d0be5eeffcefa72bc9c2ed4c42d" + "Rev": "5c47ba7bba38a261409b1bed080e0cc1c2dd6cc8" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/clock", - "Rev": "3bbb4958938a3d0be5eeffcefa72bc9c2ed4c42d" + "Rev": "5c47ba7bba38a261409b1bed080e0cc1c2dd6cc8" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/diff", - "Rev": "3bbb4958938a3d0be5eeffcefa72bc9c2ed4c42d" + "Rev": "5c47ba7bba38a261409b1bed080e0cc1c2dd6cc8" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/errors", - "Rev": "3bbb4958938a3d0be5eeffcefa72bc9c2ed4c42d" + "Rev": "5c47ba7bba38a261409b1bed080e0cc1c2dd6cc8" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/framer", - "Rev": "3bbb4958938a3d0be5eeffcefa72bc9c2ed4c42d" + "Rev": "5c47ba7bba38a261409b1bed080e0cc1c2dd6cc8" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/httpstream", - "Rev": "3bbb4958938a3d0be5eeffcefa72bc9c2ed4c42d" + "Rev": "5c47ba7bba38a261409b1bed080e0cc1c2dd6cc8" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/httpstream/spdy", - "Rev": "3bbb4958938a3d0be5eeffcefa72bc9c2ed4c42d" + "Rev": "5c47ba7bba38a261409b1bed080e0cc1c2dd6cc8" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/intstr", - "Rev": "3bbb4958938a3d0be5eeffcefa72bc9c2ed4c42d" + "Rev": "5c47ba7bba38a261409b1bed080e0cc1c2dd6cc8" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/json", - "Rev": "3bbb4958938a3d0be5eeffcefa72bc9c2ed4c42d" + "Rev": "5c47ba7bba38a261409b1bed080e0cc1c2dd6cc8" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/mergepatch", - "Rev": "3bbb4958938a3d0be5eeffcefa72bc9c2ed4c42d" + "Rev": "5c47ba7bba38a261409b1bed080e0cc1c2dd6cc8" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/net", - "Rev": "3bbb4958938a3d0be5eeffcefa72bc9c2ed4c42d" + "Rev": "5c47ba7bba38a261409b1bed080e0cc1c2dd6cc8" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/remotecommand", - "Rev": "3bbb4958938a3d0be5eeffcefa72bc9c2ed4c42d" + "Rev": "5c47ba7bba38a261409b1bed080e0cc1c2dd6cc8" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/runtime", - "Rev": "3bbb4958938a3d0be5eeffcefa72bc9c2ed4c42d" + "Rev": "5c47ba7bba38a261409b1bed080e0cc1c2dd6cc8" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/sets", - "Rev": "3bbb4958938a3d0be5eeffcefa72bc9c2ed4c42d" + "Rev": "5c47ba7bba38a261409b1bed080e0cc1c2dd6cc8" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/strategicpatch", - "Rev": "3bbb4958938a3d0be5eeffcefa72bc9c2ed4c42d" + "Rev": "5c47ba7bba38a261409b1bed080e0cc1c2dd6cc8" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/validation", - "Rev": "3bbb4958938a3d0be5eeffcefa72bc9c2ed4c42d" + "Rev": "5c47ba7bba38a261409b1bed080e0cc1c2dd6cc8" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/validation/field", - "Rev": "3bbb4958938a3d0be5eeffcefa72bc9c2ed4c42d" + "Rev": "5c47ba7bba38a261409b1bed080e0cc1c2dd6cc8" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/wait", - "Rev": "3bbb4958938a3d0be5eeffcefa72bc9c2ed4c42d" + "Rev": "5c47ba7bba38a261409b1bed080e0cc1c2dd6cc8" }, { "ImportPath": "k8s.io/apimachinery/pkg/util/yaml", - "Rev": "3bbb4958938a3d0be5eeffcefa72bc9c2ed4c42d" + "Rev": "5c47ba7bba38a261409b1bed080e0cc1c2dd6cc8" }, { "ImportPath": "k8s.io/apimachinery/pkg/version", - "Rev": "3bbb4958938a3d0be5eeffcefa72bc9c2ed4c42d" + "Rev": "5c47ba7bba38a261409b1bed080e0cc1c2dd6cc8" }, { "ImportPath": "k8s.io/apimachinery/pkg/watch", - "Rev": "3bbb4958938a3d0be5eeffcefa72bc9c2ed4c42d" + "Rev": "5c47ba7bba38a261409b1bed080e0cc1c2dd6cc8" }, { "ImportPath": "k8s.io/apimachinery/third_party/forked/golang/json", - "Rev": "3bbb4958938a3d0be5eeffcefa72bc9c2ed4c42d" + "Rev": "5c47ba7bba38a261409b1bed080e0cc1c2dd6cc8" }, { "ImportPath": "k8s.io/apimachinery/third_party/forked/golang/netutil", - "Rev": "3bbb4958938a3d0be5eeffcefa72bc9c2ed4c42d" + "Rev": "5c47ba7bba38a261409b1bed080e0cc1c2dd6cc8" }, { "ImportPath": "k8s.io/apimachinery/third_party/forked/golang/reflect", - "Rev": "3bbb4958938a3d0be5eeffcefa72bc9c2ed4c42d" + "Rev": "5c47ba7bba38a261409b1bed080e0cc1c2dd6cc8" }, { "ImportPath": "k8s.io/kube-openapi/pkg/util/proto", diff --git a/dynamic/client.go b/dynamic/client.go index b93a0ff195..833e43537b 100644 --- a/dynamic/client.go +++ b/dynamic/client.go @@ -280,6 +280,7 @@ func (rc *ResourceClient) Watch(opts metav1.ListOptions) (watch.Interface, error Watch() } +// Patch applies the patch and returns the patched resource. func (rc *ResourceClient) Patch(name string, pt types.PatchType, data []byte) (*unstructured.Unstructured, error) { result := new(unstructured.Unstructured) resourceName, subresourceName := rc.parseResourceSubresourceName() diff --git a/scale/client_test.go b/scale/client_test.go index f4f2af3d68..6301320f3c 100644 --- a/scale/client_test.go +++ b/scale/client_test.go @@ -99,7 +99,7 @@ func fakeScaleClient(t *testing.T) (ScalesGetter, []schema.GroupResource) { restMapperRes, err := discovery.GetAPIGroupResources(fakeDiscoveryClient) if err != nil { - t.Fatalf("unexpected error while constructing resource list from fake discovery client: %v") + t.Fatalf("unexpected error while constructing resource list from fake discovery client: %v", err) } restMapper := discovery.NewRESTMapper(restMapperRes, apimeta.InterfacesForUnstructured)