github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix kubectl annotate and label to use versioned objects when operating

pull/6/head
Maciej Szulik 2016-01-22 13:39:18 +01:00
parent 5a3dec8dad
commit 9bfa27a5bf
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/kubectl/cmd/annotate.go
View File

@ -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

6
pkg/kubectl/cmd/label.go
View File

@ -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