Skip to content

Commit 708e991

Browse files
authored
Merge pull request #67 from cybertec-postgresql/change_log_start
Change log start
2 parents a9a0f78 + a85fd0c commit 708e991

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

cmd/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ func main() {
7070
log.SetFormatter(&log.JSONFormatter{})
7171
}
7272
log.SetOutput(os.Stdout)
73-
log.Printf("Spilo operator %s\n", version)
73+
log.Printf("CYBERTEC-pg-operator %s\n", version)
7474

7575
sigs := make(chan os.Signal, 1)
7676
stop := make(chan struct{})

pkg/cluster/k8sres.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3014,6 +3014,9 @@ func ensurePath(file string, defaultDir string, defaultFile string) string {
30143014

30153015
func (c *Cluster) generatePgbackrestConfigmap() (*v1.ConfigMap, error) {
30163016
config := "[db]\npg1-path = /home/postgres/pgdata/pgroot/data\npg1-port = 5432\npg1-socket-path = /var/run/postgresql/\n"
3017+
if c.Postgresql.Spec.TDE != nil && c.Postgresql.Spec.TDE.Enable {
3018+
config += "pg-version-force=" + c.Spec.PgVersion + "\narchive-header-check=n\n"
3019+
}
30173020
config += "\n[global]\nlog-path = /home/postgres/pgdata/pgbackrest/log\nspool-path = /home/postgres/pgdata/pgbackrest/spool-path"
30183021

30193022
if c.Postgresql.Spec.Backup != nil && c.Postgresql.Spec.Backup.Pgbackrest != nil {
@@ -3110,6 +3113,9 @@ func (c *Cluster) generatePgbackrestRepoHostConfigmap() (*v1.ConfigMap, error) {
31103113
config += "\npg" + fmt.Sprintf("%d", j+1) + "-host-type = tls"
31113114
config += "\npg" + fmt.Sprintf("%d", j+1) + "-path = /home/postgres/pgdata/pgroot/data"
31123115
}
3116+
if c.Postgresql.Spec.TDE != nil && c.Postgresql.Spec.TDE.Enable {
3117+
config += "\npg-version-force=" + c.Spec.PgVersion + "\narchive-header-check=n\n"
3118+
}
31133119
}
31143120
}
31153121

0 commit comments

Comments
 (0)