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

use c.credentialSecretName(username)

This commit is contained in:
Felix Kunde 2020-08-10 14:31:39 +02:00
parent 1ad19328b8
commit 54c6da802c
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/cluster/resources.go
View File

@ -13,9 +13,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types" "k8s.io/apimachinery/pkg/types"
"github.com/zalando/postgres-operator/pkg/spec"
"github.com/zalando/postgres-operator/pkg/util" "github.com/zalando/postgres-operator/pkg/util"
"github.com/zalando/postgres-operator/pkg/util/constants"
"github.com/zalando/postgres-operator/pkg/util/k8sutil" "github.com/zalando/postgres-operator/pkg/util/k8sutil"
"github.com/zalando/postgres-operator/pkg/util/retryutil" "github.com/zalando/postgres-operator/pkg/util/retryutil"
) )
@ -222,17 +220,11 @@ func (c *Cluster) deleteConnectionPooler() (err error) {
c.logger.Infof("Connection pooler service %q has been deleted", serviceName) c.logger.Infof("Connection pooler service %q has been deleted", serviceName)
// Repeat the same for the secret object // Repeat the same for the secret object
connectionPoolerUser := spec.PgUser{ secretName := c.credentialSecretName(c.OpConfig.ConnectionPooler.User)
Origin: spec.RoleConnectionPooler,
Name: c.OpConfig.ConnectionPooler.User,
Flags: []string{constants.RoleFlagLogin},
Password: util.RandomPassword(constants.PasswordLength),
}
secretTemplate := c.generateSingleUserSecret(c.Namespace, connectionPoolerUser)
secret, err := c.KubeClient. secret, err := c.KubeClient.
Secrets(c.Namespace). Secrets(c.Namespace).
Get(context.TODO(), secretTemplate.Name, metav1.GetOptions{}) Get(context.TODO(), secretName, metav1.GetOptions{})
if err != nil { if err != nil {
c.logger.Debugf("could not get connection pooler secret %q: %v", secretTemplate.Name, err) c.logger.Debugf("could not get connection pooler secret %q: %v", secretTemplate.Name, err)