Skip to content

Commit

Permalink
Merge pull request #8968 from rook/mergify/bp/release-1.7/pr-8965
Browse files Browse the repository at this point in the history
ceph: add affinity to csi version check job (backport #8965)
  • Loading branch information
leseb committed Oct 14, 2021
2 parents 3088a6d + 3486514 commit 7aeb42e
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion pkg/operator/ceph/csi/spec.go
Expand Up @@ -726,8 +726,11 @@ func validateCSIVersion(clientset kubernetes.Interface, namespace, rookImage, se
job := versionReporter.Job()
job.Spec.Template.Spec.ServiceAccountName = serviceAccountName

// 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(clientset, provisionerTolerationsEnv, []corev1.Toleration{})
job.Spec.Template.Spec.Affinity = &corev1.Affinity{
NodeAffinity: getNodeAffinity(clientset, provisionerNodeAffinityEnv, &corev1.NodeAffinity{}),
}
stdout, _, retcode, err := versionReporter.Run(timeout)
if err != nil {
return nil, errors.Wrap(err, "failed to complete ceph CSI version job")
Expand Down

0 comments on commit 7aeb42e

Please sign in to comment.