public_git/postgres-operator
1
0
Fork 0
mirror of https://github.com/zalando/postgres-operator.git synced 2026-10-04 09:01:20 +02:00
Code Issues Projects Releases Wiki Activity

Fix deletion of the failed cluster; more debug messages

Browse Source
This commit is contained in:
Murat Kabilov
2017-05-12 11:41:32 +02:00
parent ce90a54cf9
commit bb4fec25ae
5 changed files with 57 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/cluster/resources.go
+5 -5
View File
@@ -117,7 +117,7 @@ func (c *Cluster) createStatefulSet() (*v1beta1.StatefulSet, error) {
return nil, err
}
c.Statefulset = statefulSet
c.logger.Debugf("Created new StatefulSet, uid: %s", statefulSet.UID)
c.logger.Debugf("Created new StatefulSet '%s', uid: %s", util.NameFromMeta(statefulSet.ObjectMeta), statefulSet.UID)
return statefulSet, nil
}
@@ -244,13 +244,13 @@ func (c *Cluster) applySecrets() error {
for secretUsername, secretSpec := range secrets {
secret, err := c.KubeClient.Secrets(secretSpec.Namespace).Create(secretSpec)
if k8sutil.ResourceAlreadyExists(err) {
curSecrets, err := c.KubeClient.Secrets(secretSpec.Namespace).Get(secretSpec.Name)
curSecret, err := c.KubeClient.Secrets(secretSpec.Namespace).Get(secretSpec.Name)
if err != nil {
return fmt.Errorf("Can't get current Secret: %s", err)
}
c.logger.Debugf("Secret '%s' already exists, fetching it's password", util.NameFromMeta(secret.ObjectMeta))
c.logger.Debugf("Secret '%s' already exists, fetching it's password", util.NameFromMeta(curSecret.ObjectMeta))
pwdUser := c.pgUsers[secretUsername]
pwdUser.Password = string(curSecrets.Data["password"])
pwdUser.Password = string(curSecret.Data["password"])
c.pgUsers[secretUsername] = pwdUser
continue
@@ -259,7 +259,7 @@ func (c *Cluster) applySecrets() error {
return fmt.Errorf("Can't create Secret for user '%s': %s", secretUsername, err)
}
c.Secrets[secret.UID] = secret
c.logger.Debugf("Created new Secret, uid: %s", secret.UID)
c.logger.Debugf("Created new Secret '%s', uid: %s", util.NameFromMeta(secret.ObjectMeta), secret.UID)
}
}