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

Minor doc/code fixes

This commit is contained in:
Sergey Dudoladov 2019-04-05 11:37:50 +02:00
parent d30dd9e5e5
commit 9ad38d5520
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/reference/cluster_manifest.md
View File

@ -123,7 +123,7 @@ These parameters are grouped directly under the `spec` key in the manifest.
Determines if the logical backup of this cluster should be taken and uploaded to S3. Default: false. Determines if the logical backup of this cluster should be taken and uploaded to S3. Default: false.
* **logicalBackupSchedule** * **logicalBackupSchedule**
Backup schedule in the Cron format. Please take [the reference schedule format](https://kubernetes.io/docs/tasks/job/automated-tasks-with-cron-jobs/#schedule) into account. Default: "30 00 \* \* \*" Schedule for the logical backup k8s cron job. Please take [the reference schedule format](https://kubernetes.io/docs/tasks/job/automated-tasks-with-cron-jobs/#schedule) into account. Default: "30 00 \* \* \*"
## Postgres parameters ## Postgres parameters

2
docs/reference/operator_parameters.md
View File

@ -482,7 +482,7 @@ scalyr sidecar. In the CRD-based configuration they are grouped under the
Determines if the operator creates a Kubernets Cron job to do a logical backup of all Postgres clusters it controls. Default: false. Determines if the operator creates a Kubernets Cron job to do a logical backup of all Postgres clusters it controls. Default: false.
* **logical_backup_schedule** * **logical_backup_schedule**
Backup schedule in the cron format. Default: "30 00 \* \* \*" Backup schedule in the cron format. Please take [the reference schedule format](https://kubernetes.io/docs/tasks/job/automated-tasks-with-cron-jobs/#schedule) into account. Default: "30 00 \* \* \*"
* **logical_backup_docker_image** * **logical_backup_docker_image**
Docker image for the pods of the cron job. Must implement backup/uploading logic. Default: empty. Docker image for the pods of the cron job. Must implement backup/uploading logic. Default: empty.

6
pkg/cluster/k8sres.go
View File

@ -1259,12 +1259,16 @@ func (c *Cluster) generateLogicalBackupJob() (*batchv1beta1.CronJob, error) {
var ( var (
err error err error
podTemplate *v1.PodTemplateSpec podTemplate *v1.PodTemplateSpec
resourceRequirements *v1.ResourceRequirements
) )
c.logger.Debug("Generating logical backup pod template") c.logger.Debug("Generating logical backup pod template")
defaultResources := c.makeDefaultResources() defaultResources := c.makeDefaultResources()
resourceRequirements, err := generateResourceRequirements(c.Spec.Resources, defaultResources) resourceRequirements, err = generateResourceRequirements(c.Spec.Resources, defaultResources)
if err != nil {
return nil, fmt.Errorf("could not generate resource requirements for the pod of a logical backup cron job: %v", err)
}
envVars := c.generateLogicalBackupPodEnvVars() envVars := c.generateLogicalBackupPodEnvVars()
logicalBackupContainer := generateSpiloContainer( logicalBackupContainer := generateSpiloContainer(