From c1ef189b9199d57649cf47bcb5fc7d747ef13f9e Mon Sep 17 00:00:00 2001 From: Rakshith R Date: Wed, 13 Oct 2021 14:14:40 +0530 Subject: [PATCH] ceph: apply csi provisioner node-affinity to csi version check job This commit makes sure csi provisioner node-affinity is applied to the csi version check job as well, similar to the how the existing csi provisioner toleration is applied to the job. Fixes: #8323 Signed-off-by: Rakshith R --- pkg/operator/ceph/csi/spec.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkg/operator/ceph/csi/spec.go b/pkg/operator/ceph/csi/spec.go index 03776108d982..c7ef6591160d 100644 --- a/pkg/operator/ceph/csi/spec.go +++ b/pkg/operator/ceph/csi/spec.go @@ -640,8 +640,11 @@ func (r *ReconcileCSI) validateCSIVersion(ownerInfo *k8sutil.OwnerInfo) (*CephCS job := versionReporter.Job() job.Spec.Template.Spec.ServiceAccountName = r.opConfig.ServiceAccount - // Apply csi provisioner toleration for csi version check job + // Apply csi provisioner toleration and affinity for csi version check job job.Spec.Template.Spec.Tolerations = getToleration(r.opConfig.Parameters, provisionerTolerationsEnv, []corev1.Toleration{}) + job.Spec.Template.Spec.Affinity = &corev1.Affinity{ + NodeAffinity: getNodeAffinity(r.opConfig.Parameters, provisionerNodeAffinityEnv, &corev1.NodeAffinity{}), + } stdout, _, retcode, err := versionReporter.Run(timeout) if err != nil { return nil, errors.Wrap(err, "failed to complete ceph CSI version job")