fix(harbor class) Close #399

Signed-off-by: Simon Guyennet <simon.guyennet@corp.ovh.com>
goharbor · Jan 28, 2021 · 125a567 · 125a567
1 parent f7aff7b
commit 125a567
Show file tree

Hide file tree

Showing 15 changed files with 56 additions and 35 deletions.
diff --git a/controllers/goharbor/chartmuseum/chartmuseum.go b/controllers/goharbor/chartmuseum/chartmuseum.go
@@ -44,18 +44,9 @@ func (r *Reconciler) SetupWithManager(ctx context.Context, mgr ctrl.Manager) err
 		return errors.Wrap(err, "cannot setup common controller")
 	}
 
-	className := ""
-
-	configItem, err := configstore.Filter().Store(r.ConfigStore).Slice(config.HarborClassKey).GetFirstItem()
+	className, err := r.GetClassName(ctx)
 	if err != nil {
-		if !config.IsNotFound(err, config.HarborClassKey) {
-			return errors.Wrap(err, "cannot get config template path")
-		}
-	} else {
-		className, err = configItem.Value()
-		if err != nil {
-			return errors.Wrap(err, "invalid config template path")
-		}
+		return errors.Wrap(err, "cannot get class name")
 	}
 
 	concurrentReconcile, err := r.ConfigStore.GetItemValueInt(config.ReconciliationKey)

diff --git a/controllers/goharbor/chartmuseum/chartmuseum_test.go b/controllers/goharbor/chartmuseum/chartmuseum_test.go
@@ -46,11 +46,9 @@ var _ = Describe("ChartMuseum", func() {
 		chartMuseum.ObjectMeta = metav1.ObjectMeta{
 			Name:      test.NewName("chartmuseum"),
 			Namespace: ns.GetName(),
-			/* TODO: Enable this when HarborClass is fixed
 			Annotations: map[string]string{
 				goharborv1alpha2.HarborClassAnnotation: harborClass,
 			},
-			*/
 		}
 	})
 

diff --git a/controllers/goharbor/chartmuseum/suite_test.go b/controllers/goharbor/chartmuseum/suite_test.go
@@ -20,10 +20,12 @@ import (
 
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
+	"github.com/ovh/configstore"
 
 	"github.com/goharbor/harbor-operator/controllers"
 	"github.com/goharbor/harbor-operator/controllers/goharbor/chartmuseum"
 	"github.com/goharbor/harbor-operator/controllers/goharbor/internal/test"
+	"github.com/goharbor/harbor-operator/pkg/config"
 	"sigs.k8s.io/controller-runtime/pkg/envtest/printer"
 )
 
@@ -54,10 +56,8 @@ var _ = BeforeSuite(func(done Done) {
 	name := controllers.ChartMuseum.String()
 	harborClass = test.NewName(name)
 
-	configStore, _ := test.NewConfig(ctx, chartmuseum.ConfigTemplatePathKey, path.Base(chartmuseum.DefaultConfigTemplatePath))
-	/* TODO: Enable this when HarborClass is fixed
+	configStore, provider := test.NewConfig(ctx, chartmuseum.ConfigTemplatePathKey, path.Base(chartmuseum.DefaultConfigTemplatePath))
 	provider.Add(configstore.NewItem(config.HarborClassKey, harborClass, 100))
-	*/
 	configStore.Env(name)
 
 	commonReconciler, err := chartmuseum.New(ctx, name, configStore)

diff --git a/controllers/goharbor/core/core.go b/controllers/goharbor/core/core.go
@@ -47,9 +47,9 @@ func (r *Reconciler) SetupWithManager(ctx context.Context, mgr ctrl.Manager) err
 		return errors.Wrap(err, "cannot setup common controller")
 	}
 
-	className, err := r.ConfigStore.GetItemValue(config.HarborClassKey)
+	className, err := r.GetClassName(ctx)
 	if err != nil {
-		return errors.Wrap(err, "cannot get harbor class")
+		return errors.Wrap(err, "cannot get class name")
 	}
 
 	concurrentReconcile, err := r.ConfigStore.GetItemValueInt(config.ReconciliationKey)

diff --git a/controllers/goharbor/harbor/harbor.go b/controllers/goharbor/harbor/harbor.go
@@ -38,9 +38,9 @@ func (r *Reconciler) SetupWithManager(ctx context.Context, mgr ctrl.Manager) err
 		return errors.Wrap(err, "cannot setup common controller")
 	}
 
-	className, err := r.ConfigStore.GetItemValue(config.HarborClassKey)
+	className, err := r.GetClassName(ctx)
 	if err != nil {
-		return errors.Wrap(err, "cannot get harbor class")
+		return errors.Wrap(err, "cannot get class name")
 	}
 
 	concurrentReconcile, err := r.ConfigStore.GetItemValueInt(config.ReconciliationKey)

diff --git a/controllers/goharbor/jobservice/jobservice.go b/controllers/goharbor/jobservice/jobservice.go
@@ -47,9 +47,9 @@ func (r *Reconciler) SetupWithManager(ctx context.Context, mgr ctrl.Manager) err
 		return errors.Wrap(err, "cannot setup common controller")
 	}
 
-	className, err := r.ConfigStore.GetItemValue(config.HarborClassKey)
+	className, err := r.GetClassName(ctx)
 	if err != nil {
-		return errors.Wrap(err, "cannot get harbor class")
+		return errors.Wrap(err, "cannot get class name")
 	}
 
 	concurrentReconcile, err := r.ConfigStore.GetItemValueInt(config.ReconciliationKey)

diff --git a/controllers/goharbor/notaryserver/notaryserver.go b/controllers/goharbor/notaryserver/notaryserver.go
@@ -47,9 +47,9 @@ func (r *Reconciler) SetupWithManager(ctx context.Context, mgr ctrl.Manager) err
 		return errors.Wrap(err, "cannot setup common controller")
 	}
 
-	className, err := r.ConfigStore.GetItemValue(config.HarborClassKey)
+	className, err := r.GetClassName(ctx)
 	if err != nil {
-		return errors.Wrap(err, "cannot get harbor class")
+		return errors.Wrap(err, "cannot get class name")
 	}
 
 	concurrentReconcile, err := r.ConfigStore.GetItemValueInt(config.ReconciliationKey)

diff --git a/controllers/goharbor/notarysigner/notarysigner.go b/controllers/goharbor/notarysigner/notarysigner.go
@@ -44,9 +44,9 @@ func (r *Reconciler) SetupWithManager(ctx context.Context, mgr ctrl.Manager) err
 		return errors.Wrap(err, "cannot setup common controller")
 	}
 
-	className, err := r.ConfigStore.GetItemValue(config.HarborClassKey)
+	className, err := r.GetClassName(ctx)
 	if err != nil {
-		return errors.Wrap(err, "cannot get harbor class")
+		return errors.Wrap(err, "cannot get class name")
 	}
 
 	concurrentReconcile, err := r.ConfigStore.GetItemValueInt(config.ReconciliationKey)

diff --git a/controllers/goharbor/portal/portal.go b/controllers/goharbor/portal/portal.go
@@ -42,9 +42,9 @@ func (r *Reconciler) SetupWithManager(ctx context.Context, mgr ctrl.Manager) err
 		return errors.Wrap(err, "cannot setup common controller")
 	}
 
-	className, err := r.ConfigStore.GetItemValue(config.HarborClassKey)
+	className, err := r.GetClassName(ctx)
 	if err != nil {
-		return errors.Wrap(err, "cannot get harbor class")
+		return errors.Wrap(err, "cannot get class name")
 	}
 
 	concurrentReconcile, err := r.ConfigStore.GetItemValueInt(config.ReconciliationKey)

diff --git a/controllers/goharbor/registry/registry.go b/controllers/goharbor/registry/registry.go
@@ -47,9 +47,9 @@ func (r *Reconciler) SetupWithManager(ctx context.Context, mgr ctrl.Manager) err
 		return errors.Wrap(err, "cannot setup common controller")
 	}
 
-	className, err := r.ConfigStore.GetItemValue(config.HarborClassKey)
+	className, err := r.GetClassName(ctx)
 	if err != nil {
-		return errors.Wrap(err, "cannot get harbor class")
+		return errors.Wrap(err, "cannot get class name")
 	}
 
 	concurrentReconcile, err := r.ConfigStore.GetItemValueInt(config.ReconciliationKey)

diff --git a/controllers/goharbor/registryctl/registryctl.go b/controllers/goharbor/registryctl/registryctl.go
@@ -48,9 +48,9 @@ func (r *Reconciler) SetupWithManager(ctx context.Context, mgr ctrl.Manager) err
 		return errors.Wrap(err, "cannot setup common controller")
 	}
 
-	className, err := r.ConfigStore.GetItemValue(config.HarborClassKey)
+	className, err := r.GetClassName(ctx)
 	if err != nil {
-		return errors.Wrap(err, "cannot get harbor class")
+		return errors.Wrap(err, "cannot get class name")
 	}
 
 	concurrentReconcile, err := r.ConfigStore.GetItemValueInt(config.ReconciliationKey)

diff --git a/controllers/goharbor/trivy/trivy.go b/controllers/goharbor/trivy/trivy.go
@@ -39,9 +39,9 @@ func (r *Reconciler) SetupWithManager(ctx context.Context, mgr ctrl.Manager) err
 		return errors.Wrap(err, "cannot setup common controller")
 	}
 
-	className, err := r.ConfigStore.GetItemValue(config.HarborClassKey)
+	className, err := r.GetClassName(ctx)
 	if err != nil {
-		return errors.Wrap(err, "cannot get harbor class")
+		return errors.Wrap(err, "cannot get class name")
 	}
 
 	concurrentReconcile, err := r.ConfigStore.GetItemValueInt(config.ReconciliationKey)

diff --git a/pkg/config/config.go b/pkg/config/config.go
@@ -13,7 +13,7 @@ const (
 )
 
 const (
-	DefaultPriority = 50
+	DefaultPriority = 5
 
 	DefaultConcurrentReconcile = 1
 	DefaultHarborClass         = ""

diff --git a/pkg/controller/helpers.go b/pkg/controller/helpers.go
@@ -4,6 +4,10 @@ import (
 	"context"
 	"fmt"
 	"strings"
+
+	"github.com/goharbor/harbor-operator/pkg/config"
+	"github.com/ovh/configstore"
+	"github.com/pkg/errors"
 )
 
 func (c *Controller) NormalizeName(ctx context.Context, name string, suffixes ...string) string {
@@ -15,3 +19,21 @@ func (c *Controller) NormalizeName(ctx context.Context, name string, suffixes ..
 
 	return name
 }
+
+func (c *Controller) GetClassName(ctx context.Context) (string, error) {
+	className := ""
+
+	configItem, err := configstore.Filter().Store(c.ConfigStore).Slice(config.HarborClassKey).GetFirstItem()
+	if err != nil {
+		if !config.IsNotFound(err, config.HarborClassKey) {
+			return "", errors.Wrap(err, "cannot get config template path")
+		}
+	} else {
+		className, err = configItem.Value()
+		if err != nil {
+			return "", errors.Wrap(err, "invalid config template path")
+		}
+	}
+
+	return className, nil
+}
diff --git a/pkg/controller/mutation.go b/pkg/controller/mutation.go
@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"strings"
 
+	goharborv1alpha2 "github.com/goharbor/harbor-operator/apis/goharbor.io/v1alpha2"
 	"github.com/goharbor/harbor-operator/pkg/controller/mutation"
 	"github.com/goharbor/harbor-operator/pkg/factories/logger"
 	"github.com/goharbor/harbor-operator/pkg/factories/owner"
@@ -30,6 +31,15 @@ const (
 func (c *Controller) GlobalMutateFn(ctx context.Context) (resources.Mutable, error) {
 	var mutate resources.Mutable = mutation.NoOp
 
+	className, err := c.GetClassName(ctx)
+	if err != nil {
+		return nil, errors.Wrap(err, "cannot get class name")
+	}
+
+	if className != "" {
+		mutate.AppendMutation(mutation.GetAnnotationsMutation(goharborv1alpha2.HarborClassAnnotation, className))
+	}
+
 	mutate.AppendMutation(mutation.GetAnnotationsMutation(WarningAnnotation, fmt.Sprintf(WarningValueTmpl, c.GetName())))
 	mutate.AppendMutation(mutation.GetLabelsMutation(OperatorNameLabel, c.GetName(), OperatorVersionLabel, c.GetVersion()))