public_git/postgres-operator
1
0
Fork 0
mirror of https://github.com/zalando/postgres-operator.git synced 2026-10-05 18:21:53 +02:00
Code Issues Projects Releases Wiki Activity

less code

Browse Source
This commit is contained in:
Felix Kunde
2020-08-10 17:39:22 +02:00
parent 9556fe1cc2 43163cf83b
commit 3ebf9dc09c
10 changed files with 654 additions and 548 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/cluster/resources.go
+5 -6
View File
@@ -229,11 +229,9 @@ func (c *Cluster) deleteConnectionPooler() (err error) {
if err != nil {
c.logger.Debugf("could not get connection pooler secret %q: %v", secretName, err)
} else {
uid := secret.UID
if err = c.deleteSecret(uid, *secret); err != nil {
if err = c.deleteSecret(secret.UID, *secret); err != nil {
return fmt.Errorf("could not delete pooler secret: %v", err)
}
c.Secrets[uid] = nil
}
c.ConnectionPooler = nil
@@ -761,12 +759,13 @@ func (c *Cluster) deleteSecrets() error {
func (c *Cluster) deleteSecret(uid types.UID, secret v1.Secret) error {
c.setProcessName("deleting secret")
c.logger.Debugf("deleting secret %q", util.NameFromMeta(secret.ObjectMeta))
secretName := util.NameFromMeta(secret.ObjectMeta)
c.logger.Debugf("deleting secret %q", secretName)
err := c.KubeClient.Secrets(secret.Namespace).Delete(context.TODO(), secret.Name, c.deleteOptions)
if err != nil {
return fmt.Errorf("could not delete secret %q: %v", util.NameFromMeta(secret.ObjectMeta), err)
return fmt.Errorf("could not delete secret %q: %v", secretName, err)
}
c.logger.Infof("secret %q has been deleted", util.NameFromMeta(secret.ObjectMeta))
c.logger.Infof("secret %q has been deleted", secretName)
c.Secrets[uid] = nil
return nil