github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 14:07:14 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #19988 from soltysh/annotate_cmd

Browse Source 
Fix kubectl annotate and label to use versioned objects when operating
This commit is contained in:
Fabio Yeon 2016-02-26 15:38:26 -08:00
commit a4c9a7c4c0
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 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) oldData, err := json.Marshal(obj)
if err != nil { if err != nil {
return err 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 outputObj = info.Object
} else { } 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) oldData, err := json.Marshal(obj)
if err != nil { if err != nil {
return err return err