Merge pull request #2587 from Nikhil-Ladha/remove-dual-imports

cleanup: Remove dual imports and fix go-staticchecks
red-hat-storage · Apr 25, 2024 · ae7facf · ae7facf
2 parents 497021a + e39a665
commit ae7facf
Show file tree

Hide file tree

Showing 11 changed files with 308 additions and 324 deletions.
diff --git a/controllers/storagecluster/backingstorageclasses.go b/controllers/storagecluster/backingstorageclasses.go
@@ -10,7 +10,6 @@ import (
 	"github.com/red-hat-storage/ocs-operator/v4/controllers/platform"
 	corev1 "k8s.io/api/core/v1"
 	storagev1 "k8s.io/api/storage/v1"
-	v1 "k8s.io/api/storage/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
@@ -27,7 +26,7 @@ type backingStorageClasses struct{}
 // ensureCreated ensures that backing storageclasses are created for the StorageCluster
 func (obj *backingStorageClasses) ensureCreated(r *StorageClusterReconciler, sc *ocsv1.StorageCluster) (reconcile.Result, error) {
 
-	existingBackingStorageClasses := &v1.StorageClassList{}
+	existingBackingStorageClasses := &storagev1.StorageClassList{}
 	err := r.Client.List(
 		r.ctx,
 		existingBackingStorageClasses,
@@ -39,7 +38,7 @@ func (obj *backingStorageClasses) ensureCreated(r *StorageClusterReconciler, sc
 		return reconcile.Result{}, err
 	}
 
-	existingStorageClassesByName := map[string]*v1.StorageClass{}
+	existingStorageClassesByName := map[string]*storagev1.StorageClass{}
 	for i := range existingBackingStorageClasses.Items {
 		storageClass := &existingBackingStorageClasses.Items[i]
 		existingStorageClassesByName[storageClass.Name] = storageClass
@@ -84,7 +83,7 @@ func createOrUpdateBackingStorageclass(r *StorageClusterReconciler, bsc *ocsv1.B
 
 	pvReclaimPolicy := corev1.PersistentVolumeReclaimDelete
 	allowVolumeExpansion := true
-	volumeBindingMode := v1.VolumeBindingWaitForFirstConsumer
+	volumeBindingMode := storagev1.VolumeBindingWaitForFirstConsumer
 
 	desiredStorageClass := &storagev1.StorageClass{
 		ObjectMeta: metav1.ObjectMeta{
@@ -137,7 +136,7 @@ func createOrUpdateBackingStorageclass(r *StorageClusterReconciler, bsc *ocsv1.B
 
 // ensureDeleted deletes the backing storageclasses
 func (obj *backingStorageClasses) ensureDeleted(r *StorageClusterReconciler, _ *ocsv1.StorageCluster) (reconcile.Result, error) {
-	existingBackingStorageClasses := &v1.StorageClassList{}
+	existingBackingStorageClasses := &storagev1.StorageClassList{}
 	err := r.Client.List(
 		r.ctx,
 		existingBackingStorageClasses,

diff --git a/controllers/storagecluster/cephcluster.go b/controllers/storagecluster/cephcluster.go
@@ -14,14 +14,12 @@ import (
 
 	"github.com/go-logr/logr"
 	configv1 "github.com/openshift/api/config/v1"
-	v1 "github.com/openshift/api/config/v1"
 	objectreferencesv1 "github.com/openshift/custom-resource-status/objectreferences/v1"
 	monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1"
 	monitoringclient "github.com/prometheus-operator/prometheus-operator/pkg/client/versioned"
 	ocsv1 "github.com/red-hat-storage/ocs-operator/api/v4/v1"
 	"github.com/red-hat-storage/ocs-operator/v4/controllers/defaults"
 	"github.com/red-hat-storage/ocs-operator/v4/controllers/platform"
-	"github.com/red-hat-storage/ocs-operator/v4/controllers/util"
 	statusutil "github.com/red-hat-storage/ocs-operator/v4/controllers/util"
 	rookCephv1 "github.com/rook/rook/pkg/apis/ceph.rook.io/v1"
 	corev1 "k8s.io/api/core/v1"
@@ -217,7 +215,7 @@ func (obj *ocsCephCluster) ensureCreated(r *StorageClusterReconciler, sc *ocsv1.
 		return reconcile.Result{}, err
 	}
 
-	if platform == v1.IBMCloudPlatformType {
+	if platform == configv1.IBMCloudPlatformType {
 		r.Log.Info("Increasing Mon failover timeout to 15m.", "Platform", platform)
 		cephCluster.Spec.HealthCheck.DaemonHealth.Monitor.Timeout = "15m"
 	}
@@ -562,7 +560,7 @@ func newCephCluster(sc *ocsv1.StorageCluster, cephImage string, kmsConfigMap *co
 		cephCluster.Spec.Security.KeyManagementService.ConnectionDetails = kmsConfigMap.Data
 	}
 
-	isEnabled, rotationSchedule := util.GetKeyRotationSpec(sc)
+	isEnabled, rotationSchedule := statusutil.GetKeyRotationSpec(sc)
 	cephCluster.Spec.Security.KeyRotation.Enabled = isEnabled
 	cephCluster.Spec.Security.KeyRotation.Schedule = rotationSchedule