test: revamp vgmanager unit test

openshift · Sep 22, 2023 · e9ba448 · e9ba448
1 parent a518d55
commit e9ba448
Show file tree

Hide file tree

Showing 5 changed files with 312 additions and 341 deletions.
diff --git a/cmd/operator/operator.go b/cmd/operator/operator.go
@@ -184,8 +184,7 @@ func run(cmd *cobra.Command, _ []string, opts *Options) error {
 		return fmt.Errorf("unable to create LVMCluster webhook: %w", err)
 	}
 	if err = (&lvmv1alpha1.LVMVolumeGroup{}).SetupWebhookWithManager(mgr); err != nil {
-		setupLog.Error(err, "unable to create webhook", "webhook", "LVMVolumeGroup  ")
-		os.Exit(1)
+		return fmt.Errorf("unable to create LVMVolumeGroup webhoook: %w", err)
 	}
 
 	pvController := persistent_volume.NewPersistentVolumeReconciler(mgr.GetClient(), mgr.GetAPIReader(), mgr.GetEventRecorderFor("lvms-pv-controller"))

diff --git a/go.mod b/go.mod
@@ -20,6 +20,7 @@ require (
 	go.uber.org/zap v1.26.0
 	gotest.tools/v3 v3.5.1
 	k8s.io/api v0.28.2
+	k8s.io/apiextensions-apiserver v0.28.2
 	k8s.io/apimachinery v0.28.2
 	k8s.io/client-go v0.28.2
 	k8s.io/component-helpers v0.28.2
@@ -99,7 +100,6 @@ require (
 	gopkg.in/ini.v1 v1.66.2 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	k8s.io/apiextensions-apiserver v0.28.2 // indirect
 	k8s.io/component-base v0.28.2 // indirect
 	k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
 	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect

diff --git a/pkg/vgmanager/suite_test.go b/pkg/vgmanager/suite_test.go
diff --git a/pkg/vgmanager/vgmanager_controller.go b/pkg/vgmanager/vgmanager_controller.go
@@ -155,11 +155,10 @@ func (r *VGReconciler) reconcile(
 		}
 		return ctrl.Result{}, err
 	}
+
+	lvmdConfigWasMissing := false
 	if lvmdConfig == nil {
-		// The lvmdconfig file does not exist and will be created.
-		msg := "lvmd config file doesn't exist, will attempt to create a fresh config"
-		logger.Info(msg)
-		r.NormalEvent(ctx, volumeGroup, EventReasonLVMDConfigMissing, msg)
+		lvmdConfigWasMissing = true
 		lvmdConfig = &lvmd.Config{
 			SocketName: controllers.DefaultLVMdSocket,
 		}
@@ -296,6 +295,13 @@ func (r *VGReconciler) reconcile(
 
 	// Apply and save lvmd config
 	if !cmp.Equal(existingLvmdConfig, lvmdConfig) {
+		if lvmdConfigWasMissing {
+			// The lvmdconfig file does not exist and will be created.
+			msg := "lvmd config file doesn't exist, will attempt to create a fresh config"
+			logger.Info(msg)
+			r.NormalEvent(ctx, volumeGroup, EventReasonLVMDConfigMissing, msg)
+		}
+
 		if err := r.LVMD.Save(lvmdConfig); err != nil {
 			err := fmt.Errorf("failed to update lvmd config file to update volume group %s: %w", volumeGroup.GetName(), err)
 			if _, err := r.setVolumeGroupFailedStatus(ctx, volumeGroup, devices, err); err != nil {