Merge branch 'master' into add-logical-backup

This commit is contained in:
Sergey Dudoladov
2019-04-15 14:03:01 +02:00
13 changed files with 111 additions and 28 deletions
+2 -1
View File
@@ -360,8 +360,8 @@ func generateSpiloContainer(
resourceRequirements *v1.ResourceRequirements,
envVars []v1.EnvVar,
volumeMounts []v1.VolumeMount,
privilegedMode bool,
) *v1.Container {
privilegedMode := true
return &v1.Container{
Name: name,
Image: *dockerImage,
@@ -799,6 +799,7 @@ func (c *Cluster) generateStatefulSet(spec *acidv1.PostgresSpec) (*v1beta1.State
resourceRequirements,
spiloEnvVars,
volumeMounts,
c.OpConfig.Resources.SpiloPrivileged,
)
// resolve conflicts between operator-global and per-cluster sidecars