From 9bfa27a5bfb9739c7d66ce79f67920c3b5791f83 Mon Sep 17 00:00:00 2001
From: Maciej Szulik <maszulik@redhat.com>
Date: Fri, 22 Jan 2016 13:39:18 +0100
Subject: [PATCH] Fix kubectl annotate and label to use versioned objects when
 operating

---
 pkg/kubectl/cmd/annotate.go | 6 +++++-
 pkg/kubectl/cmd/label.go    | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/pkg/kubectl/cmd/annotate.go b/pkg/kubectl/cmd/annotate.go
index daebf57d1f6..466083b9054 100644
--- 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
diff --git a/pkg/kubectl/cmd/label.go b/pkg/kubectl/cmd/label.go
index 39c401d5204..3290b7f2787 100644
--- a/pkg/kubectl/cmd/label.go
+++ b/pkg/kubectl/cmd/label.go
@@ -238,7 +238,11 @@ func RunLabel(f *cmdutil.Factory, out io.Writer, cmd *cobra.Command, args []stri
 			}
 			outputObj = info.Object
 		} else {
-			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