From 2c9d1894c14dacc5733e557c464e709318adc53a Mon Sep 17 00:00:00 2001 From: Felix Kunde Date: Thu, 14 Oct 2021 11:50:22 +0200 Subject: [PATCH] import PodToleration from opConfig to internal config --- pkg/controller/operator_config.go | 1 + 1 file changed, 1 insertion(+) diff --git a/pkg/controller/operator_config.go b/pkg/controller/operator_config.go index 673a59246..af4aa6c6e 100644 --- a/pkg/controller/operator_config.go +++ b/pkg/controller/operator_config.go @@ -113,6 +113,7 @@ func (c *Controller) importConfigurationFromCRD(fromCRD *acidv1.OperatorConfigur result.MasterPodMoveTimeout = util.CoalesceDuration(time.Duration(fromCRD.Kubernetes.MasterPodMoveTimeout), "10m") result.EnablePodAntiAffinity = fromCRD.Kubernetes.EnablePodAntiAffinity result.PodAntiAffinityTopologyKey = util.Coalesce(fromCRD.Kubernetes.PodAntiAffinityTopologyKey, "kubernetes.io/hostname") + result.PodToleration = fromCRD.Kubernetes.PodToleration // Postgres Pod resources result.DefaultCPURequest = util.Coalesce(fromCRD.PostgresPodResources.DefaultCPURequest, "100m")