Make provider setting 'vddkInitImage' a const

Signed-off-by: Arik Hadas <[email protected]>
kubev2v · Jan 4, 2024 · 671c2cb · 671c2cb
1 parent a2ec605
commit 671c2cb
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 6 deletions.
diff --git a/pkg/apis/forklift/v1beta1/provider.go b/pkg/apis/forklift/v1beta1/provider.go
@@ -61,6 +61,11 @@ const (
 	Token = "token"
 )
 
+// Provider settings.
+const (
+	VDDK = "vddkInitImage"
+)
+
 // Defines the desired state of Provider.
 type ProviderSpec struct {
 	// Provider type.

diff --git a/pkg/controller/plan/adapter/vsphere/builder.go b/pkg/controller/plan/adapter/vsphere/builder.go
@@ -364,7 +364,7 @@ func (r *Builder) DataVolumes(vmRef ref.Ref, secret *core.Secret, _ *core.Config
 							URL:          url,
 							SecretRef:    secret.Name,
 							Thumbprint:   thumbprint,
-							InitImageURL: r.Source.Provider.Spec.Settings["vddkInitImage"],
+							InitImageURL: r.Source.Provider.Spec.Settings[api.VDDK],
 						},
 					}
 				}

diff --git a/pkg/controller/plan/kubevirt.go b/pkg/controller/plan/kubevirt.go
@@ -1291,7 +1291,7 @@ func (r *KubeVirt) guestConversionPod(vm *plan.VMStatus, vmVolumes []cnv.Volume,
 	}
 	// VDDK image
 	var initContainers []core.Container
-	if vddkImage, found := r.Source.Provider.Spec.Settings["vddkInitImage"]; found {
+	if vddkImage, found := r.Source.Provider.Spec.Settings[api.VDDK]; found {
 		initContainers = append(initContainers, core.Container{
 			Name:            "vddk-side-car",
 			Image:           vddkImage,

diff --git a/pkg/controller/plan/validation.go b/pkg/controller/plan/validation.go
@@ -691,7 +691,7 @@ func (r *Reconciler) validateVddkImage(plan *api.Plan) (err error) {
 		return nil
 	}
 
-	if _, found := source.Spec.Settings["vddkInitImage"]; !found {
+	if _, found := source.Spec.Settings[api.VDDK]; !found {
 		plan.Status.SetCondition(vddkNotConfigured)
 	}
 	return nil

diff --git a/pkg/forklift-api/webhooks/validating-webhook/admitters/plan-admitter.go b/pkg/forklift-api/webhooks/validating-webhook/admitters/plan-admitter.go
@@ -96,7 +96,7 @@ func (admitter *PlanAdmitter) validateVDDK() error {
 		return nil
 	}
 
-	if _, found := admitter.sourceProvider.Spec.Settings["vddkInitImage"]; !found {
+	if _, found := admitter.sourceProvider.Spec.Settings[api.VDDK]; !found {
 		err := liberr.New("VDDK image is necessary for this type of migration")
 		log.Error(err, "VDDK image required for this type of migration")
 		return err

diff --git a/pkg/forklift-api/webhooks/validating-webhook/admitters/provider-admitter.go b/pkg/forklift-api/webhooks/validating-webhook/admitters/provider-admitter.go
@@ -24,7 +24,7 @@ func (admitter *ProviderAdmitter) validateVDDK() error {
 		return nil
 	}
 
-	if _, found := admitter.provider.Spec.Settings["vddkInitImage"]; found {
+	if _, found := admitter.provider.Spec.Settings[api.VDDK]; found {
 		log.Info("VDDK image found, passing")
 		return nil
 	}

diff --git a/tests/suit/vsphere_test.go b/tests/suit/vsphere_test.go
@@ -38,7 +38,7 @@ var _ = Describe("[level:component]Migration tests for vSphere provider", func()
 		_, err = utils.WaitForProviderReadyWithTimeout(f.CrClient, namespace, utils.TargetProviderName, 30*time.Second)
 		Expect(err).ToNot(HaveOccurred())
 		By("Create vSphere provider")
-		pr := utils.NewProvider(vsphereProviderName, forkliftv1.VSphere, namespace, map[string]string{}, map[string]string{"vddkInitImage": "quay.io/kubev2v/vddk-test-vmdk"}, "https://vcsim.konveyor-forklift:8989/sdk", s)
+		pr := utils.NewProvider(vsphereProviderName, forkliftv1.VSphere, namespace, map[string]string{}, map[string]string{forkliftv1.VDDK: "quay.io/kubev2v/vddk-test-vmdk"}, "https://vcsim.konveyor-forklift:8989/sdk", s)
 		err = utils.CreateProviderFromDefinition(f.CrClient, pr)
 		Expect(err).ToNot(HaveOccurred())
 		provider, err := utils.WaitForProviderReadyWithTimeout(f.CrClient, namespace, vsphereProviderName, 30*time.Second)