fix(storage): refine some definitions

Signed-off-by: soulseen <zhuxiaoyang1996@gmail.com>
goharbor · Mar 6, 2021 · 3f5c55c · 3f5c55c
1 parent bc6508c
commit 3f5c55c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/apis/meta/v1alpha1/tls.go b/apis/meta/v1alpha1/tls.go
@@ -28,7 +28,7 @@ func (r ComponentWithTLS) GetName() string {
 type ComponentsTLSSpec struct {
 	// +kubebuilder:validation:Required
 	// +kubebuilder:validation:Pattern="[a-z0-9]([-a-z0-9]*[a-z0-9])?(\\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*"
-	CertificateRef string `json:"certificateRef"`
+	CertificateRef string `json:"certificateRef,omitempty"`
 }
 
 func (tls *ComponentsTLSSpec) Enabled() bool {

diff --git a/pkg/cluster/controllers/storage/provision.go b/pkg/cluster/controllers/storage/provision.go
@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"reflect"
+	"strings"
 
 	goharborv1alpha2 "github.com/goharbor/harbor-operator/apis/goharbor.io/v1alpha2"
 	"github.com/goharbor/harbor-operator/apis/meta/v1alpha1"
@@ -88,7 +89,7 @@ func (m *MinIOController) getMinIOProperties(minioInstance *minio.Tenant) (*goha
 		endpoint = fmt.Sprintf("http://%s.%s.svc:%s", m.getServiceName(), m.HarborCluster.Namespace, "9000")
 	}
 
-	storageSpec.S3.RegionEndpoint = endpoint
+	storageSpec.S3.RegionEndpoint = strings.ToLower(endpoint)
 	storageSpec.S3.Secure = &secure
 	storageSpec.S3.V4Auth = &v4Auth
 	storageSpec.S3.SkipVerify = skipVerify