OCPVE-309: Remove commented code

api/v1alpha1/webhook_suite_test.go

@@ -25,7 +25,7 @@ import (
 	"testing"
 	"time"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
 	admissionv1beta1 "k8s.io/api/admission/v1beta1"
@@ -35,7 +35,6 @@ import (
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/envtest"
-	"sigs.k8s.io/controller-runtime/pkg/envtest/printer"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 )
@@ -51,10 +50,6 @@ var cancel context.CancelFunc
 
 func TestAPIs(t *testing.T) {
 	RegisterFailHandler(Fail)
-
-	RunSpecsWithDefaultAndCustomReporters(t,
-		"Webhook Suite",
-		[]Reporter{printer.NewlineReporter{}})
 }
 
 var _ = BeforeSuite(func() {
@@ -125,7 +120,7 @@ var _ = BeforeSuite(func() {
 		return nil
 	}).Should(Succeed())
 
-}, 60)
+})
 
 var _ = AfterSuite(func() {
 	cancel()

controllers/lvm_volumegroup.go

@@ -115,11 +115,6 @@ func (c lvmVG) ensureDeleted(r *LVMClusterReconciler, ctx context.Context, lvmCl
 	return nil
 }
 
-func (c lvmVG) updateStatus(r *LVMClusterReconciler, ctx context.Context, lvmCluster *lvmv1alpha1.LVMCluster) error {
-	// intentionally empty
-	return nil
-}
-
 func (c lvmVG) getLvmVolumeGroups(r *LVMClusterReconciler, instance *lvmv1alpha1.LVMCluster) []*lvmv1alpha1.LVMVolumeGroup {
 
 	lvmVolumeGroups := []*lvmv1alpha1.LVMVolumeGroup{}

controllers/lvmcluster_controller.go

@@ -48,6 +48,19 @@ const (
 	openshiftSCCPrivilegedName = "privileged"
 )
 
+// NOTE: when updating this, please also update docs/design/lvm-operator-manager.md
+type resourceManager interface {
+
+	// getName should return a camelCase name of this unit of reconciliation
+	getName() string
+
+	// ensureCreated should check the resources managed by this unit
+	ensureCreated(*LVMClusterReconciler, context.Context, *lvmv1alpha1.LVMCluster) error
+
+	// ensureDeleted should wait for the resources to be cleaned up
+	ensureDeleted(*LVMClusterReconciler, context.Context, *lvmv1alpha1.LVMCluster) error
+}
+
 type ClusterType string
 
 const (
@@ -199,23 +212,6 @@ func (r *LVMClusterReconciler) reconcile(ctx context.Context, instance *lvmv1alp
 		}
 	}
 
-	/* 	// check  and report deployment status
-	   	var failedStatusUpdates []string
-	   	var lastError error
-	   	for _, unit := range resourceList {
-	   		err := unit.updateStatus(r, ctx, instance)
-	   		if err != nil {
-	   			failedStatusUpdates = append(failedStatusUpdates, unit.getName())
-	   			unitError := fmt.Errorf("failed updating status for: %s %w", unit.getName(), err)
-	   			r.Log.Error(unitError, "")
-	   		}
-	   	} */
-	/* 	// return simple message that will fit in status reconcileSucceeded condition, don't put all the errors there
-	   	if len(failedStatusUpdates) > 0 {
-	   		return ctrl.Result{}, fmt.Errorf("status update failed for %s: %w", strings.Join(failedStatusUpdates, ","), lastError)
-	   	}
-	*/
-
 	r.Log.Info("successfully reconciled LvmCluster")
 
 	return ctrl.Result{}, nil
@@ -335,25 +331,6 @@ func (r *LVMClusterReconciler) getExpectedVgCount(ctx context.Context, instance
 	return vgCount, nil
 }
 
-// NOTE: when updating this, please also update docs/design/lvm-operator-manager.md
-type resourceManager interface {
-
-	// getName should return a camelCase name of this unit of reconciliation
-	getName() string
-
-	// ensureCreated should check the resources managed by this unit
-	ensureCreated(*LVMClusterReconciler, context.Context, *lvmv1alpha1.LVMCluster) error
-
-	// ensureDeleted should wait for the resources to be cleaned up
-	ensureDeleted(*LVMClusterReconciler, context.Context, *lvmv1alpha1.LVMCluster) error
-
-	// updateStatus should optionally update the CR's status about the health of the managed resource
-	// each unit will have updateStatus called individually so
-	// avoid status fields like lastHeartbeatTime and have a
-	// status that changes only when the operands change.
-	updateStatus(*LVMClusterReconciler, context.Context, *lvmv1alpha1.LVMCluster) error
-}
-
 // checkIfOpenshift checks to see if the operator is running on an OCP cluster.
 // It does this by querying for the "privileged" SCC which exists on all OCP clusters.
 func (r *LVMClusterReconciler) checkIfOpenshift(ctx context.Context) error {

controllers/lvmcluster_controller_integration_test.go

@@ -20,7 +20,7 @@ import (
 	"context"
 	"time"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	lvmv1alpha1 "github.com/openshift/lvm-operator/api/v1alpha1"
 	appsv1 "k8s.io/api/apps/v1"

controllers/scc.go

@@ -86,11 +86,6 @@ func (c openshiftSccs) ensureDeleted(r *LVMClusterReconciler, ctx context.Contex
 	return nil
 }
 
-func (c openshiftSccs) updateStatus(r *LVMClusterReconciler, ctx context.Context, lvmCluster *lvmv1alpha1.LVMCluster) error {
-	// intentionally empty
-	return nil
-}
-
 func getAllSCCs(namespace string) []*secv1.SecurityContextConstraints {
 	return []*secv1.SecurityContextConstraints{
 		newTopolvmNodeScc(namespace),

controllers/suite_test.go

@@ -21,15 +21,14 @@ import (
 	"path/filepath"
 	"testing"
 
-	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/client-go/kubernetes/scheme"
 	"k8s.io/client-go/rest"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/envtest"
-	"sigs.k8s.io/controller-runtime/pkg/envtest/printer"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 
@@ -53,10 +52,6 @@ var (
 
 func TestAPIs(t *testing.T) {
 	RegisterFailHandler(Fail)
-
-	RunSpecsWithDefaultAndCustomReporters(t,
-		"Controller Suite",
-		[]Reporter{printer.NewlineReporter{}})
 }
 
 const (
@@ -128,7 +123,7 @@ var _ = BeforeSuite(func() {
 		Expect(err).ToNot(HaveOccurred(), "failed to run manager")
 	}()
 
-}, 60)
+})
 
 var _ = AfterSuite(func() {
 	cancel()

controllers/topolvm_controller.go

@@ -101,11 +101,6 @@ func (c topolvmController) ensureDeleted(r *LVMClusterReconciler, ctx context.Co
 	return err
 }
 
-func (c topolvmController) updateStatus(r *LVMClusterReconciler, ctx context.Context, lvmCluster *lvmv1alpha1.LVMCluster) error {
-	// TODO: Verify the status of controller plugin deployment and set the same on CR
-	return nil
-}
-
 func (c topolvmController) setTopolvmControllerDesiredState(existing, desired *appsv1.Deployment) error {
 
 	// at creation, deep copy desired deployment into existing

controllers/topolvm_csi_driver.go

@@ -89,11 +89,6 @@ func (c csiDriver) ensureDeleted(r *LVMClusterReconciler, ctx context.Context, l
 	return err
 }
 
-func (c csiDriver) updateStatus(r *LVMClusterReconciler, ctx context.Context, lvmCluster *lvmv1alpha1.LVMCluster) error {
-	// intentionally empty as there'll be no status field on CSIDriver resource
-	return nil
-}
-
 func getCSIDriverResource() *storagev1.CSIDriver {
 	// topolvm doesn't use/need attacher and reduce a round trip of the rpc by setting this to false
 	attachRequired := false

controllers/topolvm_node.go

@@ -123,14 +123,6 @@ func (n topolvmNode) ensureDeleted(r *LVMClusterReconciler, ctx context.Context,
 	return nil
 }
 
-// updateStatus should optionally update the CR's status about the health of the managed resource
-// each unit will have updateStatus called individually so
-// avoid status fields like lastHeartbeatTime and have a
-// status that changes only when the operands change.
-func (n topolvmNode) updateStatus(r *LVMClusterReconciler, ctx context.Context, lvmCluster *lvmv1alpha1.LVMCluster) error {
-	return nil
-}
-
 func getNodeDaemonSet(lvmCluster *lvmv1alpha1.LVMCluster, namespace string, initImage string) *appsv1.DaemonSet {
 
 	hostPathDirectory := corev1.HostPathDirectory

controllers/topolvm_snapshotclass.go

@@ -96,11 +96,6 @@ func (s topolvmVolumeSnapshotClass) ensureDeleted(r *LVMClusterReconciler, ctx c
 	return nil
 }
 
-func (s topolvmVolumeSnapshotClass) updateStatus(r *LVMClusterReconciler, ctx context.Context, lvmCluster *lvmv1alpha1.LVMCluster) error {
-	// intentionally empty as there'll be no status field on VolumeSnapshotClass resource
-	return nil
-}
-
 func getTopolvmSnapshotClasses(lvmCluster *lvmv1alpha1.LVMCluster) []*snapapi.VolumeSnapshotClass {
 	vsc := []*snapapi.VolumeSnapshotClass{}
 

controllers/topolvm_storageclass.go

@@ -96,11 +96,6 @@ func (s topolvmStorageClass) ensureDeleted(r *LVMClusterReconciler, ctx context.
 	return nil
 }
 
-func (s topolvmStorageClass) updateStatus(r *LVMClusterReconciler, ctx context.Context, lvmCluster *lvmv1alpha1.LVMCluster) error {
-	// intentionally empty as there'll be no status field on StorageClass resource
-	return nil
-}
-
 func getTopolvmStorageClasses(r *LVMClusterReconciler, ctx context.Context, lvmCluster *lvmv1alpha1.LVMCluster) []*storagev1.StorageClass {
 
 	const defaultSCAnnotation string = "storageclass.kubernetes.io/is-default-class"

controllers/vgmanager.go

@@ -118,10 +118,6 @@ func (v vgManager) ensureDeleted(r *LVMClusterReconciler, ctx context.Context, l
 	return nil
 }
 
-func (v vgManager) updateStatus(r *LVMClusterReconciler, ctx context.Context, lvmCluster *lvmv1alpha1.LVMCluster) error {
-	return nil
-}
-
 func initMapIfNil(m *map[string]string) {
 	if len(*m) > 1 {
 		return

docs/design/lvm-operator-manager.md

@@ -74,11 +74,5 @@ type resourceManager interface {
 
 	// ensureDeleted should wait for the resources to be cleaned up
 	ensureDeleted(*LVMClusterReconciler, context.Context, lvmv1alpha1.LVMCluster) error
-
-	// updateStatus should optionally update the CR's status about the health of the managed resource
-	// each unit will have updateStatus called induvidually so
-	// avoid status fields like lastHeartbeatTime and have a
-	// status that changes only when the operands change.
-	updateStatus(*LVMClusterReconciler, context.Context, lvmv1alpha1.LVMCluster) error
 }
 ```