Skip to content

Commit

Permalink
fix: ci error
Browse files Browse the repository at this point in the history
Signed-off-by: soulseen <zhuxiaoyang1996@gmail.com>
  • Loading branch information
soulseen committed Jan 10, 2021
1 parent e9f7b51 commit 1ecd07c
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 10 deletions.
7 changes: 5 additions & 2 deletions pkg/cluster/controllers/storage/provision.go
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,10 @@ func (m *MinIOController) Provision() (*lcm.CRStatus, error) {

// expose minIO access endpoint by ingress.
if m.HarborCluster.Spec.InClusterStorage.MinIOSpec.Redirect.Disable {
ingress := m.generateIngress()
ingress, err := m.generateIngress()
if err != nil {
return minioNotReadyStatus(CreateMinIOIngressError, err.Error()), err
}

err = m.KubeClient.Create(ingress)
if err != nil && !k8serror.IsAlreadyExists(err) {
Expand All @@ -167,7 +170,7 @@ func (m *MinIOController) Provision() (*lcm.CRStatus, error) {
return minioUnknownStatus(), nil
}

func (m *MinIOController) generateIngress() *netv1.Ingress {
func (m *MinIOController) generateIngress() (*netv1.Ingress, error) {
var tls []netv1.IngressTLS

if m.HarborCluster.Spec.InClusterStorage.MinIOSpec.Redirect.TLS.Enabled() {
Expand Down
19 changes: 11 additions & 8 deletions pkg/cluster/controllers/storage/update.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,31 +29,34 @@ func (m *MinIOController) checkRedirectUpdate() (bool, error) {
return false, err
}

desiredingress := m.generateIngress()
desiredingress, err := m.generateIngress()

if currntIngress.Spec.Rules[0].Host != desiredingress.Spec.Rules[0].Host {
return true, nil
return true, err
}

if currntIngress.Spec.Rules[0].IngressRuleValue.HTTP.Paths[0] != desiredingress.Spec.Rules[0].IngressRuleValue.HTTP.Paths[0] {
return true, nil
return true, err
}

if currntIngress.Spec.TLS[0].Hosts[0] != desiredingress.Spec.TLS[0].Hosts[0] {
return true, nil
return true, err
}

if currntIngress.Spec.TLS[0].SecretName != desiredingress.Spec.TLS[0].SecretName {
return true, nil
return true, err
}

return false, nil
return false, err
}

func (m *MinIOController) updateMinioIngress() error {
desiredingress := m.generateIngress()
desiredingress, err := m.generateIngress()
if err != nil {
return err
}

err := m.KubeClient.Update(desiredingress)
err = m.KubeClient.Update(desiredingress)
if err != nil {
return err
}
Expand Down

0 comments on commit 1ecd07c

Please sign in to comment.