Moving code to helper.go

Author: dvaldivia

pkg/apis/operator.min.io/v1/helper.go

@@ -415,6 +415,22 @@ func (mi *MinIOInstance) CreateMCSUser(minioSecret, mcsSecret map[string][]byte)
 	return nil
 }
 
+// Validate returns an error if any configuration of the MinIO instance is invalid
+func (in *MinIOInstance) Validate() error {
+	// Make sure the storage request is not 0
+	if in.Spec.VolumeClaimTemplate.Spec.Resources.Requests.Storage().Value() == 0 {
+		return errors.New("cannot use volume size 0")
+	}
+	// Make sure the replicas are not 0 on any zone
+	for _, z := range in.Spec.Zones {
+		if z.Servers == 0 {
+			return fmt.Errorf("zone '%s' cannot have 0 servers", z.Name)
+		}
+	}
+
+	return nil
+}
+
 // Set up admin client to use self certificates
 func setUpInsecureTLS(api *madmin.AdminClient) *madmin.AdminClient {
 	// Keep TLS config.

pkg/apis/operator.min.io/v1/types.go

@@ -18,9 +18,6 @@
 package v1
 
 import (
-	"errors"
-	"fmt"
-
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -42,22 +39,6 @@ type MinIOInstance struct {
 	Status    MinIOInstanceStatus    `json:"status"`
 }
 
-// Validate returns an error if any configuration of the MinIO instance is invalid
-func (in *MinIOInstance) Validate() error {
-	// Make sure the storage request is not 0
-	if in.Spec.VolumeClaimTemplate.Spec.Resources.Requests.Storage().Value() == 0 {
-		return errors.New("cannot use volume size 0")
-	}
-	// Make sure the replicas are not 0 on any zone
-	for _, z := range in.Spec.Zones {
-		if z.Servers == 0 {
-			return fmt.Errorf("zone '%s' cannot have 0 servers", z.Name)
-		}
-	}
-
-	return nil
-}
-
 // MinIOInstanceScheduler is the spec for a MinIOInstance scheduler
 type MinIOInstanceScheduler struct {
 	// SchedulerName defines the name of scheduler to be used to schedule MinIOInstance pods