Review items

controllers/etcdcluster_controller.go

@@ -162,41 +162,24 @@ func (r *EtcdClusterReconciler) getStorageOSClientSecret(ctx context.Context, se
 	return secret, nil
 }
 
-// getDefaultStorage returns the the default storage class in the cluster, if more than one storage
-// class is set to default, the first one discovered is returned. An error is returned if no default
-// storage class is found.
-func (r *EtcdClusterReconciler) getDefaultStorageClass(ctx context.Context) (*kstoragev1.StorageClass, error) {
+// getDefaultStorageName returns the name of the default storage class in the cluster, if more than
+// one storage class is set to default, the first one discovered is returned. An error is returned if
+// no default storage class is found.
+func (r *EtcdClusterReconciler) getDefaultStorageClassName(ctx context.Context) (string, error) {
 	storageClasses := &kstoragev1.StorageClassList{}
-	err := r.List(ctx, storageClasses)
-	if err != nil {
-		if apierrors.IsNotFound(err) {
-			// No storageclass found
-			return nil, nil
-		}
-		// Unexpected error, some other problem?
+	if err := r.List(ctx, storageClasses); err != nil {
 		return nil, err
 	}
 
 	for _, storageClass := range storageClasses.Items {
 		if defaultSC, ok := storageClass.GetObjectMeta().GetAnnotations()["storageclass.kubernetes.io/is-default-class"]; ok && defaultSC == "true" {
-			return &storageClass, nil
+			return storageClass.Name, nil
 		}
 	}
 
 	return nil, fmt.Errorf("no default storage class discovered in cluster")
 }
 
-// getDefaultStorageClassName returns the name of the default storage class in the cluster, if more
-// than one storage class is set to default, the first one discovered is returned. An error is returned
-// if no default storage class is found.
-func (r *EtcdClusterReconciler) getDefaultStorageClassName(ctx context.Context) (string, error) {
-	defaultSC, err := r.getDefaultStorageClass(ctx)
-	if err != nil {
-		return "", err
-	}
-	return defaultSC.Name, nil
-}
-
 func storageOSClientSecretName(name, namespace string) types.NamespacedName {
 	return types.NamespacedName{
 		Name:      name,