From 9ad38d5520564f8f6d3f9ade561fa5ac4a5f8377 Mon Sep 17 00:00:00 2001 From: Sergey Dudoladov Date: Fri, 5 Apr 2019 11:37:50 +0200 Subject: [PATCH] Minor doc/code fixes --- docs/reference/cluster_manifest.md | 2 +- docs/reference/operator_parameters.md | 2 +- pkg/cluster/k8sres.go | 10 +++++++--- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/docs/reference/cluster_manifest.md b/docs/reference/cluster_manifest.md index ab20d0a21..842b50cf9 100644 --- a/docs/reference/cluster_manifest.md +++ b/docs/reference/cluster_manifest.md @@ -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. * **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 diff --git a/docs/reference/operator_parameters.md b/docs/reference/operator_parameters.md index 9d1973057..1627dd01a 100644 --- a/docs/reference/operator_parameters.md +++ b/docs/reference/operator_parameters.md @@ -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. * **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** Docker image for the pods of the cron job. Must implement backup/uploading logic. Default: empty. diff --git a/pkg/cluster/k8sres.go b/pkg/cluster/k8sres.go index 9db9ab7cc..0a47d84a2 100644 --- a/pkg/cluster/k8sres.go +++ b/pkg/cluster/k8sres.go @@ -1257,14 +1257,18 @@ func (c *Cluster) getClusterServiceConnectionParameters(clusterName string) (hos func (c *Cluster) generateLogicalBackupJob() (*batchv1beta1.CronJob, error) { var ( - err error - podTemplate *v1.PodTemplateSpec + err error + podTemplate *v1.PodTemplateSpec + resourceRequirements *v1.ResourceRequirements ) c.logger.Debug("Generating logical backup pod template") 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() logicalBackupContainer := generateSpiloContainer(