Skip to content

Commit f810ad4

Browse files
pooknullhors
andauthored
WIP: set affinity for patroni-version-check pod (#1229)
Co-authored-by: Viacheslav Sarzhan <slava.sarzhan@percona.com>
1 parent 74b1d76 commit f810ad4

File tree

2 files changed

+20
-0
lines changed

2 files changed

+20
-0
lines changed

percona/controller/pgcluster/controller.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -442,6 +442,7 @@ func (r *PGClusterReconciler) reconcilePatroniVersionCheck(ctx context.Context,
442442
},
443443
},
444444
SecurityContext: cr.Spec.InstanceSets[0].SecurityContext,
445+
Affinity: cr.Spec.InstanceSets[0].Affinity,
445446
TerminationGracePeriodSeconds: ptr.To(int64(5)),
446447
ImagePullSecrets: cr.Spec.ImagePullSecrets,
447448
Resources: &corev1.ResourceRequirements{

percona/controller/pgcluster/controller_test.go

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1613,6 +1613,15 @@ var _ = Describe("patroni version check", Ordered, func() {
16131613
cr2.Spec.InstanceSets[0].SecurityContext = &corev1.PodSecurityContext{
16141614
RunAsUser: &uid,
16151615
}
1616+
cr2.Spec.InstanceSets[0].Affinity = &corev1.Affinity{
1617+
NodeAffinity: &corev1.NodeAffinity{
1618+
PreferredDuringSchedulingIgnoredDuringExecution: []corev1.PreferredSchedulingTerm{
1619+
{
1620+
Weight: int32(1),
1621+
},
1622+
},
1623+
},
1624+
}
16161625
cr2.Spec.ImagePullSecrets = []corev1.LocalObjectReference{
16171626
{Name: "test-pull-secret"},
16181627
}
@@ -1683,10 +1692,20 @@ var _ = Describe("patroni version check", Ordered, func() {
16831692
expectedImagePullSecrets := []corev1.LocalObjectReference{
16841693
{Name: "test-pull-secret"},
16851694
}
1695+
expectedAffinity := &corev1.Affinity{
1696+
NodeAffinity: &corev1.NodeAffinity{
1697+
PreferredDuringSchedulingIgnoredDuringExecution: []corev1.PreferredSchedulingTerm{
1698+
{
1699+
Weight: int32(1),
1700+
},
1701+
},
1702+
},
1703+
}
16861704

16871705
Expect(pod.Spec.SecurityContext).To(Equal(expectedSecurityContext))
16881706
Expect(pod.Spec.TerminationGracePeriodSeconds).To(Equal(ptr.To(int64(5))))
16891707
Expect(pod.Spec.ImagePullSecrets).To(Equal(expectedImagePullSecrets))
1708+
Expect(pod.Spec.Affinity).To(Equal(expectedAffinity))
16901709
})
16911710

16921711
It("should preserve existing patroni version in annotation", func() {

0 commit comments

Comments
 (0)