@@ -943,23 +943,23 @@ func generateBackupJobSpecIntent(ctx context.Context, postgresCluster *v1beta1.P
943943 if postgresCluster .Spec .Backups .PGBackRest .Jobs .BackoffLimit != nil {
944944 jobSpec .BackoffLimit = postgresCluster .Spec .Backups .PGBackRest .Jobs .BackoffLimit
945945 }
946+ }
946947
947- // K8SPG-833
948- if postgresCluster .CompareVersion ("2.8.0" ) >= 0 {
949- for i := range jobSpec .Template .Spec .Containers {
950- pgbackrest := postgresCluster .Spec .Backups .PGBackRest
948+ // K8SPG-833
949+ if postgresCluster .CompareVersion ("2.8.0" ) >= 0 {
950+ for i := range jobSpec .Template .Spec .Containers {
951+ pgbackrest := postgresCluster .Spec .Backups .PGBackRest
951952
952- if len (pgbackrest .Manual .Env ) != 0 {
953- jobSpec .Template .Spec .Containers [i ].Env = append (jobSpec .Template .Spec .Containers [i ].Env , pgbackrest .Manual .Env ... )
954- } else if len (pgbackrest .Env ) != 0 {
955- jobSpec .Template .Spec .Containers [i ].Env = append (jobSpec .Template .Spec .Containers [i ].Env , pgbackrest .Env ... )
956- }
953+ if pgbackrest . Manual != nil && len (pgbackrest .Manual .Env ) != 0 {
954+ jobSpec .Template .Spec .Containers [i ].Env = append (jobSpec .Template .Spec .Containers [i ].Env , pgbackrest .Manual .Env ... )
955+ } else if len (pgbackrest .Env ) != 0 {
956+ jobSpec .Template .Spec .Containers [i ].Env = append (jobSpec .Template .Spec .Containers [i ].Env , pgbackrest .Env ... )
957+ }
957958
958- if len (pgbackrest .Manual .EnvFrom ) != 0 {
959- jobSpec .Template .Spec .Containers [i ].EnvFrom = append (jobSpec .Template .Spec .Containers [i ].EnvFrom , pgbackrest .Manual .EnvFrom ... )
960- } else if len (pgbackrest .EnvFrom ) != 0 {
961- jobSpec .Template .Spec .Containers [i ].EnvFrom = append (jobSpec .Template .Spec .Containers [i ].EnvFrom , pgbackrest .EnvFrom ... )
962- }
959+ if pgbackrest .Manual != nil && len (pgbackrest .Manual .EnvFrom ) != 0 {
960+ jobSpec .Template .Spec .Containers [i ].EnvFrom = append (jobSpec .Template .Spec .Containers [i ].EnvFrom , pgbackrest .Manual .EnvFrom ... )
961+ } else if len (pgbackrest .EnvFrom ) != 0 {
962+ jobSpec .Template .Spec .Containers [i ].EnvFrom = append (jobSpec .Template .Spec .Containers [i ].EnvFrom , pgbackrest .EnvFrom ... )
963963 }
964964 }
965965 }
@@ -1475,13 +1475,13 @@ func (r *Reconciler) generateRestoreJobIntent(cluster *v1beta1.PostgresCluster,
14751475 for i := range job .Spec .Template .Spec .Containers {
14761476 pgbackrest := cluster .Spec .Backups .PGBackRest
14771477
1478- if len (pgbackrest .Manual .Env ) != 0 {
1478+ if pgbackrest . Restore != nil && len (pgbackrest .Restore .Env ) != 0 {
14791479 job .Spec .Template .Spec .Containers [i ].Env = append (job .Spec .Template .Spec .Containers [i ].Env , pgbackrest .Restore .Env ... )
14801480 } else if len (pgbackrest .Env ) != 0 {
14811481 job .Spec .Template .Spec .Containers [i ].Env = append (job .Spec .Template .Spec .Containers [i ].Env , pgbackrest .Env ... )
14821482 }
14831483
1484- if len (pgbackrest .Manual .EnvFrom ) != 0 {
1484+ if pgbackrest . Restore != nil && len (pgbackrest .Restore .EnvFrom ) != 0 {
14851485 job .Spec .Template .Spec .Containers [i ].EnvFrom = append (job .Spec .Template .Spec .Containers [i ].EnvFrom , pgbackrest .Restore .EnvFrom ... )
14861486 } else if len (pgbackrest .EnvFrom ) != 0 {
14871487 job .Spec .Template .Spec .Containers [i ].EnvFrom = append (job .Spec .Template .Spec .Containers [i ].EnvFrom , pgbackrest .EnvFrom ... )
0 commit comments