fix(builder): global catalog reconciliation

e2e/commonwithcustominstall/catalog_builder_test.go

@@ -67,7 +67,7 @@ func TestCamelCatalogBuilder(t *testing.T) {
 
 			Eventually(CamelCatalog(ns, nonCompatibleCatalogName)).ShouldNot(BeNil())
 			Eventually(CamelCatalogPhase(ns, nonCompatibleCatalogName)).Should(Equal(v1.CamelCatalogPhaseError))
-			Eventually(CamelCatalogCondition(ns, nonCompatibleCatalogName, v1.CamelCatalogConditionReady)().Message).Should(ContainSubstring("Missing base image"))
+			Eventually(CamelCatalogCondition(ns, nonCompatibleCatalogName, v1.CamelCatalogConditionReady)().Message).Should(ContainSubstring("missing base image"))
 
 			Eventually(IntegrationKit(ns, name)).ShouldNot(Equal(""))
 			kitName := IntegrationKit(ns, name)()

e2e/commonwithcustominstall/operator_id_filtering_test.go

@@ -25,6 +25,7 @@ package commonwithcustominstall
 import (
 	"fmt"
 	"os"
+	"strings"
 	"testing"
 	"time"
 
@@ -35,9 +36,20 @@ import (
 
 	. "github.com/apache/camel-k/e2e/support"
 	v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
+	"github.com/apache/camel-k/pkg/util/defaults"
 	"github.com/apache/camel-k/pkg/util/openshift"
 )
 
+func TestOperatorIDCamelCatalogReconciliation(t *testing.T) {
+	WithNewTestNamespace(t, func(ns string) {
+		operator1 := "operator-1"
+		Expect(KamelInstallWithID(operator1, ns, "--global", "--force").Execute()).To(Succeed())
+		Eventually(PlatformPhase(ns), TestTimeoutMedium).Should(Equal(v1.IntegrationPlatformPhaseReady))
+		catalogName := fmt.Sprintf("camel-catalog-%s", strings.ToLower(defaults.DefaultRuntimeVersion))
+		Eventually(CamelCatalogPhase(ns, catalogName), TestTimeoutMedium).Should(Equal(v1.CamelCatalogPhaseReady))
+	})
+}
+
 func TestOperatorIDFiltering(t *testing.T) {
 	RegisterTestingT(t)
 

pkg/controller/integrationkit/build.go

@@ -112,6 +112,7 @@ func (action *buildAction) handleBuildSubmitted(ctx context.Context, kit *v1.Int
 			buildStrategy = env.BuildStrategy
 
 			if buildStrategy == v1.BuildStrategyPod {
+				// nolint: contextcheck
 				err = platform.CreateBuilderServiceAccount(env.Ctx, env.Client, env.Platform)
 				if err != nil {
 					return nil, errors.Wrap(err, "Error while creating Camel K Builder service account")
@@ -131,8 +132,9 @@ func (action *buildAction) handleBuildSubmitted(ctx context.Context, kit *v1.Int
 				Annotations: annotations,
 			},
 			Spec: v1.BuildSpec{
-				Strategy:          buildStrategy,
-				ToolImage:         env.CamelCatalog.Image,
+				Strategy:  buildStrategy,
+				ToolImage: env.CamelCatalog.Image,
+				// TODO try to use platform.GetOperatorNamespace
 				OperatorNamespace: kubernetes.CurrentPodNamespace(),
 				Tasks:             env.BuildTasks,
 				Timeout:           timeout,

pkg/controller/integrationplatform/create.go

@@ -21,6 +21,7 @@ import (
 	"context"
 
 	corev1 "k8s.io/api/core/v1"
+	ctrl "sigs.k8s.io/controller-runtime/pkg/client"
 
 	v1 "github.com/apache/camel-k/pkg/apis/camel/v1"
 	"github.com/apache/camel-k/pkg/install"
@@ -54,7 +55,13 @@ func (action *createAction) Handle(ctx context.Context, platform *v1.Integration
 
 	for _, k := range paths {
 		action.L.Infof("Installing camel catalog: %s", k)
-		err := install.Resources(ctx, action.client, platform.Namespace, true, install.IdentityResourceCustomizer, k)
+		err := install.Resources(ctx, action.client, platform.Namespace, true,
+			func(object ctrl.Object) ctrl.Object {
+				action.L.Infof("Copying platform annotations to catalog: %s", object.GetName())
+				object.SetAnnotations(platform.Annotations)
+				return object
+			},
+			k)
 		if err != nil {
 			return nil, err
 		}

pkg/util/kubernetes/util.go

@@ -59,7 +59,7 @@ func ToYAMLNoManagedFields(value runtime.Object) ([]byte, error) {
 	return util.MapToYAML(mapdata)
 }
 
-// CurrentPodNamespace return the Kubernetes namespace on which the caller of this funcion is running
+// CurrentPodNamespace return the Kubernetes namespace on which the caller of this funcion is running.
 func CurrentPodNamespace() string {
 	ns, err := ioutil.ReadFile("/var/run/secrets/kubernetes.io/serviceaccount/namespace")
 	if err != nil {

resources/builder/builder-role-binding.yaml

@@ -22,9 +22,9 @@ metadata:
   labels:
     app: "camel-k"
 subjects:
-# TODO set the camel k builder SA with operator namespace
-# - kind: ServiceAccount
-#   name: camel-k-builder
+  # TODO set the camel k builder SA with operator namespace
+  # - kind: ServiceAccount
+  #   name: camel-k-builder
 - apiGroup: rbac.authorization.k8s.io
   kind: Group
   name: system:authenticated