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

Fix pooler delete (#960) 

deleteConnectionPooler function incorrectly checks that the delete api response is ResourceNotFound. Looks like the only consequence is a confusing log message, but obviously it's wrong. Remove negation, since having ResourceNotFound as error is the good case.

Co-authored-by: Christian Rohmann <christian.rohmann@inovex.de>
This commit is contained in:
Christian Rohmann 2020-05-13 14:55:54 +02:00 committed by GitHub
parent 852f29274a
commit 8ff7658ed3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/cluster/cluster.go
View File

@ -1345,7 +1345,7 @@ func (c *Cluster) deleteClusterObject(
objType, namespacedName) objType, namespacedName)
if err = del(name); err != nil { if err = del(name); err != nil {
return fmt.Errorf("could not Patroni delete cluster object %q with name %q: %v", return fmt.Errorf("could not delete Patroni cluster object %q with name %q: %v",
objType, namespacedName, err) objType, namespacedName, err)
} }

4
pkg/cluster/resources.go
View File

@ -191,7 +191,7 @@ func (c *Cluster) deleteConnectionPooler() (err error) {
Deployments(c.Namespace). Deployments(c.Namespace).
Delete(context.TODO(), deploymentName, options) Delete(context.TODO(), deploymentName, options)
if !k8sutil.ResourceNotFound(err) { if k8sutil.ResourceNotFound(err) {
c.logger.Debugf("Connection pooler deployment was already deleted") c.logger.Debugf("Connection pooler deployment was already deleted")
} else if err != nil { } else if err != nil {
return fmt.Errorf("could not delete deployment: %v", err) return fmt.Errorf("could not delete deployment: %v", err)
@ -213,7 +213,7 @@ func (c *Cluster) deleteConnectionPooler() (err error) {
Services(c.Namespace). Services(c.Namespace).
Delete(context.TODO(), serviceName, options) Delete(context.TODO(), serviceName, options)
if !k8sutil.ResourceNotFound(err) { if k8sutil.ResourceNotFound(err) {
c.logger.Debugf("Connection pooler service was already deleted") c.logger.Debugf("Connection pooler service was already deleted")
} else if err != nil { } else if err != nil {
return fmt.Errorf("could not delete service: %v", err) return fmt.Errorf("could not delete service: %v", err)