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

Merge branch 'master' into crd-defaulting

Browse Source
This commit is contained in:
Felix Kunde
2021-01-08 15:49:11 +01:00
parent 34b95feb75 b7f4cde541
commit ae42488e45
10 changed files with 59 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/controller/operator_config.go
+1
View File
@@ -154,6 +154,7 @@ func (c *Controller) importConfigurationFromCRD(fromCRD *acidv1.OperatorConfigur
result.LogicalBackupS3SecretAccessKey = fromCRD.LogicalBackup.S3SecretAccessKey
result.LogicalBackupS3SSE = fromCRD.LogicalBackup.S3SSE
result.LogicalBackupGoogleApplicationCredentials = fromCRD.LogicalBackup.GoogleApplicationCredentials
result.LogicalBackupJobPrefix = fromCRD.LogicalBackup.JobPrefix
// debug config
result.DebugLogging = fromCRD.OperatorDebug.DebugLogging