fix(storage):remove cluster dep

Signed-off-by: soulseen <zhuxiaoyang1996@gmail.com>

go.mod

@@ -11,7 +11,7 @@ require (
 	github.com/go-kit/kit v0.10.0
 	github.com/go-logr/logr v0.2.1-0.20200730175230-ee2de8da5be6
 	github.com/go-redis/redis v6.15.9+incompatible
-	github.com/goharbor/harbor-cluster-operator v0.5.0
+	github.com/goharbor/harbor-cluster-operator v0.5.0 // indirect
 	github.com/goharbor/harbor/src v0.0.0-20200728051037-1d361a89a056
 	github.com/google/go-cmp v0.5.1
 	github.com/huandu/xstrings v1.3.2 // indirect

pkg/cluster/controllers/cache/resource_manager.go

@@ -7,6 +7,7 @@ import (
 
 	"github.com/goharbor/harbor-operator/apis/goharbor.io/v1alpha2"
 	redisOp "github.com/spotahome/redis-operator/api/redisfailover/v1"
+	"github.com/goharbor/harbor-operator/pkg/cluster/controllers/common"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
@@ -127,7 +128,7 @@ func (rm *RedisResourceManager) GetSecretName() string {
 // GetSecret gets redis secret.
 func (rm *RedisResourceManager) GetSecret() *corev1.Secret {
 	name := rm.GetSecretName()
-	passStr := RandomString(8, "a")
+	passStr := common.RandomString(8, "a")
 	return &corev1.Secret{
 		ObjectMeta: metav1.ObjectMeta{
 			Name:      name,

pkg/cluster/controllers/cache/utils.go

@@ -1,11 +1,6 @@
 package cache
 
 import (
-	"bytes"
-	"math/rand"
-	"strings"
-	"time"
-
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/equality"
 	"k8s.io/apimachinery/pkg/api/resource"
@@ -62,35 +57,6 @@ func MergeLabels(allLabels ...map[string]string) map[string]string {
 	return lb
 }
 
-// RandomString returns random string.
-func RandomString(randLength int, randType string) (result string) {
-	var (
-		num   = "0123456789"
-		lower = "abcdefghijklmnopqrstuvwxyz"
-		upper = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-	)
-
-	b := bytes.Buffer{}
-	if strings.Contains(randType, "0") {
-		b.WriteString(num)
-	} else if strings.Contains(randType, "A") {
-		b.WriteString(upper)
-	} else {
-		b.WriteString(lower)
-	}
-
-	var str = b.String()
-	var strLen = len(str)
-
-	rand.Seed(time.Now().UnixNano())
-	b = bytes.Buffer{}
-	for i := 0; i < randLength; i++ {
-		b.WriteByte(str[rand.Intn(strLen)])
-	}
-	result = b.String()
-	return
-}
-
 // IsEqual check two object is equal.
 func IsEqual(obj1, obj2 interface{}) bool {
 	return equality.Semantic.DeepEqual(obj1, obj2)

vendor/github.com/goharbor/harbor-cluster-operator/controllers/common/utils.go → pkg/cluster/controllers/common/utils.go

@@ -7,16 +7,13 @@ import (
 	"time"
 )
 
-const (
-	UpperStringRandomType = "A"
-	LowerStringRandomType = "a"
-	NumberRandomType      = "0"
-)
-
+// RandomString returns random string.
 func RandomString(randLength int, randType string) (result string) {
-	var num = "0123456789"
-	var lower = "abcdefghijklmnopqrstuvwxyz"
-	var upper = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+	var (
+		num   = "0123456789"
+		lower = "abcdefghijklmnopqrstuvwxyz"
+		upper = "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
+	)
 
 	b := bytes.Buffer{}
 	if strings.Contains(randType, "0") {

pkg/cluster/controllers/storage/provision.go

@@ -9,8 +9,8 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/goharbor/harbor-cluster-operator/controllers/common"
 	goharborv1 "github.com/goharbor/harbor-operator/apis/goharbor.io/v1alpha2"
+	"github.com/goharbor/harbor-operator/pkg/cluster/controllers/common"
 	minio "github.com/goharbor/harbor-operator/pkg/cluster/controllers/storage/minio/api/v1"
 	"github.com/goharbor/harbor-operator/pkg/cluster/lcm"
 	corev1 "k8s.io/api/core/v1"

vendor/modules.txt

@@ -58,7 +58,6 @@ github.com/gogo/protobuf/proto
 github.com/gogo/protobuf/sortkeys
 # github.com/goharbor/harbor-cluster-operator v0.5.0
 ## explicit
-github.com/goharbor/harbor-cluster-operator/controllers/common
 # github.com/goharbor/harbor/src v0.0.0-20200728051037-1d361a89a056
 ## explicit
 github.com/goharbor/harbor/src/common