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

minor bug fixes

This commit is contained in:
Sergey Dudoladov 2019-04-03 13:31:24 +02:00
parent 99a3712422
commit 2f12c89f0e
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/configmap.yaml
View File

@ -55,4 +55,4 @@ data:
# enable_logical_backup: "true" # enable_logical_backup: "true"
# logical_backup_schedule: "30 00 * * *" # 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

8
pkg/cluster/k8sres.go
View File

@ -1254,7 +1254,7 @@ func (c *Cluster) getClusterServiceConnectionParameters(clusterName string) (hos
return return
} }
func (c *Cluster) generateCronJob() (*batchv1beta1.CronJob, error) { func (c *Cluster) generateLogicalBackupJob() (*batchv1beta1.CronJob, error) {
var ( var (
err error 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) 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} jobSpec := batchv1.JobSpec{Template: *podTemplate}
jobTemplateSpec := batchv1beta1.JobTemplateSpec{ jobTemplateSpec := batchv1beta1.JobTemplateSpec{
@ -1306,7 +1310,7 @@ func (c *Cluster) generateCronJob() (*batchv1beta1.CronJob, error) {
cronJob := &batchv1beta1.CronJob{ cronJob := &batchv1beta1.CronJob{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Name: "logical-backup-" + c.clusterName().String(), Name: "logical-backup-" + c.clusterName().Namespace + "-" + c.clusterName().Name,
Namespace: c.Namespace, Namespace: c.Namespace,
Labels: c.labelsSet(true), Labels: c.labelsSet(true),
}, },

2
pkg/cluster/resources.go
View File

@ -613,7 +613,7 @@ func (c *Cluster) createBackupCronJob() (err error) {
c.setProcessName("creating a k8s cron job for logical backups") c.setProcessName("creating a k8s cron job for logical backups")
cronJobSpec, err := c.generateCronJob() cronJobSpec, err := c.generateLogicalBackupJob()
if err != nil { if err != nil {
return fmt.Errorf("could not generate k8s cron job spec: %v", err) return fmt.Errorf("could not generate k8s cron job spec: %v", err)
} }