github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Copy annotations from StatefulSet to ControllerRevisions it owns

Browse Source
This commit is contained in:
Yinan Li
2017-08-07 11:15:09 -07:00
parent fddc7f3e50
commit 89fd3b0ebd
2 changed files with 24 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/controller/statefulset/stateful_set_utils.go
View File

@@ -311,11 +311,21 @@ func newRevision(set *apps.StatefulSet, revision int64) (*apps.ControllerRevisio
if err != nil {
return nil, err
}
return history.NewControllerRevision(set,
cr, err := history.NewControllerRevision(set,
controllerKind,
selector,
runtime.RawExtension{Raw: patch},
revision)
if err != nil {
return nil, err
}
if cr.ObjectMeta.Annotations == nil {
cr.ObjectMeta.Annotations = make(map[string]string)
}
for key, value := range set.Annotations {
cr.ObjectMeta.Annotations[key] = value
}
return cr, nil
}
// applyRevision returns a new StatefulSet constructed by restoring the state in revision to set. If the returned error