update InterfacesFor to use GroupVersion

2015-12-08 13:27:26 -05:00
parent 8535f13a2b
commit ec87d74ecb
17 changed files with 50 additions and 44 deletions
--- a/pkg/kubectl/cmd/util/helpers.go
+++ b/pkg/kubectl/cmd/util/helpers.go
@@ -376,7 +376,12 @@ func Merge(dst runtime.Object, fragment, kind string) (runtime.Object, error) {
 	if !ok {
 		return nil, fmt.Errorf("apiVersion must be a string")
 	}
-	i, err := latest.GroupOrDie("").InterfacesFor(versionString)
+	groupVersion, err := unversioned.ParseGroupVersion(versionString)
+	if err != nil {
+		return nil, err
+	}
+
+	i, err := latest.GroupOrDie("").InterfacesFor(groupVersion)
 	if err != nil {
 		return nil, err
 	}