feat(helm): align resources for helm

Until now we were maintaining 2 separate set of installation resources. Here we make Helm to reuse the existing base resources instead, making easier any future evolution

e2e/install/helm/setup_test.go

@@ -40,7 +40,7 @@ import (
 func TestHelmInstallation(t *testing.T) {
 	WithNewTestNamespace(t, func(ctx context.Context, g *WithT, ns string) {
 		containerRegistry, ok := os.LookupEnv("KAMEL_INSTALL_REGISTRY")
-		g.Expect(ok).To(BeTrue(), "This test requires setting KAMEL_INSTALL_REGISTRY variable.")
+		g.Expect(ok).To(BeTrue(), "You must provide a registry address in KAMEL_INSTALL_REGISTRY env variable")
 		// Let's make sure no CRD is yet available in the cluster
 		// as we must make the procedure to install them accordingly
 		g.Eventually(CRDs(t)).Should(BeNil(), "No Camel K CRDs should be previously installed for this test")

e2e/support/test_support.go

@@ -114,8 +114,7 @@ const ExpectedKubePromoteRoles = 7
 // camel-k-edit
 // camel-k-operator-custom-resource-definitions
 // camel-k-operator-bind-addressable-resolver
-// camel-k-operator-local-registry
-const ExpectedKubeClusterRoles = 4
+const ExpectedKubeClusterRoles = 3
 
 // camel-k-operator-openshift
 const ExpectedOSPromoteRoles = 1

helm/camel-k/templates/operator-service-account.yaml → helm/camel-k/templates/operator-svcs.yaml

@@ -26,3 +26,12 @@ metadata:
   annotations:
     {{ toYaml . | nindent 4 }}
   {{- end }}
+
+---
+
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: camel-k-builder
+  labels:
+    app: "camel-k"