Merge pull request #67 from cybertec-postgresql/change_log_start

Change log start

Author: Schmaetz

cmd/main.go

@@ -70,7 +70,7 @@ func main() {
 		log.SetFormatter(&log.JSONFormatter{})
 	}
 	log.SetOutput(os.Stdout)
-	log.Printf("Spilo operator %s\n", version)
+	log.Printf("CYBERTEC-pg-operator %s\n", version)
 
 	sigs := make(chan os.Signal, 1)
 	stop := make(chan struct{})

pkg/cluster/k8sres.go

@@ -3014,6 +3014,9 @@ func ensurePath(file string, defaultDir string, defaultFile string) string {
 
 func (c *Cluster) generatePgbackrestConfigmap() (*v1.ConfigMap, error) {
 	config := "[db]\npg1-path = /home/postgres/pgdata/pgroot/data\npg1-port = 5432\npg1-socket-path = /var/run/postgresql/\n"
+	if c.Postgresql.Spec.TDE != nil && c.Postgresql.Spec.TDE.Enable {
+		config += "pg-version-force=" + c.Spec.PgVersion + "\narchive-header-check=n\n"
+	}
 	config += "\n[global]\nlog-path = /home/postgres/pgdata/pgbackrest/log\nspool-path = /home/postgres/pgdata/pgbackrest/spool-path"
 
 	if c.Postgresql.Spec.Backup != nil && c.Postgresql.Spec.Backup.Pgbackrest != nil {
@@ -3110,6 +3113,9 @@ func (c *Cluster) generatePgbackrestRepoHostConfigmap() (*v1.ConfigMap, error) {
 				config += "\npg" + fmt.Sprintf("%d", j+1) + "-host-type = tls"
 				config += "\npg" + fmt.Sprintf("%d", j+1) + "-path = /home/postgres/pgdata/pgroot/data"
 			}
+			if c.Postgresql.Spec.TDE != nil && c.Postgresql.Spec.TDE.Enable {
+				config += "\npg-version-force=" + c.Spec.PgVersion + "\narchive-header-check=n\n"
+			}
 		}
 	}