public_git
/
postgres-operator
mirror of https://github.com/zalando/postgres-operator.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

delete secrets the right way

This commit is contained in:
Felix Kunde 2020-07-09 13:43:38 +02:00
parent c10d30903e
commit dd5f92d128
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/cluster/cluster.go
View File

@ -797,10 +797,8 @@ func (c *Cluster) Delete() {
c.logger.Warningf("could not delete statefulset: %v", err)
}
for _, obj := range c.Secrets {
if err := c.deleteSecret(obj); err != nil {
c.logger.Warningf("could not delete secret: %v", err)
}
if err := c.deleteSecrets(); err != nil {
c.logger.Warningf("could not delete secrets: %v", err)
}
if err := c.deletePodDisruptionBudget(); err != nil {

16
pkg/cluster/resources.go
View File

@ -725,7 +725,19 @@ func (c *Cluster) deleteEndpoint(role PostgresRole) error {
return nil
}
func (c *Cluster) deleteSecret(secret *v1.Secret) error {
func (c *Cluster) deleteSecrets() error {
c.setProcessName("deleting secrets")
for uid := range c.Secrets {
if err := c.deleteSecret(uid); err != nil {
return err
}
}
return nil
}
func (c *Cluster) deleteSecret(uid types.UID) error {
secret := c.Secrets[uid]
c.setProcessName("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)
@ -733,7 +745,7 @@ func (c *Cluster) deleteSecret(secret *v1.Secret) error {
return err
}
c.logger.Infof("secret %q has been deleted", util.NameFromMeta(secret.ObjectMeta))
delete(c.Secrets, secret.UID)
c.Secrets[uid] = nil
return err
}