Merge branch 'master' into master
This commit is contained in:
		
						commit
						05627164da
					
				|  | @ -1010,6 +1010,9 @@ func (c *Cluster) generateSpiloPodEnvVars( | ||||||
| 
 | 
 | ||||||
| 	if c.patroniUsesKubernetes() { | 	if c.patroniUsesKubernetes() { | ||||||
| 		envVars = append(envVars, v1.EnvVar{Name: "DCS_ENABLE_KUBERNETES_API", Value: "true"}) | 		envVars = append(envVars, v1.EnvVar{Name: "DCS_ENABLE_KUBERNETES_API", Value: "true"}) | ||||||
|  | 		if c.OpConfig.EnablePodDisruptionBudget != nil && *c.OpConfig.EnablePodDisruptionBudget { | ||||||
|  | 			envVars = append(envVars, v1.EnvVar{Name: "KUBERNETES_BOOTSTRAP_LABELS", Value: "{\"critical-operation\":\"true\"}"}) | ||||||
|  | 		} | ||||||
| 	} else { | 	} else { | ||||||
| 		envVars = append(envVars, v1.EnvVar{Name: "ETCD_HOST", Value: c.OpConfig.EtcdHost}) | 		envVars = append(envVars, v1.EnvVar{Name: "ETCD_HOST", Value: c.OpConfig.EtcdHost}) | ||||||
| 	} | 	} | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue