continue deleting secrets even if one delete fails

This commit is contained in:
Felix Kunde 2020-07-09 16:04:12 +02:00
parent 5b085a7706
commit 4feae64c28
1 changed files with 8 additions and 1 deletions

View File

@ -727,16 +727,23 @@ func (c *Cluster) deleteEndpoint(role PostgresRole) error {
func (c *Cluster) deleteSecrets() error { func (c *Cluster) deleteSecrets() error {
c.setProcessName("deleting secrets") c.setProcessName("deleting secrets")
var errors []string
errorCount := 0
for uid, secret := range c.Secrets { for uid, secret := range c.Secrets {
c.logger.Debugf("deleting secret %q", util.NameFromMeta(secret.ObjectMeta)) c.logger.Debugf("deleting secret %q", util.NameFromMeta(secret.ObjectMeta))
err := c.KubeClient.Secrets(secret.Namespace).Delete(context.TODO(), secret.Name, c.deleteOptions) err := c.KubeClient.Secrets(secret.Namespace).Delete(context.TODO(), secret.Name, c.deleteOptions)
if err != nil { if err != nil {
return err errors = append(errors, fmt.Sprintf("could not delete secret %q: %v", util.NameFromMeta(secret.ObjectMeta), err))
errorCount++
} }
c.logger.Infof("secret %q has been deleted", util.NameFromMeta(secret.ObjectMeta)) c.logger.Infof("secret %q has been deleted", util.NameFromMeta(secret.ObjectMeta))
c.Secrets[uid] = nil c.Secrets[uid] = nil
} }
if errorCount > 0 {
return fmt.Errorf("could not delete all secrets: %v", errors)
}
return nil return nil
} }