add a prefix for the name of a logical backup job
This commit is contained in:
		
							parent
							
								
									a21504555b
								
							
						
					
					
						commit
						ac7813b47d
					
				| 
						 | 
					@ -259,6 +259,8 @@ configLogicalBackup:
 | 
				
			||||||
  logical_backup_s3_sse: "AES256"
 | 
					  logical_backup_s3_sse: "AES256"
 | 
				
			||||||
  # backup schedule in the cron format
 | 
					  # backup schedule in the cron format
 | 
				
			||||||
  logical_backup_schedule: "30 00 * * *"
 | 
					  logical_backup_schedule: "30 00 * * *"
 | 
				
			||||||
 | 
					  # prefix for the backup job name
 | 
				
			||||||
 | 
					  logical_backup_job_prefix: "logical-backup-"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# automate creation of human users with teams API service
 | 
					# automate creation of human users with teams API service
 | 
				
			||||||
configTeamsApi:
 | 
					configTeamsApi:
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -571,6 +571,9 @@ grouped under the `logical_backup` key.
 | 
				
			||||||
  S3 bucket to store backup results. The bucket has to be present and
 | 
					  S3 bucket to store backup results. The bucket has to be present and
 | 
				
			||||||
  accessible by Postgres pods. Default: empty.
 | 
					  accessible by Postgres pods. Default: empty.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					* **logical_backup_job_prefix**
 | 
				
			||||||
 | 
					  The prefix to be prepended to the name of a k8s CronJob running the backups. Beware the prefix counts towards the name length restrictions imposed by k8s. Empty string is a legitimate value. Operator does not do the actual renaming: If you change the prefix, you will have to recreate respective CronJobs manually. Default: "logical-backup-".
 | 
				
			||||||
 | 
					
 | 
				
			||||||
* **logical_backup_s3_region**
 | 
					* **logical_backup_s3_region**
 | 
				
			||||||
  Specifies the region of the bucket which is required with some non-AWS S3 storage services. The default is empty.
 | 
					  Specifies the region of the bucket which is required with some non-AWS S3 storage services. The default is empty.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -334,6 +334,8 @@ spec:
 | 
				
			||||||
                  logical_backup_schedule:
 | 
					                  logical_backup_schedule:
 | 
				
			||||||
                    type: string
 | 
					                    type: string
 | 
				
			||||||
                    pattern: '^(\d+|\*)(/\d+)?(\s+(\d+|\*)(/\d+)?){4}$'
 | 
					                    pattern: '^(\d+|\*)(/\d+)?(\s+(\d+|\*)(/\d+)?){4}$'
 | 
				
			||||||
 | 
					                  logical_backup_job_prefix:
 | 
				
			||||||
 | 
					                    type: string
 | 
				
			||||||
              debug:
 | 
					              debug:
 | 
				
			||||||
                type: object
 | 
					                type: object
 | 
				
			||||||
                properties:
 | 
					                properties:
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -125,6 +125,7 @@ configuration:
 | 
				
			||||||
    # logical_backup_s3_secret_access_key: ""
 | 
					    # logical_backup_s3_secret_access_key: ""
 | 
				
			||||||
    logical_backup_s3_sse: "AES256"
 | 
					    logical_backup_s3_sse: "AES256"
 | 
				
			||||||
    logical_backup_schedule: "30 00 * * *"
 | 
					    logical_backup_schedule: "30 00 * * *"
 | 
				
			||||||
 | 
					    logical_backup_job_prefix: "logical-backup-"
 | 
				
			||||||
  debug:
 | 
					  debug:
 | 
				
			||||||
    debug_logging: true
 | 
					    debug_logging: true
 | 
				
			||||||
    enable_database_access: true
 | 
					    enable_database_access: true
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -196,6 +196,7 @@ type OperatorLogicalBackupConfiguration struct {
 | 
				
			||||||
	S3SecretAccessKey            string `json:"logical_backup_s3_secret_access_key,omitempty"`
 | 
						S3SecretAccessKey            string `json:"logical_backup_s3_secret_access_key,omitempty"`
 | 
				
			||||||
	S3SSE                        string `json:"logical_backup_s3_sse,omitempty"`
 | 
						S3SSE                        string `json:"logical_backup_s3_sse,omitempty"`
 | 
				
			||||||
	GoogleApplicationCredentials string `json:"logical_backup_google_application_credentials,omitempty"`
 | 
						GoogleApplicationCredentials string `json:"logical_backup_google_application_credentials,omitempty"`
 | 
				
			||||||
 | 
						JobPrefix                    string `json:"logical_backup_job_prefix,omitempty"`
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
// OperatorConfigurationData defines the operation config
 | 
					// OperatorConfigurationData defines the operation config
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -2079,7 +2079,7 @@ func (c *Cluster) generateLogicalBackupPodEnvVars() []v1.EnvVar {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
// getLogicalBackupJobName returns the name; the job itself may not exists
 | 
					// getLogicalBackupJobName returns the name; the job itself may not exists
 | 
				
			||||||
func (c *Cluster) getLogicalBackupJobName() (jobName string) {
 | 
					func (c *Cluster) getLogicalBackupJobName() (jobName string) {
 | 
				
			||||||
	return "logical-backup-" + c.clusterName().Name
 | 
						return c.OpConfig.LogicalBackupJobPrefix + c.clusterName().Name
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
// Return an array of ownerReferences to make an arbitraty object dependent on
 | 
					// Return an array of ownerReferences to make an arbitraty object dependent on
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -154,6 +154,7 @@ func (c *Controller) importConfigurationFromCRD(fromCRD *acidv1.OperatorConfigur
 | 
				
			||||||
	result.LogicalBackupS3SecretAccessKey = fromCRD.LogicalBackup.S3SecretAccessKey
 | 
						result.LogicalBackupS3SecretAccessKey = fromCRD.LogicalBackup.S3SecretAccessKey
 | 
				
			||||||
	result.LogicalBackupS3SSE = fromCRD.LogicalBackup.S3SSE
 | 
						result.LogicalBackupS3SSE = fromCRD.LogicalBackup.S3SSE
 | 
				
			||||||
	result.LogicalBackupGoogleApplicationCredentials = fromCRD.LogicalBackup.GoogleApplicationCredentials
 | 
						result.LogicalBackupGoogleApplicationCredentials = fromCRD.LogicalBackup.GoogleApplicationCredentials
 | 
				
			||||||
 | 
						result.LogicalBackupJobPrefix = fromCRD.LogicalBackup.JobPrefix
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	// debug config
 | 
						// debug config
 | 
				
			||||||
	result.DebugLogging = fromCRD.OperatorDebug.DebugLogging
 | 
						result.DebugLogging = fromCRD.OperatorDebug.DebugLogging
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -121,6 +121,7 @@ type LogicalBackup struct {
 | 
				
			||||||
	LogicalBackupS3SecretAccessKey            string `name:"logical_backup_s3_secret_access_key" default:""`
 | 
						LogicalBackupS3SecretAccessKey            string `name:"logical_backup_s3_secret_access_key" default:""`
 | 
				
			||||||
	LogicalBackupS3SSE                        string `name:"logical_backup_s3_sse" default:""`
 | 
						LogicalBackupS3SSE                        string `name:"logical_backup_s3_sse" default:""`
 | 
				
			||||||
	LogicalBackupGoogleApplicationCredentials string `name:"logical_backup_google_application_credentials" default:""`
 | 
						LogicalBackupGoogleApplicationCredentials string `name:"logical_backup_google_application_credentials" default:""`
 | 
				
			||||||
 | 
						LogicalBackupJobPrefix                    string `name:"logical_backup_job_prefix" default:"logical-backup-"`
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
// Operator options for connection pooler
 | 
					// Operator options for connection pooler
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue