Skip to content

Commit 1f4267e

Browse files
stangsdudoladov
authored andcommitted
fix: remove headless service config when deleting cluster (zalando#567)
see: zalando#566 Signed-off-by: Stephane Tang <[email protected]>
1 parent f3e1e80 commit 1f4267e

File tree

1 file changed

+15
-2
lines changed

1 file changed

+15
-2
lines changed

pkg/cluster/cluster.go

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1004,8 +1004,8 @@ func (c *Cluster) deletePatroniClusterObjects() error {
10041004
if !c.patroniUsesKubernetes() {
10051005
c.logger.Infof("not cleaning up Etcd Patroni objects on cluster delete")
10061006
}
1007-
c.logger.Debugf("removing leftover Patroni objects (endpoints or configmaps)")
1008-
for _, deleter := range []simpleActionWithResult{c.deletePatroniClusterEndpoints, c.deletePatroniClusterConfigMaps} {
1007+
c.logger.Debugf("removing leftover Patroni objects (endpoints, services and configmaps)")
1008+
for _, deleter := range []simpleActionWithResult{c.deletePatroniClusterEndpoints, c.deletePatroniClusterServices, c.deletePatroniClusterConfigMaps} {
10091009
if err := deleter(); err != nil {
10101010
return err
10111011
}
@@ -1037,6 +1037,19 @@ func (c *Cluster) deleteClusterObject(
10371037
return nil
10381038
}
10391039

1040+
func (c *Cluster) deletePatroniClusterServices() error {
1041+
get := func(name string) (spec.NamespacedName, error) {
1042+
svc, err := c.KubeClient.Services(c.Namespace).Get(name, metav1.GetOptions{})
1043+
return util.NameFromMeta(svc.ObjectMeta), err
1044+
}
1045+
1046+
deleteServiceFn := func(name string) error {
1047+
return c.KubeClient.Services(c.Namespace).Delete(name, c.deleteOptions)
1048+
}
1049+
1050+
return c.deleteClusterObject(get, deleteServiceFn, "service")
1051+
}
1052+
10401053
func (c *Cluster) deletePatroniClusterEndpoints() error {
10411054
get := func(name string) (spec.NamespacedName, error) {
10421055
ep, err := c.KubeClient.Endpoints(c.Namespace).Get(name, metav1.GetOptions{})

0 commit comments

Comments
 (0)