Fix Restic (#159)

stashed · Aug 29, 2017 · 42e52e4 · 42e52e4
1 parent 9f04a97
commit 42e52e4
Show file tree

Hide file tree

Showing 34 changed files with 2,077 additions and 282 deletions.
diff --git a/client/clientset/codec.go b/client/clientset/codec.go
@@ -125,10 +125,6 @@ func (*extendedCodec) DecodeParameters(parameters url.Values, from schema.GroupV
 	if len(parameters) == 0 {
 		return nil
 	}
-	_, okDelete := into.(*metav1.DeleteOptions)
-	if _, okList := into.(*metav1.ListOptions); okList || okDelete {
-		from = schema.GroupVersion{Version: "v1"}
-	}
 	return runtime.NewParameterCodec(api.Scheme).DecodeParameters(parameters, from, into)
 }
 
@@ -139,10 +135,6 @@ func (c *extendedCodec) EncodeParameters(obj runtime.Object, to schema.GroupVers
 	if obj == nil {
 		return result, nil
 	}
-	_, okDelete := obj.(*metav1.DeleteOptions)
-	if _, okList := obj.(*metav1.ListOptions); okList || okDelete {
-		to = schema.GroupVersion{Version: "v1"}
-	}
 	return runtime.NewParameterCodec(api.Scheme).EncodeParameters(obj, to)
 }
 

diff --git a/glide.lock b/glide.lock
diff --git a/glide.yaml b/glide.yaml
@@ -34,3 +34,5 @@ import:
 testImport:
 - package: github.com/stretchr/testify
   version: v1.1.4
+- package: github.com/appscode/kutil
+  version: release-4.0
diff --git a/...or/github.com/mattbaird/jsonpatch/LICENSE → vendor/github.com/appscode/jsonpatch/LICENSE b/...or/github.com/mattbaird/jsonpatch/LICENSE → vendor/github.com/appscode/jsonpatch/LICENSE
diff --git a/...thub.com/mattbaird/jsonpatch/jsonpatch.go → ...ithub.com/appscode/jsonpatch/jsonpatch.go b/...thub.com/mattbaird/jsonpatch/jsonpatch.go → ...ithub.com/appscode/jsonpatch/jsonpatch.go
diff --git a/...thub.com/appscode/kutil/deployment_app.go → ...appscode/kutil/apps/v1beta1/deployment.go b/...thub.com/appscode/kutil/deployment_app.go → ...appscode/kutil/apps/v1beta1/deployment.go