when kubernetes_use_configmaps -> skip further endpoints actions even delete (zalando#921)

ReSearchITEng · FxKu · web-flow · commit 5014eebfb226 · 2020-04-16T16:47:59.000+02:00
* further compatibility with k8sUseConfigMaps - skip further endpoints related actions

* Update pkg/cluster/cluster.go

thanks!

Co-Authored-By: Felix Kunde &lt;felix-kunde@gmx.de&gt;

* Update pkg/cluster/cluster.go

Co-Authored-By: Felix Kunde &lt;felix-kunde@gmx.de&gt;

* Update pkg/cluster/cluster.go

Co-authored-by: Felix Kunde &lt;felix-kunde@gmx.de&gt;
diff --git a/pkg/cluster/cluster.go b/pkg/cluster/cluster.go
@@ -784,8 +784,10 @@ func (c *Cluster) Delete() {
 
 	for _, role := range []PostgresRole{Master, Replica} {
 
-		if err := c.deleteEndpoint(role); err != nil {
-			c.logger.Warningf("could not delete %s endpoint: %v", role, err)
+		if !c.patroniKubernetesUseConfigMaps() {
+			if err := c.deleteEndpoint(role); err != nil {
+				c.logger.Warningf("could not delete %s endpoint: %v", role, err)
+			}
 		}
 
 		if err := c.deleteService(role); err != nil {
@@ -1161,11 +1163,19 @@ type clusterObjectDelete func(name string) error
 
 func (c *Cluster) deletePatroniClusterObjects() error {
 	// TODO: figure out how to remove leftover patroni objects in other cases
+	var actionsList []simpleActionWithResult
+
 	if !c.patroniUsesKubernetes() {
 		c.logger.Infof("not cleaning up Etcd Patroni objects on cluster delete")
 	}
-	c.logger.Debugf("removing leftover Patroni objects (endpoints, services and configmaps)")
-	for _, deleter := range []simpleActionWithResult{c.deletePatroniClusterEndpoints, c.deletePatroniClusterServices, c.deletePatroniClusterConfigMaps} {
+
+	if !c.patroniKubernetesUseConfigMaps() {
+		actionsList = append(actionsList, c.deletePatroniClusterEndpoints)
+	}
+	actionsList = append(actionsList, c.deletePatroniClusterServices, c.deletePatroniClusterConfigMaps)
+
+	c.logger.Debugf("removing leftover Patroni objects (endpoints / services and configmaps)")
+	for _, deleter := range actionsList {
 		if err := deleter(); err != nil {
 			return err
 		}
diff --git a/pkg/cluster/sync.go b/pkg/cluster/sync.go
@@ -122,10 +122,11 @@ func (c *Cluster) syncServices() error {
 	for _, role := range []PostgresRole{Master, Replica} {
 		c.logger.Debugf("syncing %s service", role)
 
-		if err := c.syncEndpoint(role); err != nil {
-			return fmt.Errorf("could not sync %s endpoint: %v", role, err)
+		if !c.patroniKubernetesUseConfigMaps() {
+			if err := c.syncEndpoint(role); err != nil {
+				return fmt.Errorf("could not sync %s endpoint: %v", role, err)
+			}
 		}
-
 		if err := c.syncService(role); err != nil {
 			return fmt.Errorf("could not sync %s service: %v", role, err)
 		}

Original file line number	Diff line number	Diff line change
`@@ -122,10 +122,11 @@ func (c *Cluster) syncServices() error {`
`122`	`122`	`for _, role := range []PostgresRole{Master, Replica} {`
`123`	`123`	`c.logger.Debugf("syncing %s service", role)`
`124`	`124`
`125`		`- if err := c.syncEndpoint(role); err != nil {`
`126`		`- return fmt.Errorf("could not sync %s endpoint: %v", role, err)`
	`125`	`+ if !c.patroniKubernetesUseConfigMaps() {`
	`126`	`+ if err := c.syncEndpoint(role); err != nil {`
	`127`	`+ return fmt.Errorf("could not sync %s endpoint: %v", role, err)`
	`128`	`+ }`
`127`	`129`	`}`
`128`		`-`
`129`	`130`	`if err := c.syncService(role); err != nil {`
`130`	`131`	`return fmt.Errorf("could not sync %s service: %v", role, err)`
`131`	`132`	`}`