From 59ded0c212818fb03716f8f1b111e7b9d037d4b4 Mon Sep 17 00:00:00 2001 From: Sergey Dudoladov Date: Wed, 2 May 2018 14:05:57 +0200 Subject: [PATCH] Shorten bucket name --- pkg/cluster/k8sres.go | 8 ++++---- pkg/util/config/config.go | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkg/cluster/k8sres.go b/pkg/cluster/k8sres.go index 1c0d5c707..4e500de29 100644 --- a/pkg/cluster/k8sres.go +++ b/pkg/cluster/k8sres.go @@ -364,10 +364,10 @@ func (c *Cluster) generatePodTemplate( envVars = append(envVars, v1.EnvVar{Name: "WAL_BUCKET_SCOPE_PREFIX", Value: ""}) } - if c.OpConfig.PgDailyLogS3Bucket != "" { - envVars = append(envVars, v1.EnvVar{Name: "PG_DAILY_LOG_S3_BUCKET", Value: c.OpConfig.PgDailyLogS3Bucket}) - envVars = append(envVars, v1.EnvVar{Name: "PG_DAILY_LOG_BUCKET_SCOPE_SUFFIX", Value: getBucketScopeSuffix(string(uid))}) - envVars = append(envVars, v1.EnvVar{Name: "PG_DAILY_LOG_BUCKET_SCOPE_PREFIX", Value: ""}) + if c.OpConfig.LogS3Bucket != "" { + envVars = append(envVars, v1.EnvVar{Name: "LOG_S3_BUCKET", Value: c.OpConfig.LogS3Bucket}) + envVars = append(envVars, v1.EnvVar{Name: "LOG_BUCKET_SCOPE_SUFFIX", Value: getBucketScopeSuffix(string(uid))}) + envVars = append(envVars, v1.EnvVar{Name: "LOG_BUCKET_SCOPE_PREFIX", Value: ""}) } if c.patroniUsesKubernetes() { diff --git a/pkg/util/config/config.go b/pkg/util/config/config.go index 08bcc7b32..aed9accd3 100644 --- a/pkg/util/config/config.go +++ b/pkg/util/config/config.go @@ -78,7 +78,7 @@ type Config struct { DbHostedZone string `name:"db_hosted_zone" default:"db.example.com"` EtcdScope string `name:"etcd_scope" default:"service"` WALES3Bucket string `name:"wal_s3_bucket"` - PgDailyLogS3Bucket string `name:"pg_daily_log_s3_bucket"` + LogS3Bucket string `name:"log_s3_bucket"` KubeIAMRole string `name:"kube_iam_role"` DebugLogging bool `name:"debug_logging" default:"true"` EnableDBAccess bool `name:"enable_database_access" default:"true"`