Merge 12d1019dec into 1af4c50ed0

e2e/tests/test_e2e.py

@@ -1003,8 +1003,7 @@ class EndToEndTestCase(unittest.TestCase):
                             "Origin": 2,
                             "IsDbOwner": False,
                             "Deleted": False,
-                            "Rotated": False,
-                            "Degraded": False,
+                            "Rotated": False
                         })
                         return True
                 except:

pkg/cluster/sync.go

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