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

Merge branch 'master' into default-db-roles

Browse Source
This commit is contained in:
Felix Kunde
2020-04-29 10:10:10 +02:00
parent eb176ca309 cc635a02e3
commit 4268d97190
24 changed files with 258 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/controller/operator_config.go
+1
View File
@@ -34,6 +34,7 @@ func (c *Controller) importConfigurationFromCRD(fromCRD *acidv1.OperatorConfigur
// general config
result.EnableCRDValidation = fromCRD.EnableCRDValidation
result.EnableLazySpiloUpgrade = fromCRD.EnableLazySpiloUpgrade
result.EtcdHost = fromCRD.EtcdHost
result.KubernetesUseConfigMaps = fromCRD.KubernetesUseConfigMaps
result.DockerImage = fromCRD.DockerImage