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

Merge branch 'master' into internal-load-balancer

Browse Source
This commit is contained in:
Felix Kunde
2020-06-04 09:49:46 +02:00
parent 263b3736f1 2b0def5bc8
commit f0f61dbbf2
12 changed files with 225 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/controller/operator_config.go
+2
View File
@@ -113,6 +113,8 @@ func (c *Controller) importConfigurationFromCRD(fromCRD *acidv1.OperatorConfigur
result.AWSRegion = fromCRD.AWSGCP.AWSRegion
result.LogS3Bucket = fromCRD.AWSGCP.LogS3Bucket
result.KubeIAMRole = fromCRD.AWSGCP.KubeIAMRole
result.WALGSBucket = fromCRD.AWSGCP.WALGSBucket
result.GCPCredentials = fromCRD.AWSGCP.GCPCredentials
result.AdditionalSecretMount = fromCRD.AWSGCP.AdditionalSecretMount
result.AdditionalSecretMountPath = fromCRD.AWSGCP.AdditionalSecretMountPath