lala

Author: noamasu

pkg/controller/dataimportcron-controller.go

@@ -368,7 +368,7 @@ func (r *DataImportCronReconciler) update(ctx context.Context, dataImportCron *c
 		if hasCurrent {
 			storageClassChanged = currentSc != desiredSc
 		} else {
-			storageClassChanged = len(dataImportCron.Status.CurrentImports) > 0
+			storageClassChanged = len(imports) > 0
 		}
 		if storageClassChanged {
 			r.log.Info("Storage class changed, deleting imports on old SC", "currentSc", currentSc, "desiredSc", desiredSc)

pkg/controller/dataimportcron-controller_test.go

@@ -1845,47 +1845,66 @@ var _ = Describe("All DataImportCron Tests", func() {
 			})
 
 			It("Should delete old DV and requeue when first default StorageClass is set", func() {
-				sp := &cdiv1.StorageProfile{
-					ObjectMeta: metav1.ObjectMeta{Name: storageClassName},
-				}
-				reconciler = createDataImportCronReconciler(sc, sp)
-
-				dvName, errDvName := createDvName(dataSourceName, testDigest)
-				Expect(errDvName).ToNot(HaveOccurred())
+				// Step 1: Create reconciler and DIC with no default SC
+				reconciler = createDataImportCronReconciler()
 				cron = newDataImportCron(cronName)
-				cc.AddAnnotation(cron, AnnSourceDesiredDigest, testDigest)
-				cron.Status = cdiv1.DataImportCronStatus{
-					CurrentImports: []cdiv1.ImportStatus{
-						{DataVolumeName: dvName, Digest: testDigest},
-					},
-				}
 				err := reconciler.client.Create(context.TODO(), cron)
 				Expect(err).ToNot(HaveOccurred())
 
-				dv := &cdiv1.DataVolume{
-					ObjectMeta: metav1.ObjectMeta{
-						Name:      dvName,
-						Namespace: metav1.NamespaceDefault,
-						Labels:    map[string]string{common.DataImportCronLabel: cronName},
-					},
-					Spec: cdiv1.DataVolumeSpec{
-						Source:  &cdiv1.DataVolumeSource{Registry: &cdiv1.DataVolumeSourceRegistry{URL: ptr.To(testRegistryURL)}},
-						Storage: &cdiv1.StorageSpec{},
-					},
+				cc.AddAnnotation(cron, AnnSourceDesiredDigest, testDigest)
+				err = reconciler.client.Update(context.TODO(), cron)
+				Expect(err).ToNot(HaveOccurred())
+				dataSource = &cdiv1.DataSource{}
+
+				// Reconcile creates a DV without any SC
+				_, err = reconciler.Reconcile(context.TODO(), cronReq)
+				Expect(err).ToNot(HaveOccurred())
+				err = reconciler.client.Get(context.TODO(), cronKey, cron)
+				Expect(err).ToNot(HaveOccurred())
+
+				imports := cron.Status.CurrentImports
+				Expect(imports).ToNot(BeEmpty())
+				oldDvName := imports[0].DataVolumeName
+
+				oldDv := &cdiv1.DataVolume{}
+				err = reconciler.client.Get(context.TODO(), dvKey(oldDvName), oldDv)
+				Expect(err).ToNot(HaveOccurred())
+				Expect(cron.Annotations).ToNot(HaveKey(AnnStorageClass))
+
+				// Step 2: Add a default SC
+				err = reconciler.client.Create(context.TODO(), sc)
+				Expect(err).ToNot(HaveOccurred())
+				sp := &cdiv1.StorageProfile{
+					ObjectMeta: metav1.ObjectMeta{Name: storageClassName},
 				}
-				err = reconciler.client.Create(context.TODO(), dv)
+				err = reconciler.client.Create(context.TODO(), sp)
 				Expect(err).ToNot(HaveOccurred())
 
+				// Reconcile detects nil-to-non-nil SC change, deletes old DV, requeues
 				res, err := reconciler.Reconcile(context.TODO(), cronReq)
 				Expect(err).ToNot(HaveOccurred())
 				Expect(res.RequeueAfter).To(Equal(time.Second))
 
-				err = reconciler.client.Get(context.TODO(), dvKey(dvName), dv)
+				err = reconciler.client.Get(context.TODO(), dvKey(oldDvName), oldDv)
 				Expect(k8serrors.IsNotFound(err)).To(BeTrue())
 
 				err = reconciler.client.Get(context.TODO(), cronKey, cron)
 				Expect(err).ToNot(HaveOccurred())
 				Expect(cron.Annotations[AnnStorageClass]).To(Equal(storageClassName))
+
+				// Step 3: Reconcile again creates a new DV
+				_, err = reconciler.Reconcile(context.TODO(), cronReq)
+				Expect(err).ToNot(HaveOccurred())
+
+				err = reconciler.client.Get(context.TODO(), cronKey, cron)
+				Expect(err).ToNot(HaveOccurred())
+				imports = cron.Status.CurrentImports
+				Expect(imports).ToNot(BeEmpty())
+				newDvName := imports[0].DataVolumeName
+
+				newDv := &cdiv1.DataVolume{}
+				err = reconciler.client.Get(context.TODO(), dvKey(newDvName), newDv)
+				Expect(err).ToNot(HaveOccurred())
 			})
 
 		})