diff --git a/manifests/configmap.yaml b/manifests/configmap.yaml index 0519cc6ce..3ab1a049f 100644 --- a/manifests/configmap.yaml +++ b/manifests/configmap.yaml @@ -55,4 +55,4 @@ data: # enable_logical_backup: "true" # logical_backup_schedule: "30 00 * * *" - # logical_backup_docker_image: registry.opensource.zalan.do/acid/logical-backup:master-42 + logical_backup_image: registry.opensource.zalan.do/acid/logical-backup:master-42 diff --git a/pkg/cluster/k8sres.go b/pkg/cluster/k8sres.go index a4b5cf2ca..8eeec4988 100644 --- a/pkg/cluster/k8sres.go +++ b/pkg/cluster/k8sres.go @@ -1254,7 +1254,7 @@ func (c *Cluster) getClusterServiceConnectionParameters(clusterName string) (hos return } -func (c *Cluster) generateCronJob() (*batchv1beta1.CronJob, error) { +func (c *Cluster) generateLogicalBackupJob() (*batchv1beta1.CronJob, error) { var ( err error @@ -1293,6 +1293,10 @@ func (c *Cluster) generateCronJob() (*batchv1beta1.CronJob, error) { return nil, fmt.Errorf("could not generate pod template for logical backup cron job: %v", err) } + // pods of k8s jobs support only "OnFailure" or "Never" + // but the default is "Always" + podTemplate.Spec.RestartPolicy = "OnFailure" + jobSpec := batchv1.JobSpec{Template: *podTemplate} jobTemplateSpec := batchv1beta1.JobTemplateSpec{ @@ -1306,7 +1310,7 @@ func (c *Cluster) generateCronJob() (*batchv1beta1.CronJob, error) { cronJob := &batchv1beta1.CronJob{ ObjectMeta: metav1.ObjectMeta{ - Name: "logical-backup-" + c.clusterName().String(), + Name: "logical-backup-" + c.clusterName().Namespace + "-" + c.clusterName().Name, Namespace: c.Namespace, Labels: c.labelsSet(true), }, diff --git a/pkg/cluster/resources.go b/pkg/cluster/resources.go index 20037329f..27508f8fa 100644 --- a/pkg/cluster/resources.go +++ b/pkg/cluster/resources.go @@ -613,7 +613,7 @@ func (c *Cluster) createBackupCronJob() (err error) { c.setProcessName("creating a k8s cron job for logical backups") - cronJobSpec, err := c.generateCronJob() + cronJobSpec, err := c.generateLogicalBackupJob() if err != nil { return fmt.Errorf("could not generate k8s cron job spec: %v", err) }