propagate the new parameter to the entire confiuration
This commit is contained in:
		
							parent
							
								
									a8259670b6
								
							
						
					
					
						commit
						28e56d89fd
					
				| 
						 | 
				
			
			@ -21,6 +21,8 @@ configGeneral:
 | 
			
		|||
  enable_crd_validation: true
 | 
			
		||||
  # update only the statefulsets without immediately doing the rolling update
 | 
			
		||||
  enable_lazy_spilo_upgrade: false
 | 
			
		||||
  # set the PGVERSION env var instead of providing the version via postgresql.bin_dir in SPILO_CONFIGURATION
 | 
			
		||||
  enable_pgversion_env_var: "false"
 | 
			
		||||
  # start any new database pod without limitations on shm memory
 | 
			
		||||
  enable_shm_volume: true
 | 
			
		||||
  # etcd connection string for Patroni. Empty uses K8s-native DCS.
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -24,6 +24,8 @@ configGeneral:
 | 
			
		|||
  enable_crd_validation: "true"
 | 
			
		||||
  # update only the statefulsets without immediately doing the rolling update
 | 
			
		||||
  enable_lazy_spilo_upgrade: "false"
 | 
			
		||||
  # set the PGVERSION env var instead of providing the version via postgresql.bin_dir in SPILO_CONFIGURATION
 | 
			
		||||
  enable_pgversion_env_var: "false"
 | 
			
		||||
  # start any new database pod without limitations on shm memory
 | 
			
		||||
  enable_shm_volume: "true"
 | 
			
		||||
  # etcd connection string for Patroni. Empty uses K8s-native DCS.
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -65,6 +65,8 @@ spec:
 | 
			
		|||
                type: boolean
 | 
			
		||||
              enable_lazy_spilo_upgrade:
 | 
			
		||||
                type: boolean
 | 
			
		||||
              enable_pgversion_env_var:
 | 
			
		||||
                type: boolean
 | 
			
		||||
              enable_shm_volume:
 | 
			
		||||
                type: boolean
 | 
			
		||||
              etcd_host:
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -167,7 +167,7 @@ type ScalyrConfiguration struct {
 | 
			
		|||
	ScalyrMemoryLimit   string `json:"scalyr_memory_limit,omitempty"`
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
// Defines default configuration for connection pooler
 | 
			
		||||
// ConnectionPoolerConfiguration defines default configuration for connection pooler
 | 
			
		||||
type ConnectionPoolerConfiguration struct {
 | 
			
		||||
	NumberOfInstances    *int32 `json:"connection_pooler_number_of_instances,omitempty"`
 | 
			
		||||
	Schema               string `json:"connection_pooler_schema,omitempty"`
 | 
			
		||||
| 
						 | 
				
			
			@ -197,6 +197,7 @@ type OperatorLogicalBackupConfiguration struct {
 | 
			
		|||
type OperatorConfigurationData struct {
 | 
			
		||||
	EnableCRDValidation        *bool                              `json:"enable_crd_validation,omitempty"`
 | 
			
		||||
	EnableLazySpiloUpgrade     bool                               `json:"enable_lazy_spilo_upgrade,omitempty"`
 | 
			
		||||
	EnablePgVersionEnvVar      bool                               `json:"enable_pgversion_env_var,omitempty"`
 | 
			
		||||
	EtcdHost                   string                             `json:"etcd_host,omitempty"`
 | 
			
		||||
	KubernetesUseConfigMaps    bool                               `json:"kubernetes_use_configmaps,omitempty"`
 | 
			
		||||
	DockerImage                string                             `json:"docker_image,omitempty"`
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -35,6 +35,7 @@ func (c *Controller) importConfigurationFromCRD(fromCRD *acidv1.OperatorConfigur
 | 
			
		|||
	// general config
 | 
			
		||||
	result.EnableCRDValidation = util.CoalesceBool(fromCRD.EnableCRDValidation, util.True())
 | 
			
		||||
	result.EnableLazySpiloUpgrade = fromCRD.EnableLazySpiloUpgrade
 | 
			
		||||
	result.EnablePgVersionEnvVar = fromCRD.EnablePgVersionEnvVar
 | 
			
		||||
	result.EtcdHost = fromCRD.EtcdHost
 | 
			
		||||
	result.KubernetesUseConfigMaps = fromCRD.KubernetesUseConfigMaps
 | 
			
		||||
	result.DockerImage = util.Coalesce(fromCRD.DockerImage, "registry.opensource.zalan.do/acid/spilo-12:1.6-p3")
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
		Reference in New Issue