public_git
/
postgres-operator
mirror of https://github.com/zalando/postgres-operator.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

remove some comments and codelines

This commit is contained in:
Felix Kunde 2021-02-03 14:55:29 +01:00
parent 4421724848
commit 965d4423f1
3 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/cluster/k8sres.go
View File

@ -1303,7 +1303,6 @@ func (c *Cluster) generateStatefulSet(spec *acidv1.PostgresSpec) (*appsv1.Statef
func (c *Cluster) generatePodAnnotations(spec *acidv1.PostgresSpec) map[string]string { func (c *Cluster) generatePodAnnotations(spec *acidv1.PostgresSpec) map[string]string {
annotations := make(map[string]string) annotations := make(map[string]string)
// TODO annotations[rollingUpdatePodAnnotationKey] = strconv.FormatBool(false)
for k, v := range c.OpConfig.CustomPodAnnotations { for k, v := range c.OpConfig.CustomPodAnnotations {
annotations[k] = v annotations[k] = v
} }

3
pkg/cluster/pod.go
View File

@ -77,12 +77,10 @@ func (c *Cluster) enableRollingUpdateFlagForPod(pod v1.Pod, msg string) error {
// on pods that do not have it yet // on pods that do not have it yet
func (c *Cluster) enableRollingUpdateFlagForPods(pods []v1.Pod, msg string) error { func (c *Cluster) enableRollingUpdateFlagForPods(pods []v1.Pod, msg string) error {
for _, pod := range pods { for _, pod := range pods {
if c.getRollingUpdateFlagFromPod(&pod, true) {
if err := c.enableRollingUpdateFlagForPod(pod, msg); err != nil { if err := c.enableRollingUpdateFlagForPod(pod, msg); err != nil {
return fmt.Errorf("enabling rolling update flag failed for pod %q: %v", pod.Name, err) return fmt.Errorf("enabling rolling update flag failed for pod %q: %v", pod.Name, err)
} }
} }
}
return nil return nil
} }
@ -485,7 +483,6 @@ func (c *Cluster) recreatePods() error {
} }
c.logger.Infof("recreating old master pod %q", util.NameFromMeta(masterPod.ObjectMeta)) c.logger.Infof("recreating old master pod %q", util.NameFromMeta(masterPod.ObjectMeta))
// TODO only if rolling update label is present
if _, err := c.recreatePod(util.NameFromMeta(masterPod.ObjectMeta)); err != nil { if _, err := c.recreatePod(util.NameFromMeta(masterPod.ObjectMeta)); err != nil {
return fmt.Errorf("could not recreate old master pod %q: %v", util.NameFromMeta(masterPod.ObjectMeta), err) return fmt.Errorf("could not recreate old master pod %q: %v", util.NameFromMeta(masterPod.ObjectMeta), err)
} }

1
pkg/cluster/resources.go
View File

@ -19,7 +19,6 @@ import (
) )
const ( const (
// TODO rollingUpdatePodAnnotationKey = "zalando-postgres-operator-rolling-update-required"
rollingUpdatePodAnnotationKey = "zalando-postgres-operator-rolling-update-required" rollingUpdatePodAnnotationKey = "zalando-postgres-operator-rolling-update-required"
) )