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

fix conflicts

Browse Source
This commit is contained in:
Felix Kunde
2024-01-22 16:43:55 +01:00
parent 4a0c483514 fee5a70746
commit 8570831c32
17 changed files with 861 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/controller/operator_config.go
+1
View File
@@ -128,6 +128,7 @@ func (c *Controller) importConfigurationFromCRD(fromCRD *acidv1.OperatorConfigur
result.PodAntiAffinityTopologyKey = util.Coalesce(fromCRD.Kubernetes.PodAntiAffinityTopologyKey, "kubernetes.io/hostname")
result.PodAntiAffinityPreferredDuringScheduling = fromCRD.Kubernetes.PodAntiAffinityPreferredDuringScheduling
result.PodToleration = fromCRD.Kubernetes.PodToleration
result.LivenessProbe = fromCRD.Kubernetes.LivenessProbe
// Postgres Pod resources
result.DefaultCPURequest = util.Coalesce(fromCRD.PostgresPodResources.DefaultCPURequest, "100m")