scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-02 03:08:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Copy deployment's annotations to its RC

Browse Source
This commit is contained in:
Janet Kuo
2016-02-01 17:34:48 -08:00
parent 5088d0e147
commit e3cb44aaff
4 changed files with 37 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -46,8 +46,8 @@ type AnnotateOptions struct {
all bool
resourceVersion string
changeCause string
recordFlag bool
changeCause string
recordChangeCause bool
f *cmdutil.Factory
out io.Writer
@@ -155,7 +155,7 @@ func (o *AnnotateOptions) Complete(f *cmdutil.Factory, out io.Writer, cmd *cobra
return err
}
o.recordFlag = cmdutil.GetRecordFlag(cmd)
o.recordChangeCause = cmdutil.GetRecordFlag(cmd)
o.changeCause = f.Command()
mapper, typer := f.Object()
@@ -207,7 +207,7 @@ func (o AnnotateOptions) RunAnnotate() error {
return err
}
// If we should record change-cause, add it to new annotations
if cmdutil.ContainsChangeCause(info) || o.recordFlag {
if cmdutil.ContainsChangeCause(info) || o.recordChangeCause {
o.newAnnotations[kubectl.ChangeCauseAnnotation] = o.changeCause
}
if err := o.updateAnnotations(obj); err != nil {