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

lets collect errors of syncSecret so we still get status updateFailed

This commit is contained in:
Felix Kunde 2025-10-24 17:37:56 +02:00
parent c53630dac1
commit 90314537cd
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkg/cluster/sync.go
View File

@ -1059,6 +1059,7 @@ func (c *Cluster) syncStandbyClusterConfiguration() error {
func (c *Cluster) syncSecrets() error { func (c *Cluster) syncSecrets() error {
c.logger.Debug("syncing secrets") c.logger.Debug("syncing secrets")
c.setProcessName("syncing secrets") c.setProcessName("syncing secrets")
errors := make([]string, 0)
generatedSecrets := c.generateUserSecrets() generatedSecrets := c.generateUserSecrets()
retentionUsers := make([]string, 0) retentionUsers := make([]string, 0)
currentTime := time.Now() currentTime := time.Now()
@ -1077,10 +1078,10 @@ func (c *Cluster) syncSecrets() error {
c.Secrets[updatedSecret.UID] = updatedSecret c.Secrets[updatedSecret.UID] = updatedSecret
continue continue
} }
c.logger.Warningf("syncing secret %s failed: %v", util.NameFromMeta(updatedSecret.ObjectMeta), err) errors = append(errors, fmt.Sprintf("syncing secret %s failed: %v", util.NameFromMeta(updatedSecret.ObjectMeta), err))
pgUserDegraded = true pgUserDegraded = true
} else { } else {
c.logger.Warningf("could not create secret for user %s: in namespace %s: %v", secretUsername, generatedSecret.Namespace, err) errors = append(errors, fmt.Sprintf("could not create secret for user %s: in namespace %s: %v", secretUsername, generatedSecret.Namespace, err))
pgUserDegraded = true pgUserDegraded = true
} }
c.updatePgUser(secretUsername, pgUserDegraded) c.updatePgUser(secretUsername, pgUserDegraded)
@ -1090,16 +1091,20 @@ func (c *Cluster) syncSecrets() error {
if len(retentionUsers) > 0 { if len(retentionUsers) > 0 {
err := c.initDbConn() err := c.initDbConn()
if err != nil { if err != nil {
return fmt.Errorf("could not init db connection: %v", err) errors = append(errors, fmt.Sprintf("could not init db connection: %v", err))
} }
if err = c.cleanupRotatedUsers(retentionUsers, c.pgDb); err != nil { if err = c.cleanupRotatedUsers(retentionUsers, c.pgDb); err != nil {
return fmt.Errorf("error removing users exceeding configured retention interval: %v", err) errors = append(errors, fmt.Sprintf("error removing users exceeding configured retention interval: %v", err))
} }
if err := c.closeDbConn(); err != nil { if err := c.closeDbConn(); err != nil {
c.logger.Errorf("could not close database connection after removing users exceeding configured retention interval: %v", err) errors = append(errors, fmt.Sprintf("could not close database connection after removing users exceeding configured retention interval: %v", err))
} }
} }
if len(errors) > 0 {
return fmt.Errorf("%v", strings.Join(errors, `', '`))
}
return nil return nil
} }