import PodToleration from opConfig to internal config (#1647)
* import PodToleration from opConfig to internal config * add examples to manifests and values.yaml
This commit is contained in:
		
							parent
							
								
									2a33bf3313
								
							
						
					
					
						commit
						08665bb2b1
					
				| 
						 | 
				
			
			@ -168,6 +168,12 @@ configKubernetes:
 | 
			
		|||
  spilo_allow_privilege_escalation: true
 | 
			
		||||
  # storage resize strategy, available options are: ebs, pvc, off
 | 
			
		||||
  storage_resize_mode: pvc
 | 
			
		||||
  # pod toleration assigned to instances of every Postgres cluster
 | 
			
		||||
  # toleration:
 | 
			
		||||
  #   key: db-only
 | 
			
		||||
  #   operator: Exists
 | 
			
		||||
  #   effect: NoSchedule
 | 
			
		||||
 | 
			
		||||
  # operator watches for postgres objects in the given namespace
 | 
			
		||||
  watched_namespace: "*"  # listen to all namespaces
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -128,7 +128,7 @@ data:
 | 
			
		|||
  # team_admin_role: "admin"
 | 
			
		||||
  # team_api_role_configuration: "log_statement:all"
 | 
			
		||||
  # teams_api_url: http://fake-teams-api.default.svc.cluster.local
 | 
			
		||||
  # toleration: ""
 | 
			
		||||
  # toleration: "key:db-only,operator:Exists,effect:NoSchedule"
 | 
			
		||||
  # wal_az_storage_account: ""
 | 
			
		||||
  # wal_gs_bucket: ""
 | 
			
		||||
  # wal_s3_bucket: ""
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -86,7 +86,10 @@ configuration:
 | 
			
		|||
    # spilo_fsgroup: 103
 | 
			
		||||
    spilo_privileged: false
 | 
			
		||||
    storage_resize_mode: pvc
 | 
			
		||||
    # toleration: {}
 | 
			
		||||
    # toleration:
 | 
			
		||||
    #   key: db-only
 | 
			
		||||
    #   operator: Exists
 | 
			
		||||
    #   effect: NoSchedule
 | 
			
		||||
    # watched_namespace: ""
 | 
			
		||||
  postgres_pod_resources:
 | 
			
		||||
    default_cpu_limit: "1"
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -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")
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue