From 99a37124229beeb9d48251036b2fec6c4bf1c363 Mon Sep 17 00:00:00 2001 From: Sergey Dudoladov Date: Wed, 3 Apr 2019 12:19:09 +0200 Subject: [PATCH] Delete the cron job on cluster deletion --- pkg/cluster/cluster.go | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/pkg/cluster/cluster.go b/pkg/cluster/cluster.go index 7339e0bbc..dd77abaa0 100644 --- a/pkg/cluster/cluster.go +++ b/pkg/cluster/cluster.go @@ -637,6 +637,11 @@ func (c *Cluster) Delete() { if err := c.deletePatroniClusterObjects(); err != nil { c.logger.Warningf("could not remove leftover patroni objects; %v", err) } + + if err := c.deleteLogicalBackupJob(); err != nil { + c.logger.Warningf("could not remove the logical backup k8s cron job; %v", err) + } + } //NeedsRepair returns true if the cluster should be included in the repair scan (based on its in-memory status). @@ -1016,3 +1021,14 @@ func (c *Cluster) deletePatroniClusterConfigMaps() error { return c.deleteClusterObject(get, deleteConfigMapFn, "configmap") } + +func (c *Cluster) deleteLogicalBackupJob() error { + + if c.logicalBackupJob == nil { + return nil + } + + c.logger.Debugf("removing the logical backup job") + + return c.KubeClient.CronJobsGetter.CronJobs(c.Namespace).Delete(c.logicalBackupJob.ObjectMeta.Name, c.deleteOptions) +}