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

rebased with master

Browse Source
This commit is contained in:
Felix Kunde
2019-11-26 12:20:41 +01:00
parent 5fd53d0b28
commit 68632c5f35
7 changed files with 21 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/controller/operator_config.go
+2 -2
View File
@@ -35,8 +35,6 @@ func (c *Controller) importConfigurationFromCRD(fromCRD *acidv1.OperatorConfigur
result.SetMemoryRequestToLimit = fromCRD.SetMemoryRequestToLimit
result.ShmVolume = fromCRD.ShmVolume
result.Sidecars = fromCRD.Sidecars
result.EnableSidecars = fromCRD.EnableSidecars
result.EnableInitContainers = fromCRD.EnableInitContainers
// user config
result.SuperUsername = fromCRD.PostgresUsersConfiguration.SuperUsername
@@ -55,6 +53,8 @@ func (c *Controller) importConfigurationFromCRD(fromCRD *acidv1.OperatorConfigur
result.WatchedNamespace = fromCRD.Kubernetes.WatchedNamespace
result.PDBNameFormat = fromCRD.Kubernetes.PDBNameFormat
result.EnablePodDisruptionBudget = fromCRD.Kubernetes.EnablePodDisruptionBudget
result.EnableSidecars = fromCRD.Kubernetes.EnableSidecars
result.EnableInitContainers = fromCRD.Kubernetes.EnableInitContainers
result.SecretNameTemplate = fromCRD.Kubernetes.SecretNameTemplate
result.OAuthTokenSecretName = fromCRD.Kubernetes.OAuthTokenSecretName
result.InfrastructureRolesSecretName = fromCRD.Kubernetes.InfrastructureRolesSecretName