Commit 08b22751 authored by jackgr's avatar jackgr

Update annotation only if apply already called.

parent a702d5f2
...@@ -163,16 +163,25 @@ func GetModifiedConfiguration(info *resource.Info, annotate bool) ([]byte, error ...@@ -163,16 +163,25 @@ func GetModifiedConfiguration(info *resource.Info, annotate bool) ([]byte, error
return modified, nil return modified, nil
} }
// If the last applied configuration annotation is already present, then
// UpdateApplyAnnotation gets the modified configuration of the object, // UpdateApplyAnnotation gets the modified configuration of the object,
// without embedding it again, and then sets it on the object as the annotation. // without embedding it again, and then sets it on the object as the annotation.
// Otherwise, it does nothing.
func UpdateApplyAnnotation(info *resource.Info) error { func UpdateApplyAnnotation(info *resource.Info) error {
modified, err := GetModifiedConfiguration(info, false) original, err := GetOriginalConfiguration(info)
if err != nil { if err != nil {
return err return err
} }
if err := SetOriginalConfiguration(info, modified); err != nil { if len(original) > 0 {
return err modified, err := GetModifiedConfiguration(info, false)
if err != nil {
return err
}
if err := SetOriginalConfiguration(info, modified); err != nil {
return err
}
} }
return nil return nil
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment