public_git/postgres-operator
1
0
Fork 0
mirror of https://github.com/zalando/postgres-operator.git synced 2026-10-05 21:21:43 +02:00
Code Issues Projects Releases Wiki Activity

fix k8sres and update e2e tests

Browse Source
This commit is contained in:
Felix Kunde
2019-11-26 18:01:52 +01:00
parent 28275444d3
commit 8da271f0cb
2 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/cluster/k8sres.go
+4 -4
View File
@@ -787,11 +787,11 @@ func (c *Cluster) generateStatefulSet(spec *acidv1.PostgresSpec) (*appsv1.Statef
return nil, fmt.Errorf("could not generate resource requirements: %v", err)
}
if spec.InitContainers != nil {
if spec.InitContainers != nil && len(spec.InitContainers) > 0 {
if c.OpConfig.EnableInitContainers {
initContainers = spec.InitContainers
} else {
return nil, fmt.Errorf("InitContainers specified but globally disabled!")
return nil, fmt.Errorf("initContainers specified but globally disabled")
}
}
@@ -881,14 +881,14 @@ func (c *Cluster) generateStatefulSet(spec *acidv1.PostgresSpec) (*appsv1.Statef
}
// generate sidecar containers
if sideCars != nil {
if sideCars != nil && len(sideCars) > 0 {
if c.OpConfig.EnableSidecars {
if sidecarContainers, err = generateSidecarContainers(sideCars, volumeMounts, defaultResources,
c.OpConfig.SuperUsername, c.credentialSecretName(c.OpConfig.SuperUsername), c.logger); err != nil {
return nil, fmt.Errorf("could not generate sidecar containers: %v", err)
}
} else {
return nil, fmt.Errorf("Sidecar containers specified but globally disabled!")
return nil, fmt.Errorf("sidecar containers specified but globally disabled")
}
}