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

Optimize template constant

This commit is contained in:
Murat Kabilov 2017-05-10 16:06:07 +02:00
parent fd449342e5
commit 18700b9ef7
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/cluster/util.go
View File

@ -257,9 +257,7 @@ func (c *Cluster) credentialSecretName(username string) string {
// and must start and end with an alphanumeric character // and must start and end with an alphanumeric character
return fmt.Sprintf(constants.UserSecretTemplate, return fmt.Sprintf(constants.UserSecretTemplate,
strings.Replace(username, "_", "-", -1), strings.Replace(username, "_", "-", -1),
c.Metadata.Name, c.Metadata.Name)
constants.TPRName,
constants.TPRVendor)
} }
func (c *Cluster) deleteEtcdKey() error { func (c *Cluster) deleteEtcdKey() error {

2
pkg/util/constants/constants.go
View File

@ -12,7 +12,7 @@ const (
K8sApiPath = "/api" K8sApiPath = "/api"
DataVolumeName = "pgdata" DataVolumeName = "pgdata"
PasswordLength = 64 PasswordLength = 64
UserSecretTemplate = "%s.%s.credentials.%s.%s" // Username, ClusterName, TPRName, TPRVendor UserSecretTemplate = "%s.%s.credentials." + TPRName + "." + TPRVendor // Username, ClusterName
ZalandoDnsNameAnnotation = "external-dns.alpha.kubernetes.io/hostname" ZalandoDnsNameAnnotation = "external-dns.alpha.kubernetes.io/hostname"
ElbTimeoutAnnotationName = "service.beta.kubernetes.io/aws-load-balancer-connection-idle-timeout" ElbTimeoutAnnotationName = "service.beta.kubernetes.io/aws-load-balancer-connection-idle-timeout"
ElbTimeoutAnnotationValue = "3600" ElbTimeoutAnnotationValue = "3600"