add IsDbOwner field in e2e test

This commit is contained in:
Felix Kunde
2022-01-21 19:00:37 +01:00
parent bf1ce14fc8
commit 73b4e3ac92
2 changed files with 5 additions and 3 deletions
+1
View File
@@ -580,6 +580,7 @@ class EndToEndTestCase(unittest.TestCase):
"Parameters": None, "Parameters": None,
"AdminRole": "", "AdminRole": "",
"Origin": 2, "Origin": 2,
"IsDbOwner": False,
"Deleted": False "Deleted": False
}) })
return True return True
+4 -3
View File
@@ -638,12 +638,13 @@ func (c *Cluster) syncSecrets() error {
continue continue
} }
if k8sutil.ResourceAlreadyExists(err) { if k8sutil.ResourceAlreadyExists(err) {
c.logger.Debugf("secret %s already exists, fetching its password", util.NameFromMeta(secret.ObjectMeta))
if secret, err = c.KubeClient.Secrets(secretSpec.Namespace).Get(context.TODO(), secretSpec.Name, metav1.GetOptions{}); err != nil { if secret, err = c.KubeClient.Secrets(secretSpec.Namespace).Get(context.TODO(), secretSpec.Name, metav1.GetOptions{}); err != nil {
return fmt.Errorf("could not get current secret: %v", err) return fmt.Errorf("could not get current secret: %v", err)
} }
c.Secrets[secret.UID] = secret
c.logger.Debugf("secret %s already exists, fetching its password", util.NameFromMeta(secret.ObjectMeta))
// sync password of pgUser // fetch user map to update later
var userMap map[string]spec.PgUser var userMap map[string]spec.PgUser
var userKey string var userKey string
if secretUsername == c.systemUsers[constants.SuperuserKeyName].Name { if secretUsername == c.systemUsers[constants.SuperuserKeyName].Name {
@@ -723,8 +724,8 @@ func (c *Cluster) syncSecrets() error {
c.logger.Warningf("could not update secret %q: %v", secretSpec.Name, err) c.logger.Warningf("could not update secret %q: %v", secretSpec.Name, err)
continue continue
} }
c.Secrets[secret.UID] = secret
} }
c.Secrets[secret.UID] = secret
} else { } else {
return fmt.Errorf("could not create secret for user %s: in namespace %s: %v", secretUsername, secretSpec.Namespace, err) return fmt.Errorf("could not create secret for user %s: in namespace %s: %v", secretUsername, secretSpec.Namespace, err)