Fix kubectl annotate and label to use versioned objects when operating

2016-01-22 13:39:18 +01:00
parent 5a3dec8dad
commit 9bfa27a5bf
2 changed files with 10 additions and 2 deletions
--- a/pkg/kubectl/cmd/annotate.go
+++ b/pkg/kubectl/cmd/annotate.go
@@ -201,7 +201,11 @@ func (o AnnotateOptions) RunAnnotate() error {
 			return err
 		}

-		name, namespace, obj := info.Name, info.Namespace, info.Object
+		obj, err := info.Mapping.ConvertToVersion(info.Object, info.Mapping.GroupVersionKind.GroupVersion().String())
+		if err != nil {
+			return err
+		}
+		name, namespace := info.Name, info.Namespace
 		oldData, err := json.Marshal(obj)
 		if err != nil {
 			return err