public_git/postgres-operator
1
0
Fork 0
mirror of https://github.com/zalando/postgres-operator.git synced 2026-10-09 06:25:40 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'rolling_updates_with_statefulset_annotations' of github.com:zalando-incubator/postgres-operator into rolling_updates_with_statefulset_annotations

Browse Source
This commit is contained in:
Oleksii Kliukin
2018-05-07 10:16:30 +02:00
parent ce0d4af91c 1a20362c5b
commit f41a42f922
3 changed files with 21 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/cluster/resources.go
+5 -2
View File
@@ -189,10 +189,13 @@ func (c *Cluster) updateStatefulSet(newStatefulSet *v1beta1.StatefulSet, include
return fmt.Errorf("could not patch statefulset spec %q: %v", statefulSetName, err)
}
if includeAnnotations && newStatefulSet.Annotations != nil {
patchData := metadataAnnotationsPatch(newStatefulSet.Annotations)
c.logger.Debugf("updating statefulset annotations")
if patchData, err = metaPatch(newStatefulSet.ObjectMeta); err != nil {
return fmt.Errorf("could not form patch for the stetefulset metadata: %v", err)
}
statefulSet, err = c.KubeClient.StatefulSets(c.Statefulset.Namespace).Patch(
c.Statefulset.Name,
types.StrategicMergePatchType,
types.MergePatchType,
[]byte(patchData), "")
if err != nil {
return fmt.Errorf("could not patch statefulset annotations %q: %v", patchData, err)