public_git
/
postgres-operator
mirror of https://github.com/zalando/postgres-operator.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix compilation errors

This commit is contained in:
Matt Ward 2018-06-01 21:06:12 +00:00
parent cfcae65f4c
commit 940b3c9e2b
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkg/cluster/k8sres.go
View File

@ -319,7 +319,7 @@ func (c *Cluster) generatePodTemplate(
cloneDescription *spec.CloneDescription, cloneDescription *spec.CloneDescription,
dockerImage *string, dockerImage *string,
sidecars *[]spec.Sidecar, sidecars *[]spec.Sidecar,
customPodEnvVars map[string]string customPodEnvVars map[string]string,
) (*v1.PodTemplateSpec, error) { ) (*v1.PodTemplateSpec, error) {
spiloConfiguration := c.generateSpiloJSONConfiguration(pgParameters, patroniParameters) spiloConfiguration := c.generateSpiloJSONConfiguration(pgParameters, patroniParameters)
@ -605,12 +605,12 @@ func (c *Cluster) getSidecarContainer(sidecar spec.Sidecar, index int, volumeMou
env = append(env, sidecar.Env...) env = append(env, sidecar.Env...)
} }
return &v1.Container{ return &v1.Container{
Name: name, Name: name,
Image: sidecar.DockerImage, Image: sidecar.DockerImage,
ImagePullPolicy: v1.PullIfNotPresent, ImagePullPolicy: v1.PullIfNotPresent,
Resources: *resources, Resources: *resources,
VolumeMounts: volumeMounts, VolumeMounts: volumeMounts,
Env: env, Env: env,
}, nil }, nil
} }
@ -658,7 +658,7 @@ func (c *Cluster) generateStatefulSet(spec *spec.PostgresSpec) (*v1beta1.Statefu
customPodEnvVars = cm.Data customPodEnvVars = cm.Data
} }
} }
podTemplate, err := c.generatePodTemplate(c.Postgresql.GetUID(), resourceRequirements, resourceRequirementsScalyrSidecar, &spec.Tolerations, &spec.PostgresqlParam, &spec.Patroni, &spec.Clone, &spec.DockerImage, &spec.Sidecars customPodEnvVars) podTemplate, err := c.generatePodTemplate(c.Postgresql.GetUID(), resourceRequirements, resourceRequirementsScalyrSidecar, &spec.Tolerations, &spec.PostgresqlParam, &spec.Patroni, &spec.Clone, &spec.DockerImage, &spec.Sidecars, customPodEnvVars)
if err != nil { if err != nil {
return nil, fmt.Errorf("could not generate pod template: %v", err) return nil, fmt.Errorf("could not generate pod template: %v", err)
} }