feat(install): remove unnecessary rbac

Author: squakez

e2e/common/git/git_test.go

@@ -40,7 +40,24 @@ func TestGitRepository(t *testing.T) {
 		t.Run("Camel Quarkus", func(t *testing.T) {
 			itName := "sample"
 			g.Expect(KamelRun(t, ctx, ns,
-				"--git", "https://github.com/squakez/sample.git").Execute()).To(Succeed())
+				"--git", "https://github.com/squakez/sample.git",
+			).Execute()).To(Succeed())
+			g.Eventually(IntegrationConditionStatus(t, ctx, ns, itName, v1.IntegrationConditionReady), TestTimeoutLong).
+				Should(Equal(corev1.ConditionTrue))
+			g.Eventually(IntegrationPodPhase(t, ctx, ns, itName)).Should(Equal(corev1.PodRunning))
+			g.Eventually(IntegrationLogs(t, ctx, ns, itName)).Should(ContainSubstring("Hello Camel from route1"))
+		})
+	})
+}
+func TestPodStrategyGitRepository(t *testing.T) {
+	t.Parallel()
+	WithNewTestNamespace(t, func(ctx context.Context, g *WithT, ns string) {
+		t.Run("Camel Quarkus", func(t *testing.T) {
+			itName := "sample"
+			g.Expect(KamelRun(t, ctx, ns,
+				"--git", "https://github.com/squakez/sample.git",
+				"-t", "builder.strategy=pod",
+			).Execute()).To(Succeed())
 			g.Eventually(IntegrationConditionStatus(t, ctx, ns, itName, v1.IntegrationConditionReady), TestTimeoutLong).
 				Should(Equal(corev1.ConditionTrue))
 			g.Eventually(IntegrationPodPhase(t, ctx, ns, itName)).Should(Equal(corev1.PodRunning))

e2e/support/test_support.go

@@ -44,7 +44,6 @@ import (
 	"time"
 
 	consoleV1 "github.com/openshift/api/console/v1"
-	"github.com/stretchr/testify/require"
 
 	"github.com/google/uuid"
 	"github.com/onsi/gomega"
@@ -78,7 +77,6 @@ import (
 	traitv1 "github.com/apache/camel-k/v2/pkg/apis/camel/v1/trait"
 	"github.com/apache/camel-k/v2/pkg/client"
 	"github.com/apache/camel-k/v2/pkg/cmd"
-	"github.com/apache/camel-k/v2/pkg/install"
 	"github.com/apache/camel-k/v2/pkg/platform"
 	v2util "github.com/apache/camel-k/v2/pkg/util"
 	"github.com/apache/camel-k/v2/pkg/util/defaults"
@@ -2557,50 +2555,6 @@ func ClusterDomainName(t *testing.T, ctx context.Context) (string, error) {
 	return dns.Spec.BaseDomain, nil
 }
 
-/*
-	Tekton
-*/
-
-func CreateOperatorServiceAccount(t *testing.T, ctx context.Context, ns string) error {
-	return install.Resource(ctx, TestClient(t), ns, true, install.IdentityResourceCustomizer, "/config/manager/operator-service-account.yaml")
-}
-
-func CreateOperatorRole(t *testing.T, ctx context.Context, ns string) (err error) {
-	oc, err := openshift.IsOpenShift(TestClient(t))
-	if err != nil {
-		failTest(t, err)
-	}
-	customizer := install.IdentityResourceCustomizer
-	if oc {
-		// Remove Ingress permissions as it's not needed on OpenShift
-		// This should ideally be removed from the common RBAC manifest.
-		customizer = install.RemoveIngressRoleCustomizer
-	}
-	err = install.Resource(ctx, TestClient(t), ns, true, customizer, "/config/rbac/namespaced/operator-role.yaml")
-	if err != nil {
-		return err
-	}
-	if oc {
-		return install.Resource(ctx, TestClient(t), ns, true, install.IdentityResourceCustomizer, "/config/rbac/openshift/namespaced/operator-role-openshift.yaml")
-	}
-	return nil
-}
-
-func CreateOperatorRoleBinding(t *testing.T, ctx context.Context, ns string) error {
-	oc, err := openshift.IsOpenShift(TestClient(t))
-	if err != nil {
-		failTest(t, err)
-	}
-	err = install.Resource(ctx, TestClient(t), ns, true, install.IdentityResourceCustomizer, "/config/rbac/namespaced/operator-role-binding.yaml")
-	if err != nil {
-		return err
-	}
-	if oc {
-		return install.Resource(ctx, TestClient(t), ns, true, install.IdentityResourceCustomizer, "/config/rbac/openshift/namespaced/operator-role-binding-openshift.yaml")
-	}
-	return nil
-}
-
 // CreateKamelPodWithIntegrationSource generates and deploy a Pod from current Camel K controller image that will run a `kamel xxxx` command.
 // The integration parameter represent an Integration source file contained in a ConfigMap or Secret defined and mounted on the as a Volume.
 func CreateKamelPodWithIntegrationSource(t *testing.T, ctx context.Context, ns string, name string, integration v1.ValueSource, command ...string) error {
@@ -2827,18 +2781,6 @@ func WithNewTestNamespace(t *testing.T, doRun func(context.Context, *gomega.With
 	invokeUserTestCode(t, testContext, ns.GetName(), doRun)
 }
 
-func WithGlobalOperatorNamespace(t *testing.T, test func(context.Context, *gomega.WithT, string)) {
-	ocp, err := openshift.IsOpenShift(TestClient(t))
-	require.NoError(t, err)
-	if ocp {
-		// global operators are always installed in the openshift-operators namespace
-		invokeUserTestCode(t, testContext, "openshift-operators", test)
-	} else {
-		// create new namespace for the global operator
-		WithNewTestNamespace(t, test)
-	}
-}
-
 func WithNewTestNamespaceWithKnativeBroker(t *testing.T, doRun func(context.Context, *gomega.WithT, string)) {
 	ns := NewTestNamespace(t, testContext, true)
 	defer deleteTestNamespace(t, testContext, ns)
@@ -2867,6 +2809,8 @@ func userCleanup(t *testing.T) {
 func invokeUserTestCode(t *testing.T, ctx context.Context, ns string, doRun func(context.Context, *gomega.WithT, string)) {
 	defer func() {
 		DumpNamespace(t, ctx, ns)
+		// Also dump the operator namespace in case it's common
+		DumpNamespace(t, ctx, "camel-k")
 	}()
 
 	g := gomega.NewWithT(t)

helm/camel-k/templates/rbacs-common.yaml

@@ -108,6 +108,22 @@ rules:
   - create
 ---
 apiVersion: rbac.authorization.k8s.io/v1
+kind: Role
+metadata:
+  labels:
+    app: camel-k
+  name: camel-k-kamelet-viewer
+rules:
+- apiGroups:
+  - camel.apache.org
+  resources:
+  - kamelets
+  verbs:
+  - get
+  - list
+  - watch
+---
+apiVersion: rbac.authorization.k8s.io/v1
 kind: RoleBinding
 metadata:
   labels:
@@ -134,3 +150,18 @@ roleRef:
 subjects:
 - kind: ServiceAccount
   name: camel-k-builder
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: RoleBinding
+metadata:
+  labels:
+    app: camel-k
+  name: camel-k-kamelet-viewer
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: Role
+  name: camel-k-kamelet-viewer
+subjects:
+- apiGroup: rbac.authorization.k8s.io
+  kind: Group
+  name: system:authenticated