feat(backup): Add timezone parameter for logical backup cronjob

charts/postgres-operator/crds/operatorconfigurations.yaml

@@ -526,6 +526,8 @@ spec:
                     type: string
                     pattern: '^(\d+|\*)(/\d+)?(\s+(\d+|\*)(/\d+)?){4}$'
                     default: "30 00 * * *"
+                  logical_backup_timezone:
+                    type: string
               debug:
                 type: object
                 properties:

charts/postgres-operator/crds/postgresqls.yaml

@@ -218,6 +218,8 @@ spec:
               logicalBackupSchedule:
                 type: string
                 pattern: '^(\d+|\*)(/\d+)?(\s+(\d+|\*)(/\d+)?){4}$'
+              logicalBackupTimezone:
+                type: string
               maintenanceWindows:
                 type: array
                 items:

charts/postgres-operator/values.yaml

@@ -372,6 +372,8 @@ configLogicalBackup:
   logical_backup_s3_retention_time: ""
   # backup schedule in the cron format
   logical_backup_schedule: "30 00 * * *"
+  # backup cronjob timezone in the timezone format, for example "Etc/UTC"
+  logical_backup_timezone: ""
 
 # automate creation of human users with teams API service
 configTeamsApi:

docs/reference/operator_parameters.md

@@ -825,6 +825,11 @@ grouped under the `logical_backup` key.
   [reference schedule format](https://kubernetes.io/docs/tasks/job/automated-tasks-with-cron-jobs/#schedule)
   into account. Default: "30 00 \* \* \*"
 
+* **logical_backup_timezone**
+  Backup timezone in the timezone format. Please take the
+  [reference timezone format](https://kubernetes.io/docs/concepts/workloads/controllers/cron-jobs/#time-zones)
+  into account. The default is empty.
+
 ## Debugging the operator
 
 Options to aid debugging of the operator itself. Grouped under the `debug` key.

manifests/configmap.yaml

@@ -94,6 +94,7 @@ data:
   logical_backup_s3_sse: "AES256"
   # logical_backup_s3_retention_time: ""
   logical_backup_schedule: "30 00 * * *"
+  # logical_backup_timezone: ""
   major_version_upgrade_mode: "manual"
   # major_version_upgrade_team_allow_list: ""
   master_dns_name_format: "{cluster}.{namespace}.{hostedzone}"

manifests/operatorconfiguration.crd.yaml

@@ -524,6 +524,8 @@ spec:
                     type: string
                     pattern: '^(\d+|\*)(/\d+)?(\s+(\d+|\*)(/\d+)?){4}$'
                     default: "30 00 * * *"
+                  logical_backup_timezone:
+                    type: string
               debug:
                 type: object
                 properties:

manifests/postgresql-operator-default-configuration.yaml

@@ -172,6 +172,7 @@ configuration:
     logical_backup_s3_sse: "AES256"
     # logical_backup_s3_retention_time: ""
     logical_backup_schedule: "30 00 * * *"
+    # logical_backup_timezone: ""
   debug:
     debug_logging: true
     enable_database_access: true

pkg/apis/acid.zalan.do/v1/crds.go

@@ -1713,6 +1713,9 @@ var OperatorConfigCRDResourceValidation = apiextv1.CustomResourceValidation{
 								Type:    "string",
 								Pattern: "^(\\d+|\\*)(/\\d+)?(\\s+(\\d+|\\*)(/\\d+)?){4}$",
 							},
+							"logical_backup_timezone": {
+								Type: "string",
+							},
 						},
 					},
 					"debug": {

pkg/apis/acid.zalan.do/v1/operator_configuration_type.go

@@ -218,6 +218,7 @@ type ConnectionPoolerConfiguration struct {
 // OperatorLogicalBackupConfiguration defines configuration for logical backup
 type OperatorLogicalBackupConfiguration struct {
 	Schedule                     string `json:"logical_backup_schedule,omitempty"`
+	Timezone                     string `json:"logical_backup_timezone,omitempty"`
 	DockerImage                  string `json:"logical_backup_docker_image,omitempty"`
 	BackupProvider               string `json:"logical_backup_provider,omitempty"`
 	AzureStorageAccountName      string `json:"logical_backup_azure_storage_account_name,omitempty"`

pkg/apis/acid.zalan.do/v1/postgresql_type.go

@@ -76,6 +76,7 @@ type PostgresSpec struct {
 	ShmVolume             *bool                       `json:"enableShmVolume,omitempty"`
 	EnableLogicalBackup   bool                        `json:"enableLogicalBackup,omitempty"`
 	LogicalBackupSchedule string                      `json:"logicalBackupSchedule,omitempty"`
+	LogicalBackupTimezone string                      `json:"logicalBackupTimezone,omitempty"`
 	StandbyCluster        *StandbyDescription         `json:"standby,omitempty"`
 	PodAnnotations        map[string]string           `json:"podAnnotations,omitempty"`
 	ServiceAnnotations    map[string]string           `json:"serviceAnnotations,omitempty"`

pkg/cluster/k8sres.go

@@ -2258,6 +2258,15 @@ func (c *Cluster) generateLogicalBackupJob() (*batchv1.CronJob, error) {
 		},
 	}
 
+	timezone := c.Postgresql.Spec.LogicalBackupTimezone
+	if timezone == "" {
+		timezone = c.OpConfig.LogicalBackupTimezone
+	}
+
+	if timezone != "" {
+		cronJob.Spec.TimeZone = &timezone
+	}
+
 	return cronJob, nil
 }
 

pkg/util/config/config.go

@@ -126,6 +126,7 @@ type Scalyr struct {
 // LogicalBackup defines configuration for logical backup
 type LogicalBackup struct {
 	LogicalBackupSchedule                     string `name:"logical_backup_schedule" default:"30 00 * * *"`
+	LogicalBackupTimezone                     string `name:"logical_backup_timezone" default:""`
 	LogicalBackupDockerImage                  string `name:"logical_backup_docker_image" default:"registry.opensource.zalan.do/acid/logical-backup:v1.10.0"`
 	LogicalBackupProvider                     string `name:"logical_backup_provider" default:"s3"`
 	LogicalBackupAzureStorageAccountName      string `name:"logical_backup_azure_storage_account_name" default:""`