delete secrets of system users too (#974)

This commit is contained in:
Felix Kunde
2020-05-14 11:34:02 +02:00
committed by GitHub
parent 8ff7658ed3
commit 3a49b485e5
2 changed files with 0 additions and 40 deletions
-9
View File
@@ -822,10 +822,6 @@ func (c *Cluster) Delete() {
}
for _, obj := range c.Secrets {
if doDelete, user := c.shouldDeleteSecret(obj); !doDelete {
c.logger.Warningf("not removing secret %q for the system user %q", obj.GetName(), user)
continue
}
if err := c.deleteSecret(obj); err != nil {
c.logger.Warningf("could not delete secret: %v", err)
}
@@ -1300,11 +1296,6 @@ func (c *Cluster) Unlock() {
c.mu.Unlock()
}
func (c *Cluster) shouldDeleteSecret(secret *v1.Secret) (delete bool, userName string) {
secretUser := string(secret.Data["username"])
return (secretUser != c.OpConfig.ReplicationUsername && secretUser != c.OpConfig.SuperUsername), secretUser
}
type simpleActionWithResult func() error
type clusterObjectGet func(name string) (spec.NamespacedName, error)