From 91b49ee1c8dd09039bf1f7220b98071682252b3b Mon Sep 17 00:00:00 2001 From: Felix Kunde Date: Wed, 30 Mar 2022 14:21:22 +0200 Subject: [PATCH] change delete order for patroni objects --- pkg/cluster/cluster.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/cluster/cluster.go b/pkg/cluster/cluster.go index 451e1f3e8..2a08857e3 100644 --- a/pkg/cluster/cluster.go +++ b/pkg/cluster/cluster.go @@ -43,7 +43,7 @@ var ( alphaNumericRegexp = regexp.MustCompile("^[a-zA-Z][a-zA-Z0-9]*$") databaseNameRegexp = regexp.MustCompile("^[a-zA-Z_][a-zA-Z0-9_]*$") userRegexp = regexp.MustCompile(`^[a-z0-9]([-_a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-_a-z0-9]*[a-z0-9])?)*$`) - patroniObjectSuffixes = []string{"config", "failover", "sync", "leader"} + patroniObjectSuffixes = []string{"leader", "config", "sync", "failover"} ) // Config contains operator-wide clients and configuration used from a cluster. TODO: remove struct duplication. @@ -1582,12 +1582,12 @@ func (c *Cluster) deletePatroniClusterObjects() error { c.logger.Infof("not cleaning up Etcd Patroni objects on cluster delete") } + actionsList = append(actionsList, c.deletePatroniClusterServices) if c.patroniKubernetesUseConfigMaps() { actionsList = append(actionsList, c.deletePatroniClusterConfigMaps) } else { actionsList = append(actionsList, c.deletePatroniClusterEndpoints) } - actionsList = append(actionsList, c.deletePatroniClusterServices) c.logger.Debugf("removing leftover Patroni objects (endpoints / services and configmaps)") for _, deleter := range actionsList {