fix(upgrade): jobs inherit more settings from final StatefulSet

k-web-s · Mar 23, 2024 · 051aaec · 051aaec
1 parent 40a7b11
commit 051aaec
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/private/upgrade/primary.go b/private/upgrade/primary.go
@@ -158,8 +158,11 @@ func (primaryUpgradeHandler) handle(ctx pcontext.Context, p *v1alpha1.PatroniPos
 								},
 							},
 						},
-						RestartPolicy:   v1.RestartPolicyOnFailure,
-						SecurityContext: security.DatabasePodSecurityContext,
+						RestartPolicy:    v1.RestartPolicyOnFailure,
+						SecurityContext:  security.DatabasePodSecurityContext,
+						ImagePullSecrets: p.Spec.ImagePullSecrets,
+						NodeSelector:     p.Spec.NodeSelector,
+						Tolerations:      p.Spec.Tolerations,
 					},
 				},
 			},

diff --git a/private/upgrade/secondary-client.go b/private/upgrade/secondary-client.go
@@ -112,8 +112,11 @@ func upgradeSecondariesEnsureseclients(ctx pcontext.Context, p *v1alpha1.Patroni
 									},
 								},
 							},
-							RestartPolicy:   v1.RestartPolicyOnFailure,
-							SecurityContext: security.DatabasePodSecurityContext,
+							RestartPolicy:    v1.RestartPolicyOnFailure,
+							SecurityContext:  security.DatabasePodSecurityContext,
+							ImagePullSecrets: p.Spec.ImagePullSecrets,
+							NodeSelector:     p.Spec.NodeSelector,
+							Tolerations:      p.Spec.Tolerations,
 						},
 					},
 				},

diff --git a/private/upgrade/secondary-stream.go b/private/upgrade/secondary-stream.go
@@ -118,7 +118,10 @@ func upgradeSecondariesEnsurestreamer(ctx pcontext.Context, p *v1alpha1.PatroniP
 								},
 							},
 						},
-						SecurityContext: security.DatabasePodSecurityContext,
+						SecurityContext:  security.DatabasePodSecurityContext,
+						ImagePullSecrets: p.Spec.ImagePullSecrets,
+						NodeSelector:     p.Spec.NodeSelector,
+						Tolerations:      p.Spec.Tolerations,
 					},
 				},
 			},