dataimportcron: add nodeSelector when architecture is specified (#3908)

For pullMethod: node imports, the poller pod that's created lacked an
architecture nodeSelector in the event that an architecture specific
import was required.

Signed-off-by: Adi Aloni <[email protected]>
Co-authored-by: Adi Aloni <[email protected]>

Author: kubevirt-bot

pkg/controller/dataimportcron-controller.go

@@ -657,6 +657,10 @@ func (r *DataImportCronReconciler) updateContainerImageDesiredDigest(ctx context
 	if err != nil {
 		return false, err
 	}
+	platform := cron.Spec.Template.Spec.Source.Registry.Platform
+	if platform != nil && platform.Architecture != "" {
+		workloadNodePlacement.NodeSelector[corev1.LabelArchStable] = platform.Architecture
+	}
 
 	containerImage := strings.TrimPrefix(*cron.Spec.Template.Spec.Source.Registry.URL, "docker://")
 

tests/dataimportcron_test.go

@@ -436,6 +436,27 @@ var _ = Describe("DataImportCron", Serial, func() {
 		waitForDigest()
 	})
 
+	It("Should add an appropriate node selector to poller when specfiying architecture with pullMethod node", func() {
+		By("Create DataImportCron with only initial poller job")
+		cron = utils.NewDataImportCron(cronName, "1Gi", scheduleOnceAYear, dataSourceName, importsToKeep, *reg)
+		retentionPolicy := cdiv1.DataImportCronRetainNone
+		cron.Spec.RetentionPolicy = &retentionPolicy
+		cron.Spec.Template.Spec.Source.Registry.Platform = &cdiv1.PlatformOptions{Architecture: "test"}
+
+		cron, err := f.CdiClient.CdiV1beta1().DataImportCrons(ns).Create(context.TODO(), cron, metav1.CreateOptions{})
+		Expect(err).ToNot(HaveOccurred())
+
+		By("Ensuring that nodeSelector was added")
+		pollerPodName := fmt.Sprintf("poller-%s-%s", cron.Name, cron.UID[:8])
+		Eventually(func() bool {
+			pollerPod, err := f.K8sClient.CoreV1().Pods(cron.Namespace).Get(context.TODO(), pollerPodName, metav1.GetOptions{})
+			if err != nil {
+				return false
+			}
+			return pollerPod.Spec.NodeSelector[corev1.LabelArchStable] == "test"
+		}, dataImportCronTimeout, pollInterval).Should(BeTrue())
+	})
+
 	It("[test_id:10360] Should allow an empty schedule to trigger an external update to the source", func() {
 		configureStorageProfileResultingFormat(cdiv1.DataImportCronSourceFormatPvc)