From 1f1eab4b28163a1e35b21da69189a01d197bac6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Mu=C3=9Fler?= Date: Wed, 24 Feb 2021 12:07:53 +0100 Subject: [PATCH] Fixing command one more time. --- pkg/cluster/majorversionupgrade.go | 3 ++- pkg/cluster/sync.go | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/pkg/cluster/majorversionupgrade.go b/pkg/cluster/majorversionupgrade.go index ecf99c610..8173a4299 100644 --- a/pkg/cluster/majorversionupgrade.go +++ b/pkg/cluster/majorversionupgrade.go @@ -78,7 +78,8 @@ func (c *Cluster) majorVersionUpgrade() error { if c.currentMajorVersion < desiredVersion { podName := &spec.NamespacedName{Namespace: masterPod.Namespace, Name: masterPod.Name} c.logger.Infof("triggering major version upgrade on pod %s of %d pods", masterPod.Name, numberOfPods) - _, err := c.ExecCommand(podName, "/bin/su", "postgres", "-c", "\"/usr/bin/python3 /scripts/inplace_upgrade.py %d 2>&1 | tee last_upgrade.log\"") + //result, err := c.ExecCommand(podName, "/bin/su", "postgres", "-c", "whoami") + _, err := c.ExecCommand(podName, "/bin/su", "postgres", "-c", "/usr/bin/python3 /scripts/inplace_upgrade.py %d 2>&1 | tee last_upgrade.log") if err != nil { return err } diff --git a/pkg/cluster/sync.go b/pkg/cluster/sync.go index 0d1ba6f62..c6bc70836 100644 --- a/pkg/cluster/sync.go +++ b/pkg/cluster/sync.go @@ -475,7 +475,7 @@ func (c *Cluster) syncSecrets() error { for secretUsername, secretSpec := range secrets { if secret, err = c.KubeClient.Secrets(secretSpec.Namespace).Create(context.TODO(), secretSpec, metav1.CreateOptions{}); err == nil { c.Secrets[secret.UID] = secret - c.logger.Debugf("created new secret %q, uid: %q", util.NameFromMeta(secret.ObjectMeta), secret.UID) + c.logger.Debugf("created new secret %s, uid: %s", util.NameFromMeta(secret.ObjectMeta), secret.UID) continue } if k8sutil.ResourceAlreadyExists(err) { @@ -484,7 +484,7 @@ func (c *Cluster) syncSecrets() error { return fmt.Errorf("could not get current secret: %v", err) } if secretUsername != string(secret.Data["username"]) { - c.logger.Errorf("secret %s does not contain the role %q", secretSpec.Name, secretUsername) + c.logger.Errorf("secret %s does not contain the role %s", secretSpec.Name, secretUsername) continue } c.Secrets[secret.UID] = secret @@ -503,7 +503,7 @@ func (c *Cluster) syncSecrets() error { if pwdUser.Password != string(secret.Data["password"]) && pwdUser.Origin == spec.RoleOriginInfrastructure { - c.logger.Debugf("updating the secret %q from the infrastructure roles", secretSpec.Name) + c.logger.Debugf("updating the secret %s from the infrastructure roles", secretSpec.Name) if _, err = c.KubeClient.Secrets(secretSpec.Namespace).Update(context.TODO(), secretSpec, metav1.UpdateOptions{}); err != nil { return fmt.Errorf("could not update infrastructure role secret for role %q: %v", secretUsername, err) } @@ -513,7 +513,7 @@ func (c *Cluster) syncSecrets() error { userMap[secretUsername] = pwdUser } } else { - return fmt.Errorf("could not create secret for user %q: %v", secretUsername, err) + return fmt.Errorf("could not create secret for user %s: %v", secretUsername, err) } }