public_git/postgres-operator
1
0
Fork 0
mirror of https://github.com/zalando/postgres-operator.git synced 2026-10-03 14:45:01 +02:00
Code Issues Projects Releases Wiki Activity

do not block delete because of emtpy child resources (#2538)

Browse Source
This commit is contained in:
Felix Kunde
2024-02-15 14:52:52 +01:00
committed by GitHub
parent 3d9d0258f0
commit c1bfc2c2c0
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/cluster/resources.go
+6 -3
View File
@@ -243,7 +243,8 @@ func (c *Cluster) deleteStatefulSet() error {
c.setProcessName("deleting statefulset") c.setProcessName("deleting statefulset")
c.logger.Debugln("deleting statefulset") c.logger.Debugln("deleting statefulset")
if c.Statefulset == nil { if c.Statefulset == nil {
return fmt.Errorf("there is no statefulset in the cluster") c.logger.Debug("there is no statefulset in the cluster")
return nil
} }
err := c.KubeClient.StatefulSets(c.Statefulset.Namespace).Delete(context.TODO(), c.Statefulset.Name, c.deleteOptions) err := c.KubeClient.StatefulSets(c.Statefulset.Namespace).Delete(context.TODO(), c.Statefulset.Name, c.deleteOptions)
@@ -447,7 +448,8 @@ func (c *Cluster) updatePodDisruptionBudget(pdb *policyv1.PodDisruptionBudget) e
func (c *Cluster) deletePodDisruptionBudget() error { func (c *Cluster) deletePodDisruptionBudget() error {
c.logger.Debug("deleting pod disruption budget") c.logger.Debug("deleting pod disruption budget")
if c.PodDisruptionBudget == nil { if c.PodDisruptionBudget == nil {
return fmt.Errorf("there is no pod disruption budget in the cluster") c.logger.Debug("there is no pod disruption budget in the cluster")
return nil
} }
pdbName := util.NameFromMeta(c.PodDisruptionBudget.ObjectMeta) pdbName := util.NameFromMeta(c.PodDisruptionBudget.ObjectMeta)
@@ -485,7 +487,8 @@ func (c *Cluster) deleteEndpoint(role PostgresRole) error {
c.setProcessName("deleting endpoint") c.setProcessName("deleting endpoint")
c.logger.Debugln("deleting endpoint") c.logger.Debugln("deleting endpoint")
if c.Endpoints[role] == nil { if c.Endpoints[role] == nil {
return fmt.Errorf("there is no %s endpoint in the cluster", role) c.logger.Debugf("there is no %s endpoint in the cluster", role)
return nil
} }
if err := c.KubeClient.Endpoints(c.Endpoints[role].Namespace).Delete(context.TODO(), c.Endpoints[role].Name, c.deleteOptions); err != nil { if err := c.KubeClient.Endpoints(c.Endpoints[role].Namespace).Delete(context.TODO(), c.Endpoints[role].Name, c.deleteOptions); err != nil {