fix(storage): fix nil pointer error

Signed-off-by: soulseen <zhuxiaoyang1996@gmail.com>
goharbor · Jan 30, 2021 · eab364e · eab364e
1 parent e51b084
commit eab364e
Showing 1 changed file with 13 additions and 9 deletions.
diff --git a/pkg/cluster/controllers/storage/provision.go b/pkg/cluster/controllers/storage/provision.go
@@ -178,7 +178,7 @@ func (m *MinIOController) Provision() (*lcm.CRStatus, error) {
 func (m *MinIOController) generateIngress() (*netv1.Ingress, error) {
 	var tls []netv1.IngressTLS
 
-	if m.HarborCluster.Spec.InClusterStorage.MinIOSpec.Redirect.Expose.TLS.Enabled() {
+	if m.HarborCluster.Spec.InClusterStorage.MinIOSpec.Redirect.Expose != nil && m.HarborCluster.Spec.InClusterStorage.MinIOSpec.Redirect.Expose.TLS.Enabled() {
 		tls = []netv1.IngressTLS{{
 			SecretName: m.HarborCluster.Spec.InClusterStorage.MinIOSpec.Redirect.Expose.TLS.CertificateRef,
 			Hosts:      []string{m.HarborCluster.Spec.InClusterStorage.MinIOSpec.Redirect.Expose.Ingress.Host},
@@ -237,6 +237,13 @@ func (m *MinIOController) generateMinIOCR(ctx context.Context, harborcluster *go
 		return nil, err
 	}
 
+	externalCertSecret := &minio.LocalCertificateReference{}
+
+	if m.HarborCluster.Spec.InClusterStorage.MinIOSpec.Redirect.Expose != nil && m.HarborCluster.Spec.InClusterStorage.MinIOSpec.Redirect.Expose.TLS != nil {
+		externalCertSecret.Name = m.HarborCluster.Spec.InClusterStorage.MinIOSpec.Redirect.Expose.TLS.CertificateRef
+		externalCertSecret.Type = "kubernetes.io/tls"
+	}
+
 	return &minio.Tenant{
 		TypeMeta: metav1.TypeMeta{
 			Kind:       minio.MinIOCRDResourceKind,
@@ -256,14 +263,11 @@ func (m *MinIOController) generateMinIOCR(ctx context.Context, harborcluster *go
 				Labels:      m.getLabels(),
 				Annotations: m.generateAnnotations(),
 			},
-			ExternalCertSecret: &minio.LocalCertificateReference{
-				Name: m.HarborCluster.Spec.InClusterStorage.MinIOSpec.Redirect.Expose.TLS.CertificateRef,
-				Type: "kubernetes.io/tls",
-			},
-			ServiceName:     m.getServiceName(),
-			Image:           image,
-			ImagePullPolicy: m.getImagePullPolicy(ctx, harborcluster),
-			ImagePullSecret: m.getImagePullSecret(ctx, harborcluster),
+			ExternalCertSecret: externalCertSecret,
+			ServiceName:        m.getServiceName(),
+			Image:              image,
+			ImagePullPolicy:    m.getImagePullPolicy(ctx, harborcluster),
+			ImagePullSecret:    m.getImagePullSecret(ctx, harborcluster),
 			Zones: []minio.Zone{
 				{
 					Name:                DefaultZone,